fixup! chore: enable more linting rules

Author: mtth

pyproject.toml

@@ -130,4 +130,5 @@ lines-after-imports = 2
 convention = "google"
 
 [tool.ruff.lint.per-file-ignores]
+"__main__.py" = ["T20"]
 "tests/**" = ["ANN", "D", "SLF"]

src/git_draft/__main__.py

@@ -13,7 +13,7 @@
 from .common import PROGRAM, Config, UnreachableError, ensure_state_home
 from .drafter import Drafter
 from .editor import open_editor
-from .prompt import Template, TemplatedPrompt, templates_table
+from .prompt import Template, TemplatedPrompt, find_template, templates_table
 from .store import Store
 from .toolbox import ToolVisitor
 
@@ -47,6 +47,7 @@ def callback(
             _value: object,
             parser: optparse.OptionParser,
         ) -> None:
+            assert parser.values
             parser.values.command = name
 
         parser.add_option(
@@ -133,20 +134,20 @@ class ToolPrinter(ToolVisitor):
     def on_list_files(
         self, _paths: Sequence[PurePosixPath], _reason: str | None
     ) -> None:
-        pass
+        print("Listing available files...")
 
     def on_read_file(
         self, path: PurePosixPath, _contents: str | None, _reason: str | None
     ) -> None:
-        pass
+        print(f"Reading {path!r}...")
 
     def on_write_file(
         self, path: PurePosixPath, _contents: str, _reason: str | None
     ) -> None:
-        pass
+        print(f"Updated {path!r}.")
 
     def on_delete_file(self, path: PurePosixPath, _reason: str | None) -> None:
-        pass
+        print(f"Deleted {path!r}.")
 
 
 def edit(*, path: Path | None = None, text: str | None = None) -> str:
@@ -158,23 +159,26 @@ def edit(*, path: Path | None = None, text: str | None = None) -> str:
     # https://unix.stackexchange.com/q/604260
     elif path is None:
         assert text, "Empty path and text"
+        print(text)
         sys.exit(198)
     else:
         if text is not None:
             with open(path, "w") as f:
                 f.write(text)
+        print(path)
         sys.exit(199)
 
 
 _PROMPT_PLACEHOLDER = "Enter your prompt here..."
 
 
-def main() -> None:  # noqa: PLR0912
+def main() -> None:  # noqa: PLR0912 PLR0915
     config = Config.load()
     (opts, args) = new_parser().parse_args()
 
     log_path = ensure_state_home() / "log"
     if opts.log:
+        print(log_path)
         return
     logging.basicConfig(level=config.log_level, filename=str(log_path))
 
@@ -212,36 +216,43 @@ def main() -> None:  # noqa: PLR0912
             reset=config.auto_reset if opts.reset is None else opts.reset,
             sync=opts.sync,
         )
+        print(f"Refined {name}.")
     elif command == "finalize":
         name = drafter.exit_draft(
             revert=opts.revert, clean=opts.clean, delete=opts.delete
         )
+        verb = "Reverted" if opts.revert else "Finalized"
+        print(f"{verb} {name}.")
     elif command == "show-drafts":
         table = drafter.history_table(args[0] if args else None)
         if table:
-            pass
+            print(table.to_json() if opts.json else table)
     elif command == "show-prompts":
         raise NotImplementedError()  # TODO: Implement
     elif command == "show-templates":
         if args:
             name = args[0]
-            tpl = Template.find(name)
+            tpl = find_template(name)
             if opts.edit:
                 if tpl:
                     edit(path=tpl.local_path(), text=tpl.source)
                 else:
                     edit(path=Template.local_path_for(name))
-            elif not tpl:
-                raise ValueError(f"No template named {name!r}")
+            else:
+                if not tpl:
+                    raise ValueError(f"No template named {name!r}")
+                print(tpl.source)
         else:
             table = templates_table()
+            print(table.to_json() if opts.json else table)
     else:
         raise UnreachableError()
 
 
 if __name__ == "__main__":
     try:
         main()
-    except Exception:
+    except Exception as err:
         _logger.exception("Program failed.")
+        print(f"Error: {err}", file=sys.stderr)
         sys.exit(1)

src/git_draft/prompt.py

@@ -104,6 +104,14 @@ def _load_template(rel_path: str, env: jinja2.Environment) -> Template:
     return Template(Path(rel_path), Path(abs_path), source, preamble)
 
 
+def find_template(name: str) -> Template | None:
+    env = _jinja_environment()
+    try:
+        return _load_template(f"{name}.{_extension}", env)
+    except jinja2.TemplateNotFound:
+        return None
+
+
 @dataclasses.dataclass(frozen=True)
 class Template:
     """An available template"""
@@ -135,14 +143,6 @@ def extract_variables(self, env: jinja2.Environment) -> frozenset[str]:
         ast = env.parse(self.source)
         return frozenset(jinja2.meta.find_undeclared_variables(ast))
 
-    @classmethod
-    def find(cls, name: str) -> Self | None:
-        env = _jinja_environment()
-        try:
-            return cls._load(f"{name}.{_extension}", env)
-        except jinja2.TemplateNotFound:
-            return None
-
     @staticmethod
     def local_path_for(name: str) -> Path:
         return _PromptFolder.LOCAL.path / Path(f"{name}.{_extension}")

tests/__init__.py

@@ -47,12 +47,12 @@ def test_extract_variables(self):
         assert "repo" not in variables
 
     def test_find_ok(self) -> None:
-        tpl = sut.Template.find("add-test")
+        tpl = sut.find_template("add-test")
         assert tpl
         assert "symbol" in tpl.source
 
     def test_find_missing(self) -> None:
-        assert sut.Template.find("foo") is None
+        assert sut.find_template("foo") is None
 
 
 def test_templates_table() -> None: