crackerjack 0.11.1__tar.gz → 0.11.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.11.1
+Version: 0.11.2
 Summary: Default template for PDM package
 Keywords: black,ruff,mypy,creosote,refurb
 Author-Email: lesleslie <les@wedgwoodwebworks.com>
@@ -33,6 +33,7 @@ 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
+Requires-Dist: pytest-asyncio>=0.25.3
 Description-Content-Type: text/markdown
 
 # Crackerjack Python

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

@@ -28,6 +28,8 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
             return
         our_toml_config: t.Any = loads(self.our_toml_path.read_text())
         pkg_toml_config: t.Any = loads(self.pkg_toml_path.read_text())
+        pkg_toml_config.setdefault("tool", {})
+        pkg_toml_config.setdefault("project", {})
         for tool, settings in our_toml_config["tool"].items():
             for setting, value in settings.items():
                 if isinstance(value, str | list) and "crackerjack" in value:
@@ -44,14 +46,13 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
                     "skips",
                     "ignore",
                 ) and isinstance(value, list):
-                    settings[setting] = set(
-                        pkg_toml_config["tool"][tool][setting] + value
-                    )
+                    conf = pkg_toml_config["tool"].get(tool, {}).get(setting, [])
+                    settings[setting] = list(set(conf + value))
             pkg_toml_config["tool"][tool] = settings
         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"]:
+        for classifier in pkg_toml_config["project"].get("classifiers", []):
             classifier = re.sub(
                 python_version_pattern, f" {self.python_version}", classifier
             )

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

@@ -1,5 +1,6 @@
 [tool.pytest.ini_options]
 addopts = "--cov=crackerjack"
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.codespell]
 skip = "*/data/*"
@@ -114,7 +115,7 @@ pythonPlatform = "Darwin"
 
 [project]
 name = "crackerjack"
-version = "0.11.0"
+version = "0.11.1"
 description = "Default template for PDM package"
 requires-python = ">=3.13"
 readme = "README.md"
@@ -151,6 +152,7 @@ dependencies = [
     "pytest-cov>=6.0.0",
     "pytest-mock>=3.14.0",
     "tomli-w>=1.2.0",
+    "pytest-asyncio>=0.25.3",
 ]
 authors = [
     { name = "lesleslie", email = "les@wedgwoodwebworks.com" },

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

@@ -1,5 +1,6 @@
 [tool.pytest.ini_options]
 addopts = "--cov=crackerjack"
+asyncio_default_fixture_loop_scope = "function"
 
 [tool.codespell]
 skip = "*/data/*"
@@ -116,7 +117,7 @@ pythonPlatform = "Darwin"
 
 [project]
 name = "crackerjack"
-version = "0.11.1"
+version = "0.11.2"
 description = "Default template for PDM package"
 requires-python = ">=3.13"
 readme = "README.md"
@@ -153,6 +154,7 @@ dependencies = [
     "pytest-cov>=6.0.0",
     "pytest-mock>=3.14.0",
     "tomli-w>=1.2.0",
+    "pytest-asyncio>=0.25.3",
 ]
 authors = [
     { name = "lesleslie", email = "les@wedgwoodwebworks.com" },

crackerjack-0.11.2/tests/test_crackerjack.py

@@ -0,0 +1,174 @@
+import typing as t
+from pathlib import Path
+from unittest.mock import MagicMock, call, patch
+
+import pytest
+from crackerjack.__main__ import options
+from crackerjack.crackerjack import Crackerjack
+
+
+@pytest.fixture
+def mock_execute() -> t.Generator[t.Any, t.Any, t.Any]:
+    with patch("crackerjack.crackerjack.execute") as mock:
+        yield mock
+
+
+@pytest.fixture
+def mock_subprocess_run() -> t.Generator[t.Any, t.Any, t.Any]:
+    with patch("subprocess.run") as mock:
+        yield mock
+
+
+@pytest.fixture
+def mock_print() -> t.Generator[t.Any, t.Any, t.Any]:
+    with patch("builtins.print") as mock:
+        yield mock
+
+
+@pytest.fixture
+def mock_input() -> t.Generator[t.Any, t.Any, t.Any]:
+    with patch("builtins.input") as mock:
+        yield mock
+
+
+@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
+
+
+@pytest.fixture
+def tmp_path_package(tmp_path: Path) -> Path:
+    return tmp_path / "my-package"
+
+
+@pytest.fixture
+def create_package_dir(tmp_path_package: Path) -> None:
+    (tmp_path_package / "my_package").mkdir(parents=True)
+    (tmp_path_package / "pyproject.toml").touch()
+    (tmp_path_package / ".gitignore").touch()
+    (tmp_path_package / ".pre-commit-config.yaml").touch()
+    (tmp_path_package / ".libcst.codemod.yaml").touch()
+
+
+class TestCrackerjackProcess:
+    def test_process_all_options(
+        self,
+        mock_execute: MagicMock,
+        mock_print: MagicMock,
+        mock_input: MagicMock,
+        mock_subprocess_run: MagicMock,
+        tmp_path: Path,
+        tmp_path_package: Path,
+        create_package_dir: None,
+    ) -> None:
+        mock_input.return_value = "Test Commit"
+        mock_execute.return_value.returncode = 0
+        mock_execute.return_value.stdout = "Mock Build Output"
+        mock_subprocess_run.return_value.returncode = 0
+        mock_execute.return_value.stderr = ""
+        mock_subprocess_run.return_value.stdout = ""
+        mock_subprocess_run.return_value.stderr = ""
+        crackerjack_instance = Crackerjack(pkg_path=tmp_path_package)
+        options_mock = MagicMock()
+        options_mock.do_not_update_configs = False
+        options_mock.update_precommit = True
+        options_mock.interactive = True
+        options_mock.commit = False
+        options_mock.publish = None
+        options_mock.bump = None
+        crackerjack_instance.process(options_mock)
+
+        assert crackerjack_instance.pkg_name == "my_package"
+        (tmp_path_package / "my_package").exists()
+        mock_execute.assert_has_calls(
+            [
+                call(["pdm", "self", "add", "keyring"]),
+                call(["pdm", "config", "python.use_uv", "true"]),
+                call(["git", "init"]),
+                call(["git", "branch", "-m", "main"]),
+                call(["git", "add", "pyproject.toml"]),
+                call(["git", "add", "pdm.lock"]),
+                call(["pre-commit", "install"]),
+                call(["git", "config", "advice.addIgnoredFile", "false"]),
+                call(["pdm", "install"]),
+                call(["pre-commit", "run", "refurb", "--all-files"]),
+                call(["pre-commit", "run", "bandit", "--all-files"]),
+                call(["pre-commit", "run", "pyright", "--all-files"]),
+                call(["pre-commit", "run", "--all-files"]),
+                call(["git", "add", ".gitignore"]),
+                call(["git", "add", ".pre-commit-config.yaml"]),
+                call(["git", "add", ".libcst.codemod.yaml"]),
+            ],
+            any_order=True,
+        )
+
+    def test_process_no_options(
+        self,
+        mock_execute: MagicMock,
+        mock_print: MagicMock,
+        mock_subprocess_run: MagicMock,
+        tmp_path_package: Path,
+        create_package_dir: None,
+    ) -> None:
+        mock_execute.return_value.returncode = 0
+        mock_subprocess_run.return_value.returncode = 0
+        crackerjack_instance = Crackerjack(pkg_path=tmp_path_package)
+        options_mock = MagicMock()
+        options_mock.do_not_update_configs = True
+        options_mock.update_precommit = False
+        options_mock.interactive = False
+        options_mock.publish = None
+        options_mock.bump = None
+        options_mock.commit = False
+
+        crackerjack_instance.process(options_mock)
+
+        assert crackerjack_instance.pkg_name == "my_package"
+        (tmp_path_package / "my_package").exists()
+        mock_execute.assert_has_calls(
+            [
+                call(["pre-commit", "run", "--all-files"]),
+            ]
+        )
+
+    def test_process_interactive_hooks(
+        self,
+        mock_execute: MagicMock,
+        mock_print: MagicMock,
+        mock_subprocess_run: MagicMock,
+        tmp_path_package: Path,
+        create_package_dir: None,
+    ) -> None:
+        mock_execute.return_value.returncode = 0
+        mock_subprocess_run.return_value.returncode = 0
+
+        crackerjack_instance = Crackerjack(pkg_path=tmp_path_package)
+        options_mock = MagicMock()
+        options_mock.do_not_update_configs = False
+        options_mock.update_precommit = False
+        options_mock.interactive = True
+        options_mock.publish = None
+        options_mock.bump = None
+        options_mock.commit = False
+
+        crackerjack_instance.process(options_mock)
+
+        assert crackerjack_instance.pkg_name == "my_package"
+        (tmp_path_package / "my_package").exists()
+
+        mock_execute.assert_has_calls(
+            [
+                call(["pre-commit", "run", "refurb", "--all-files"]),
+                call(["pre-commit", "run", "bandit", "--all-files"]),
+                call(["pre-commit", "run", "pyright", "--all-files"]),
+                call(["pre-commit", "run", "--all-files"]),
+            ]
+        )

{crackerjack-0.11.1 → crackerjack-0.11.2}/tests/test_main.py

@@ -2,15 +2,13 @@ import typing as t
 
 import pytest
 from click.testing import CliRunner
-from crackerjack.__main__ import crackerjack, options  # Import crackerjack and options
+from crackerjack.__main__ import crackerjack, 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)
@@ -23,7 +21,6 @@ def runner() -> CliRunner:
 
 @pytest.fixture(autouse=True)
 def reset_options() -> None:
-    """Resets the options before each test."""
     options.commit = False
     options.interactive = False
     options.doc = False