adding latest

tembo/cli.py

@@ -2,6 +2,7 @@ import click
 
 import tembo
 from tembo.journal import pages
+from tembo import exceptions
 
 
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
@@ -112,7 +113,15 @@ def new(scope, inputs, dry_run, example):
         template_path=tembo.CONFIG.template_path,
     )
     if _name_found:
-        scoped_page = pages.ScopedPageCreator().create_page(page_creator_options)
+        try:
+            scoped_page = pages.ScopedPageCreator().create_page(page_creator_options)
+        except exceptions.BasePathDoesNotExistError as base_path_does_not_exist_error:
+            tembo.logger.critical(base_path_does_not_exist_error)
+            raise SystemExit(1) from base_path_does_not_exist_error
+        except exceptions.TemplateFileNotFoundError as template_file_not_found_error:
+            tembo.logger.critical(template_file_not_found_error.args[0])
+            raise SystemExit(1) from template_file_not_found_error
+
         scoped_page.save_to_disk(dry_run=dry_run)
         raise SystemExit(0)
     if not _name_found and len(tembo.CONFIG.scopes) > 0:

tembo/exceptions.py

@@ -6,4 +6,8 @@ class MismatchedTokenError(Exception):
 
 
 class BasePathDoesNotExistError(Exception):
-    pass
+    """Raised if the base path does not exist."""
+
+
+class TemplateFileNotFoundError(Exception):
+    """Raised if the template file does not exist."""

tembo/journal/pages.py

@@ -11,6 +11,7 @@ import jinja2
 from jinja2.exceptions import TemplateNotFound
 
 import tembo
+from tembo import exceptions
 
 
 # TODO: flesh this out with details for the optional args
@@ -57,10 +58,9 @@ class PageCreator:
     def _convert_base_path_to_path(self) -> pathlib.Path:
         # check if Tembo base path exists
         if not pathlib.Path(self.options.base_path).expanduser().exists():
-            tembo.logger.critical(
-                "Tembo base path of %s does not exist - exiting", self.options.base_path
+            raise exceptions.BasePathDoesNotExistError(
+                f"Tembo base path of {self.options.base_path} does not exist."
             )
-            raise SystemExit(1)
         path_to_file = (
             pathlib.Path(self.options.base_path).expanduser()
             / pathlib.Path(self.options.page_path.replace(" ", "_")).expanduser()
@@ -74,6 +74,7 @@ class PageCreator:
                 else self.options.extension
             )
         except IndexError:
+            # REVIEW: can this be removed now this is not called anywhere else?
             # IndexError means the path is not a file, just a path
             return path_to_file
         # return path with a file
@@ -91,14 +92,14 @@ class PageCreator:
 
         file_loader = jinja2.FileSystemLoader(converted_template_path)
         env = jinja2.Environment(loader=file_loader, autoescape=True)
+
         try:
             loaded_template = env.get_template(self.options.template_filename)
         except TemplateNotFound as template_not_found:
-            tembo.logger.critical(
-                "Template file %s not found - exiting",
-                str(self.options.template_path) + "/" + str(template_not_found.message),
-            )
-            raise SystemExit(1) from template_not_found
+            _template_file = f"{converted_template_path}/{template_not_found.args[0]}"
+            raise exceptions.TemplateFileNotFoundError(
+                f"Template file {_template_file} does not exist."
+            ) from template_not_found
         return loaded_template.render()