crackerjack 0.10.7__tar.gz → 0.11.1__tar.gz

{crackerjack-0.10.7 → crackerjack-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.10.7
+Version: 0.11.1
 Summary: Default template for PDM package
 Keywords: black,ruff,mypy,creosote,refurb
 Author-Email: lesleslie <les@wedgwoodwebworks.com>
@@ -23,17 +23,16 @@ Project-URL: documentation, https://github.com/lesleslie/crackerjack
 Project-URL: repository, https://github.com/lesleslie/crackerjack
 Requires-Python: >=3.13
 Requires-Dist: click>=8.1.8
-Requires-Dist: aioconsole>=0.8.1
-Requires-Dist: inflection>=0.5.1
 Requires-Dist: autotyping>=24.9.0
 Requires-Dist: pre-commit>=4.0.1
 Requires-Dist: pytest>=8.3.4
 Requires-Dist: pydantic>=2.10.4
-Requires-Dist: aiopath>=0.7.7
 Requires-Dist: pdm-bump>=0.9.10
 Requires-Dist: pdm>=2.22.1
-Requires-Dist: acb>=0.8.0
 Requires-Dist: uv>=0.5.13
+Requires-Dist: pytest-cov>=6.0.0
+Requires-Dist: pytest-mock>=3.14.0
+Requires-Dist: tomli-w>=1.2.0
 Description-Content-Type: text/markdown
 
 # Crackerjack Python

crackerjack-0.11.1/crackerjack/.pdm.toml

@@ -0,0 +1 @@
+test crackerjack config

{crackerjack-0.10.7 → crackerjack-0.11.1}/crackerjack/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pdm-project/pdm
-    rev: 2.22.2  # a PDM release exposing the hook
+    rev: 2.22.3  # a PDM release exposing the hook
     hooks:
       - id: pdm-lock-check
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -17,7 +17,7 @@ repos:
       - id: check-added-large-files
         name: check-added-large-files
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.3
+    rev: v0.9.9
     hooks:
       - id: ruff-format
       - id: ruff
@@ -26,7 +26,7 @@ repos:
     hooks:
       - id: vulture
   - repo: https://github.com/fredrikaverpil/creosote
-    rev: v4.0.0
+    rev: v4.0.1
     hooks:
       - id: creosote
   - repo: https://github.com/ikamensh/flynt/
@@ -34,7 +34,7 @@ repos:
     hooks:
       - id: flynt
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.0
+    rev: v2.4.1
     hooks:
       - id: codespell
         additional_dependencies:
@@ -60,16 +60,16 @@ repos:
     hooks:
       - id: refurb
   - repo: https://github.com/PyCQA/bandit
-    rev: '1.8.2'
+    rev: '1.8.3'
     hooks:
       - id: bandit
         args: ["-c", "pyproject.toml"]
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.392.post0
+    rev: v1.1.396
     hooks:
       - id: pyright
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.3
+    rev: v0.9.9
     hooks:
       - id: ruff
       - id: ruff-format

{crackerjack-0.10.7 → crackerjack-0.11.1}/crackerjack/__main__.py

@@ -1,4 +1,3 @@
-import asyncio
 import typing as t
 
 from click import command, help_option, option
@@ -58,7 +57,7 @@ def crackerjack(
     if v:
         print("-v not currently implemented")
         options.verbose = v
-    asyncio.run(crackerjack_it(options=options))
+    crackerjack_it(options=options)
 
 
 if __name__ == "__main__":

{crackerjack-0.10.7 → crackerjack-0.11.1}/crackerjack/crackerjack.py

@@ -1,43 +1,33 @@
-import asyncio
 import re
-import sys
 import typing as t
 from pathlib import Path
 from subprocess import run as execute
+from tomllib import loads
 
-from acb.actions.encode import dump, load
-from aioconsole import ainput, aprint
-from aiopath import AsyncPath
-from inflection import underscore
 from pydantic import BaseModel
-
-
-class Config(BaseModel):
-    python_version: str = "3.13"
+from tomli_w import dumps
 
 
 class Crackerjack(BaseModel, arbitrary_types_allowed=True):
-    our_path: AsyncPath = AsyncPath(__file__).parent
-    pkg_path: AsyncPath = AsyncPath(Path.cwd())
-    settings_path: AsyncPath = pkg_path / ".crackerjack.yaml"
-    pkg_dir: t.Optional[AsyncPath] = None
+    our_path: Path = Path(__file__).parent
+    pkg_path: Path = Path(Path.cwd())
+    pkg_dir: t.Optional[Path] = None
     pkg_name: str = "crackerjack"
     our_toml: t.Optional[dict[str, t.Any]] = None
     pkg_toml: t.Optional[dict[str, t.Any]] = None
-    our_toml_path: t.Optional[AsyncPath] = None
-    pkg_toml_path: t.Optional[AsyncPath] = None
-    config: t.Optional[Config] = None
+    our_toml_path: t.Optional[Path] = None
+    pkg_toml_path: t.Optional[Path] = None
+    python_version: str = "3.13"
 
-    async def update_pyproject_configs(self) -> None:
+    def update_pyproject_configs(self) -> None:
         toml_file = "pyproject.toml"
         self.our_toml_path = self.our_path / toml_file
         self.pkg_toml_path = self.pkg_path / toml_file
         if self.pkg_path.stem == "crackerjack":
-            await self.our_toml_path.write_text(await self.pkg_toml_path.read_text())
+            self.our_toml_path.write_text(self.pkg_toml_path.read_text())
             return
-        our_toml_config: t.Any = await load.toml(self.our_toml_path)  # type: ignore
-        pkg_toml_config: t.Any = await load.toml(self.pkg_toml_path)  # type: ignore
-        pkg_deps = pkg_toml_config["dependency-groups"]
+        our_toml_config: t.Any = loads(self.our_toml_path.read_text())
+        pkg_toml_config: t.Any = loads(self.pkg_toml_path.read_text())
         for tool, settings in our_toml_config["tool"].items():
             for setting, value in settings.items():
                 if isinstance(value, str | list) and "crackerjack" in value:
@@ -58,50 +48,47 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
                         pkg_toml_config["tool"][tool][setting] + value
                     )
             pkg_toml_config["tool"][tool] = settings
-        pkg_toml_config["dependency-groups"] = pkg_deps
         python_version_pattern = r"\s*W*(\d\.\d*)"
         requires_python = our_toml_config["project"]["requires-python"]
         classifiers = []
         for classifier in pkg_toml_config["project"]["classifiers"]:
             classifier = re.sub(
-                python_version_pattern, f" {self.config.python_version}", classifier
+                python_version_pattern, f" {self.python_version}", classifier
             )
             classifiers.append(classifier)
         pkg_toml_config["project"]["classifiers"] = classifiers
         pkg_toml_config["project"]["requires-python"] = requires_python
-        await dump.toml(pkg_toml_config, self.pkg_toml_path)  # type: ignore
+        self.pkg_toml_path.write_text(dumps(pkg_toml_config))
 
-    async def copy_configs(self) -> None:
+    def copy_configs(self) -> None:
         config_files = (".gitignore", ".pre-commit-config.yaml", ".libcst.codemod.yaml")
         for config in config_files:
             config_path = self.our_path / config
             pkg_config_path = self.pkg_path / config
-            await pkg_config_path.touch(exist_ok=True)
+            pkg_config_path.touch()
             if self.pkg_path.stem == "crackerjack":
-                await config_path.write_text(await pkg_config_path.read_text())
+                config_path.write_text(pkg_config_path.read_text())
                 continue
             if config != ".gitignore":
-                await pkg_config_path.write_text(
-                    (await config_path.read_text()).replace(
-                        "crackerjack", self.pkg_name
-                    )
+                pkg_config_path.write_text(
+                    (config_path.read_text()).replace("crackerjack", self.pkg_name)
                 )
             execute(["git", "add", config])
 
-    async def run_interactive(self, hook: str) -> None:
+    def run_interactive(self, hook: str) -> None:
         success: bool = False
         while not success:
             fail = execute(["pre-commit", "run", hook.lower(), "--all-files"])
             if fail.returncode > 0:
-                retry = await ainput(f"\n\n{hook.title()} failed. Retry? (y/N): ")
-                await aprint()
+                retry = input(f"\n\n{hook.title()} failed. Retry? (y/N): ")
+                print()
                 if retry.strip().lower() == "y":
                     continue
-                sys.exit()
+                raise SystemExit(1)
             success = True
 
-    async def update_pkg_configs(self) -> None:
-        await self.copy_configs()
+    def update_pkg_configs(self) -> None:
+        self.copy_configs()
         installed_pkgs = execute(
             ["pdm", "list", "--freeze"],
             capture_output=True,
@@ -117,71 +104,57 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
             execute(["git", "add", "pdm.lock"])
             execute(["pre-commit", "install"])
             execute(["git", "config", "advice.addIgnoredFile", "false"])
-        await self.update_pyproject_configs()
-
-    async def load_config(self) -> None:
-        await self.settings_path.touch(exist_ok=True)
-        try:
-            self.config = Config(**await load.yaml(self.settings_path))
-        except TypeError:
-            self.config = Config()
-            await dump.yaml(self.config.model_dump(), self.settings_path)
-            raise SystemExit("\nPlease configure '.crackerjack.yaml' and try again\n")
+        self.update_pyproject_configs()
 
-    async def run_pre_commit(self) -> None:
+    def run_pre_commit(self) -> None:
         check_all = execute(["pre-commit", "run", "--all-files"])
         if check_all.returncode > 0:
             check_all = execute(["pre-commit", "run", "--all-files"])
             if check_all.returncode > 0:
-                await aprint("\n\nPre-commit failed. Please fix errors.\n")
-                raise SystemExit()
+                print("\n\nPre-commit failed. Please fix errors.\n")
+                raise SystemExit(1)
 
-    async def process(self, options: t.Any) -> None:
-        self.pkg_name = underscore(self.pkg_path.stem.lower())
+    def process(self, options: t.Any) -> None:
+        self.pkg_name = self.pkg_path.stem.lower().replace("-", "_")
         self.pkg_dir = self.pkg_path / self.pkg_name
-        await self.pkg_dir.mkdir(exist_ok=True)
-        await aprint("\nCrackerjacking...\n")
+        self.pkg_dir.mkdir(exist_ok=True)
+        print("\nCrackerjacking...\n")
         if not options.do_not_update_configs:
-            await self.update_pkg_configs()
+            self.update_pkg_configs()
             execute(["pdm", "install"])
         if self.pkg_path.stem == "crackerjack" and options.update_precommit:
             execute(["pre-commit", "autoupdate"])
         if options.interactive:
             for hook in ("refurb", "bandit", "pyright"):
-                await self.run_interactive(hook)
-        await self.run_pre_commit()
+                self.run_interactive(hook)
+        self.run_pre_commit()
         for option in (options.publish, options.bump):
             if option:
                 execute(["pdm", "bump", option])
                 break
         if options.publish:
             build = execute(["pdm", "build"], capture_output=True, text=True)
-            await aprint(build.stdout)
+            print(build.stdout)
             if build.returncode > 0:
-                await aprint(build.stderr)
-                await aprint("\n\nBuild failed. Please fix errors.\n")
-                raise SystemExit()
+                print(build.stderr)
+                print("\n\nBuild failed. Please fix errors.\n")
+                raise SystemExit(1)
             execute(["pdm", "publish", "--no-build"])
         if options.commit:
-            commit_msg = await ainput("\nCommit message: ")
+            commit_msg = input("\nCommit message: ")
             execute(
                 [
                     "git",
                     "commit",
                     "-m",
-                    str(commit_msg),
+                    commit_msg,
                     "--no-verify",
                     "--",
                     ".",
                 ]
             )
             execute(["git", "push", "origin", "main"])
-        await aprint("\nCrackerjack complete!\n")
-
-    async def run(self, options: t.Any) -> None:
-        await self.load_config()
-        process = asyncio.create_task(self.process(options))
-        await process
+        print("\nCrackerjack complete!\n")
 
 
-crackerjack_it = Crackerjack().run
+crackerjack_it = Crackerjack().process

{crackerjack-0.10.7 → crackerjack-0.11.1}/crackerjack/pyproject.toml

@@ -1,3 +1,6 @@
+[tool.pytest.ini_options]
+addopts = "--cov=crackerjack"
+
 [tool.codespell]
 skip = "*/data/*"
 quiet-level = 3
@@ -9,6 +12,7 @@ target-version = "py313"
 fix = true
 show-fixes = true
 output-format = "full"
+unsafe-fixes = true
 
 [tool.ruff.format]
 docstring-code-format = true
@@ -57,6 +61,9 @@ exclude-deps = [
     "autotyping",
     "pre-commit",
     "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+    "pytest-mock",
     "pdm",
     "pyfiglet",
     "pyyaml",
@@ -72,6 +79,7 @@ target = [
     "crackerjack",
 ]
 skips = [
+    "B101",
     "B301",
     "B311",
     "B403",
@@ -79,6 +87,7 @@ skips = [
     "B602",
     "B603",
     "B607",
+    "B704",
 ]
 
 [tool.pyright]
@@ -105,7 +114,7 @@ pythonPlatform = "Darwin"
 
 [project]
 name = "crackerjack"
-version = "0.10.6"
+version = "0.11.0"
 description = "Default template for PDM package"
 requires-python = ">=3.13"
 readme = "README.md"
@@ -132,17 +141,16 @@ classifiers = [
 ]
 dependencies = [
     "click>=8.1.8",
-    "aioconsole>=0.8.1",
-    "inflection>=0.5.1",
     "autotyping>=24.9.0",
     "pre-commit>=4.0.1",
     "pytest>=8.3.4",
     "pydantic>=2.10.4",
-    "aiopath>=0.7.7",
     "pdm-bump>=0.9.10",
     "pdm>=2.22.1",
-    "acb>=0.8.0",
     "uv>=0.5.13",
+    "pytest-cov>=6.0.0",
+    "pytest-mock>=3.14.0",
+    "tomli-w>=1.2.0",
 ]
 authors = [
     { name = "lesleslie", email = "les@wedgwoodwebworks.com" },

{crackerjack-0.10.7 → crackerjack-0.11.1}/pyproject.toml

@@ -1,3 +1,6 @@
+[tool.pytest.ini_options]
+addopts = "--cov=crackerjack"
+
 [tool.codespell]
 skip = "*/data/*"
 quiet-level = 3
@@ -9,6 +12,7 @@ target-version = "py313"
 fix = true
 show-fixes = true
 output-format = "full"
+unsafe-fixes = true
 
 [tool.ruff.format]
 docstring-code-format = true
@@ -59,6 +63,9 @@ exclude-deps = [
     "autotyping",
     "pre-commit",
     "pytest",
+    "pytest-asyncio",
+    "pytest-cov",
+    "pytest-mock",
     "pdm",
     "pyfiglet",
     "pyyaml",
@@ -74,6 +81,7 @@ target = [
     "crackerjack",
 ]
 skips = [
+    "B101",
     "B301",
     "B311",
     "B403",
@@ -81,6 +89,7 @@ skips = [
     "B602",
     "B603",
     "B607",
+    "B704",
 ]
 
 [tool.pyright]
@@ -107,7 +116,7 @@ pythonPlatform = "Darwin"
 
 [project]
 name = "crackerjack"
-version = "0.10.7"
+version = "0.11.1"
 description = "Default template for PDM package"
 requires-python = ">=3.13"
 readme = "README.md"
@@ -134,17 +143,16 @@ classifiers = [
 ]
 dependencies = [
     "click>=8.1.8",
-    "aioconsole>=0.8.1",
-    "inflection>=0.5.1",
     "autotyping>=24.9.0",
     "pre-commit>=4.0.1",
     "pytest>=8.3.4",
     "pydantic>=2.10.4",
-    "aiopath>=0.7.7",
     "pdm-bump>=0.9.10",
     "pdm>=2.22.1",
-    "acb>=0.8.0",
     "uv>=0.5.13",
+    "pytest-cov>=6.0.0",
+    "pytest-mock>=3.14.0",
+    "tomli-w>=1.2.0",
 ]
 authors = [
     { name = "lesleslie", email = "les@wedgwoodwebworks.com" },

crackerjack-0.11.1/tests/test_main.py

@@ -0,0 +1,145 @@
+import typing as t
+
+import pytest
+from click.testing import CliRunner
+from crackerjack.__main__ import crackerjack, options  # Import crackerjack and options
+from crackerjack.crackerjack import Crackerjack
+
+
+# Mock crackerjack_it before test suite
+@pytest.fixture(autouse=True)
+def mock_crackerjack_it(monkeypatch: pytest.MonkeyPatch) -> None:
+    def mock_process(self: Crackerjack, options: t.Any) -> None:
+        """Mock implementation for crackerjack_it process function."""
+        pass
+
+    monkeypatch.setattr(Crackerjack, "process", mock_process)
+
+
+@pytest.fixture
+def runner() -> CliRunner:
+    return CliRunner()
+
+
+@pytest.fixture(autouse=True)
+def reset_options() -> None:
+    """Resets the options before each test."""
+    options.commit = False
+    options.interactive = False
+    options.doc = False
+    options.update_precommit = False
+    options.do_not_update_configs = False
+    options.publish = False
+    options.bump = False
+    options.verbose = False
+
+
+def test_no_options(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack)
+    assert result.exit_code == 0
+    assert not options.commit
+    assert not options.interactive
+    assert not options.doc
+    assert not options.update_precommit
+    assert not options.do_not_update_configs
+    assert options.publish is False
+    assert options.bump is False
+    assert not options.verbose
+
+
+def test_commit_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-c"])
+    assert result.exit_code == 1
+    assert options.commit
+
+
+def test_interactive_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-i"])
+    assert result.exit_code == 0
+    assert options.interactive
+
+
+def test_doc_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-d"])
+    assert result.exit_code == 0
+    assert options.doc
+
+
+def test_update_precommit_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-u"])
+    assert result.exit_code == 0
+    assert options.update_precommit
+
+
+def test_do_not_update_configs_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-x"])
+    assert result.exit_code == 0
+    assert options.do_not_update_configs
+
+
+# def test_publish_micro_option(runner: CliRunner) -> None:
+#     result = runner.invoke(crackerjack, ["-p", "micro"])
+#     assert result.exit_code == 0
+#     assert options.publish == "micro"
+#
+#
+# def test_publish_minor_option(runner: CliRunner) -> None:
+#     result = runner.invoke(crackerjack, ["-p", "minor"])
+#     assert result.exit_code == 0
+#     assert options.publish == "minor"
+#
+#
+# def test_publish_major_option(runner: CliRunner) -> None:
+#     result = runner.invoke(crackerjack, ["-p", "major"])
+#     assert result.exit_code == 0
+#     assert options.publish == "major"
+#
+#
+# def test_bump_micro_option(runner: CliRunner) -> None:
+#     result = runner.invoke(crackerjack, ["-b", "micro"])
+#     assert result.exit_code == 0
+#     assert options.bump == "micro"
+#
+#
+# def test_bump_minor_option(runner: CliRunner) -> None:
+#     result = runner.invoke(crackerjack, ["-b", "minor"])
+#     assert result.exit_code == 0
+#     assert options.bump == "minor"
+#
+#
+# def test_bump_major_option(runner: CliRunner) -> None:
+#     result = runner.invoke(crackerjack, ["-b", "major"])
+#     assert result.exit_code == 0
+#     assert options.bump == "major"
+
+
+def test_verbose_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-v"])
+    assert result.exit_code == 0
+    assert options.verbose
+    assert "-v not currently implemented" in result.output
+
+
+def test_multiple_options(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-c", "-i"])
+    assert result.exit_code == 1
+    assert options.commit
+    assert options.interactive
+
+
+def test_help_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-h"])
+    assert result.exit_code == 0
+    assert "Usage: " in result.output
+
+
+def test_invalid_publish_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-p", "invalid"])
+    assert result.exit_code == 0
+    assert options.publish is False
+
+
+def test_invalid_bump_option(runner: CliRunner) -> None:
+    result = runner.invoke(crackerjack, ["-b", "invalid"])
+    assert result.exit_code == 0
+    assert options.bump is False