crackerjack 0.14.4__tar.gz → 0.14.6__tar.gz

{crackerjack-0.14.4 → crackerjack-0.14.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.14.4
+Version: 0.14.6
 Summary: Default template for PDM package
 Keywords: black,ruff,mypy,creosote,refurb
 Author-Email: lesleslie <les@wedgwoodwebworks.com>
@@ -23,12 +23,12 @@ Project-URL: documentation, https://github.com/lesleslie/crackerjack
 Project-URL: repository, https://github.com/lesleslie/crackerjack
 Requires-Python: >=3.13
 Requires-Dist: autotyping>=24.9.0
-Requires-Dist: pre-commit>=4.1.0
+Requires-Dist: pre-commit>=4.2.0
 Requires-Dist: pytest>=8.3.5
 Requires-Dist: pydantic>=2.10.6
 Requires-Dist: pdm-bump>=0.9.10
 Requires-Dist: pdm>=2.22.4
-Requires-Dist: uv>=0.6.6
+Requires-Dist: uv>=0.6.9
 Requires-Dist: pytest-cov>=6.0.0
 Requires-Dist: pytest-mock>=3.14.0
 Requires-Dist: tomli-w>=1.2.0

{crackerjack-0.14.4 → crackerjack-0.14.6}/crackerjack/.pre-commit-config.yaml

@@ -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.10
+    rev: v0.11.2
     hooks:
       - id: ruff-format
       - id: ruff
@@ -65,11 +65,11 @@ repos:
       - id: bandit
         args: ["-c", "pyproject.toml"]
   - repo: https://github.com/RobertCraigie/pyright-python
-    rev: v1.1.396
+    rev: v1.1.397
     hooks:
       - id: pyright
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.10
+    rev: v0.11.2
     hooks:
       - id: ruff
       - id: ruff-format

{crackerjack-0.14.4 → crackerjack-0.14.6}/crackerjack/crackerjack.py

@@ -5,13 +5,13 @@ import subprocess
 import tokenize
 import typing as t
 from contextlib import suppress
+from dataclasses import dataclass, field
 from pathlib import Path
 from subprocess import CompletedProcess
 from subprocess import run as execute
 from token import STRING
 from tomllib import loads
 
-from pydantic import BaseModel
 from rich.console import Console
 from tomli_w import dumps
 
@@ -20,7 +20,8 @@ interactive_hooks = ("refurb", "bandit", "pyright")
 default_python_version = "3.13"
 
 
-class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
+@dataclass
+class CodeCleaner:
     console: Console
 
     def clean_files(self, pkg_dir: Path | None) -> None:
@@ -35,20 +36,20 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
     def clean_file(self, file_path: Path) -> None:
         try:
             if file_path.resolve() == Path(__file__).resolve():
-                print(f"Skipping cleaning of {file_path} (self file).")
+                self.console.print(f"Skipping cleaning of {file_path} (self file).")
                 return
         except Exception as e:
-            print(f"Error comparing file paths: {e}")
+            self.console.print(f"Error comparing file paths: {e}")
         try:
             code = file_path.read_text()
             code = self.remove_docstrings(code)
             code = self.remove_line_comments(code)
             code = self.remove_extra_whitespace(code)
             code = self.reformat_code(code)
-            file_path.write_text(code)
-            print(f"Cleaned: {file_path}")
+            file_path.write_text(code)  # type: ignore
+            self.console.print(f"Cleaned: {file_path}")
         except Exception as e:
-            print(f"Error cleaning {file_path}: {e}")
+            self.console.print(f"Error cleaning {file_path}: {e}")
 
     def remove_line_comments(self, code: str) -> str:
         new_lines = []
@@ -59,38 +60,98 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
             idx = line.find("#")
             code_part = line[:idx].rstrip()
             comment_part = line[idx:]
-            if "type: ignore" in comment_part or "noqa" in comment_part:
+            if (
+                "type: ignore" in comment_part
+                or "noqa" in comment_part
+                or "nosec" in comment_part
+            ):
                 new_lines.append(line)
             else:
                 if code_part:
                     new_lines.append(code_part)
         return "\n".join(new_lines)
 
+    def _is_triple_quoted(self, token_string: str) -> bool:
+        triple_quote_patterns = [
+            ('"""', '"""'),
+            ("'''", "'''"),
+            ('r"""', '"""'),
+            ("r'''", "'''"),
+        ]
+        return any(
+            token_string.startswith(start) and token_string.endswith(end)
+            for start, end in triple_quote_patterns
+        )
+
+    def _is_module_docstring(
+        self, tokens: list[tokenize.TokenInfo], i: int, indent_level: int
+    ) -> bool:
+        if i <= 0 or indent_level != 0:
+            return False
+        preceding_tokens = tokens[:i]
+        return not preceding_tokens
+
+    def _is_function_or_class_docstring(
+        self,
+        tokens: list[tokenize.TokenInfo],
+        i: int,
+        last_token_type: t.Any,
+        last_token_string: str,
+    ) -> bool:
+        if last_token_type != tokenize.OP or last_token_string != ":":  # nosec B105
+            return False
+        for prev_idx in range(i - 1, max(0, i - 20), -1):
+            prev_token = tokens[prev_idx]
+            if prev_token[1] in ("def", "class") and prev_token[0] == tokenize.NAME:
+                return True
+            elif prev_token[0] == tokenize.DEDENT:
+                break
+        return False
+
+    def _is_variable_docstring(
+        self, tokens: list[tokenize.TokenInfo], i: int, indent_level: int
+    ) -> bool:
+        if indent_level <= 0:
+            return False
+        for prev_idx in range(i - 1, max(0, i - 10), -1):
+            if tokens[prev_idx][0]:
+                return True
+        return False
+
     def remove_docstrings(self, source: str) -> str:
         try:
             io_obj = io.StringIO(source)
-            output_tokens = []
-            first_token_stack = [True]
             tokens = list(tokenize.generate_tokens(io_obj.readline))
-            for tok in tokens:
-                token_type = tok.type
+            result_tokens = []
+            indent_level = 0
+            last_non_ws_token_type = None
+            last_non_ws_token_string = ""  # nosec B105
+            for i, token in enumerate(tokens):
+                token_type, token_string, _, _, _ = token
                 if token_type == tokenize.INDENT:
-                    first_token_stack.append(True)
+                    indent_level += 1
                 elif token_type == tokenize.DEDENT:
-                    if len(first_token_stack) > 1:
-                        first_token_stack.pop()
-                if token_type == STRING and first_token_stack[-1]:
-                    first_token_stack[-1] = False
-                    continue
-                else:
-                    if token_type not in (
-                        tokenize.NEWLINE,
-                        tokenize.NL,
-                        tokenize.COMMENT,
-                    ):
-                        first_token_stack[-1] = False
-                output_tokens.append(tok)
-            return tokenize.untokenize(output_tokens)
+                    indent_level -= 1
+                if token_type == STRING and self._is_triple_quoted(token_string):
+                    is_docstring = (
+                        self._is_module_docstring(tokens, i, indent_level)
+                        or self._is_function_or_class_docstring(
+                            tokens, i, last_non_ws_token_type, last_non_ws_token_string
+                        )
+                        or self._is_variable_docstring(tokens, i, indent_level)
+                    )
+                    if is_docstring:
+                        continue
+                if token_type not in (
+                    tokenize.NL,
+                    tokenize.NEWLINE,
+                    tokenize.INDENT,
+                    tokenize.DEDENT,
+                ):
+                    last_non_ws_token_type = token_type
+                    last_non_ws_token_string = token_string
+                result_tokens.append(token)
+            return tokenize.untokenize(result_tokens)
         except Exception as e:
             self.console.print(f"Error removing docstrings: {e}")
             return source
@@ -105,7 +166,7 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
             cleaned_lines.append(line)
         return "\n".join(cleaned_lines)
 
-    def reformat_code(self, code: str) -> str:
+    def reformat_code(self, code: str) -> str | None:
         try:
             import tempfile
 
@@ -124,21 +185,22 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
                 if result.returncode == 0:
                     formatted_code = temp_path.read_text()
                 else:
-                    print(f"Ruff formatting failed: {result.stderr}")
+                    self.console.print(f"Ruff formatting failed: {result.stderr}")
                     formatted_code = code
             except Exception as e:
-                print(f"Error running Ruff: {e}")
+                self.console.print(f"Error running Ruff: {e}")
                 formatted_code = code
             finally:
                 with suppress(FileNotFoundError):
                     temp_path.unlink()
             return formatted_code
         except Exception as e:
-            print(f"Error during reformatting: {e}")
+            self.console.print(f"Error during reformatting: {e}")
             return code
 
 
-class ConfigManager(BaseModel, arbitrary_types_allowed=True):
+@dataclass
+class ConfigManager:
     our_path: Path
     pkg_path: Path
     pkg_name: str
@@ -262,14 +324,15 @@ class ConfigManager(BaseModel, arbitrary_types_allowed=True):
         return execute(cmd, **kwargs)
 
 
-class ProjectManager(BaseModel, arbitrary_types_allowed=True):
+@dataclass
+class ProjectManager:
     our_path: Path
     pkg_path: Path
-    pkg_dir: Path | None = None
-    pkg_name: str = "crackerjack"
     console: Console
     code_cleaner: CodeCleaner
     config_manager: ConfigManager
+    pkg_dir: Path | None = None
+    pkg_name: str = "crackerjack"
     dry_run: bool = False
 
     def run_interactive(self, hook: str) -> None:
@@ -321,39 +384,42 @@ class ProjectManager(BaseModel, arbitrary_types_allowed=True):
         return execute(cmd, **kwargs)
 
 
-class Crackerjack(BaseModel, arbitrary_types_allowed=True):
-    our_path: Path = Path(__file__).parent
-    pkg_path: Path = Path(Path.cwd())
+@dataclass
+class Crackerjack:
+    our_path: Path = field(default_factory=lambda: Path(__file__).parent)
+    pkg_path: Path = field(default_factory=lambda: Path(Path.cwd()))
     pkg_dir: Path | None = None
     pkg_name: str = "crackerjack"
     python_version: str = default_python_version
-    console: Console = Console(force_terminal=True)
+    console: Console = field(default_factory=lambda: Console(force_terminal=True))
     dry_run: bool = False
     code_cleaner: CodeCleaner | None = None
     config_manager: ConfigManager | None = None
     project_manager: ProjectManager | None = None
 
-    def __init__(self, **data: t.Any) -> None:
-        super().__init__(**data)
-        self.code_cleaner = CodeCleaner(console=self.console)
-        self.config_manager = ConfigManager(
-            our_path=self.our_path,
-            pkg_path=self.pkg_path,
-            pkg_name=self.pkg_name,
-            console=self.console,
-            python_version=self.python_version,
-            dry_run=self.dry_run,
-        )
-        self.project_manager = ProjectManager(
-            our_path=self.our_path,
-            pkg_path=self.pkg_path,
-            pkg_dir=self.pkg_dir,
-            pkg_name=self.pkg_name,
-            console=self.console,
-            code_cleaner=self.code_cleaner,
-            config_manager=self.config_manager,
-            dry_run=self.dry_run,
-        )
+    def __post_init__(self) -> None:
+        if self.code_cleaner is None:
+            self.code_cleaner = CodeCleaner(console=self.console)
+        if self.config_manager is None:
+            self.config_manager = ConfigManager(
+                our_path=self.our_path,
+                pkg_path=self.pkg_path,
+                pkg_name=self.pkg_name,
+                console=self.console,
+                python_version=self.python_version,
+                dry_run=self.dry_run,
+            )
+        if self.project_manager is None:
+            self.project_manager = ProjectManager(
+                our_path=self.our_path,
+                pkg_path=self.pkg_path,
+                pkg_dir=self.pkg_dir,
+                pkg_name=self.pkg_name,
+                console=self.console,
+                code_cleaner=self.code_cleaner,
+                config_manager=self.config_manager,
+                dry_run=self.dry_run,
+            )
 
     def _setup_package(self) -> None:
         self.pkg_name = self.pkg_path.stem.lower().replace("-", "_")

{crackerjack-0.14.4 → crackerjack-0.14.6}/crackerjack/pyproject.toml

@@ -2,9 +2,10 @@
 addopts = "--cov=crackerjack"
 asyncio_default_fixture_loop_scope = "function"
 python_files = ["test_*.py", "*_test.py"]
-python_classes = "Test*"
-python_functions = "test_*"
 asyncio_mode = "auto"
+testpaths = ["tests", "crackerjack"]
+python_classes = ["Test*"]
+python_functions = ["test_*"]
 
 [tool.coverage.run]
 branch = true
@@ -14,6 +15,7 @@ omit = [
     "*/site-packages/*",
     "*/__pycache__/*",
     "*/__init__.py",
+    "*/_version.py", "*/conftest.py", "*/test_*.py", "*/_test.py"
     ]
 
 [tool.coverage.report]
@@ -147,7 +149,7 @@ pythonPlatform = "Darwin"
 
 [project]
 name = "crackerjack"
-version = "0.14.3"
+version = "0.14.5"
 description = "Default template for PDM package"
 requires-python = ">=3.13"
 readme = "README.md"
@@ -174,12 +176,12 @@ classifiers = [
 ]
 dependencies = [
     "autotyping>=24.9.0",
-    "pre-commit>=4.1.0",
+    "pre-commit>=4.2.0",
     "pytest>=8.3.5",
     "pydantic>=2.10.6",
     "pdm-bump>=0.9.10",
     "pdm>=2.22.4",
-    "uv>=0.6.6",
+    "uv>=0.6.9",
     "pytest-cov>=6.0.0",
     "pytest-mock>=3.14.0",
     "tomli-w>=1.2.0",

{crackerjack-0.14.4 → crackerjack-0.14.6}/pyproject.toml

@@ -5,9 +5,17 @@ python_files = [
     "test_*.py",
     "*_test.py",
 ]
-python_classes = "Test*"
-python_functions = "test_*"
 asyncio_mode = "auto"
+testpaths = [
+    "tests",
+    "crackerjack",
+]
+python_classes = [
+    "Test*",
+]
+python_functions = [
+    "test_*",
+]
 
 [tool.coverage.run]
 branch = true
@@ -19,6 +27,10 @@ omit = [
     "*/site-packages/*",
     "*/__pycache__/*",
     "*/__init__.py",
+    "*/_version.py",
+    "*/conftest.py",
+    "*/test_*.py",
+    "*/_test.py",
 ]
 
 [tool.coverage.report]
@@ -156,7 +168,7 @@ pythonPlatform = "Darwin"
 
 [project]
 name = "crackerjack"
-version = "0.14.4"
+version = "0.14.6"
 description = "Default template for PDM package"
 requires-python = ">=3.13"
 readme = "README.md"
@@ -183,12 +195,12 @@ classifiers = [
 ]
 dependencies = [
     "autotyping>=24.9.0",
-    "pre-commit>=4.1.0",
+    "pre-commit>=4.2.0",
     "pytest>=8.3.5",
     "pydantic>=2.10.6",
     "pdm-bump>=0.9.10",
     "pdm>=2.22.4",
-    "uv>=0.6.6",
+    "uv>=0.6.9",
     "pytest-cov>=6.0.0",
     "pytest-mock>=3.14.0",
     "tomli-w>=1.2.0",

crackerjack-0.14.6/tests/data/docstrings_sample.txt

@@ -0,0 +1,20 @@
+
+def test_func():
+    """This is a docstring."""
+    return True
+
+class TestClass:
+    """Class docstring."""
+
+    def method1(self):
+        '''Method docstring.'''
+        pass
+
+    def method2(self):
+        """
+        Method docstring.
+
+        This is a multi-line docstring.
+
+        """
+        pass

{crackerjack-0.14.4 → crackerjack-0.14.6}/tests/test_crackerjack.py

@@ -1,12 +1,12 @@
 import os
 import typing as t
 from contextlib import suppress
+from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
 from unittest.mock import MagicMock, patch
 
 import pytest
-from pydantic import BaseModel
 from rich.console import Console
 from crackerjack.crackerjack import (
     CodeCleaner,
@@ -25,18 +25,19 @@ class BumpOption(str, Enum):
         return self.value
 
 
-class OptionsForTesting(BaseModel):
+@dataclass
+class OptionsForTesting:
     commit: bool = False
     interactive: bool = False
     doc: bool = False
     no_config_updates: bool = False
-    publish: t.Optional[BumpOption] = None
-    bump: t.Optional[BumpOption] = None
+    publish: BumpOption | None = None
+    bump: BumpOption | None = None
     verbose: bool = False
     update_precommit: bool = False
     clean: bool = False
     test: bool = False
-    all: t.Optional[BumpOption] = None
+    all: BumpOption | None = None
 
 
 @pytest.fixture
@@ -98,6 +99,8 @@ class TestCrackerjackProcess:
                 kwargs["publish"] = BumpOption(kwargs["publish"])
             if "bump" in kwargs and isinstance(kwargs["bump"], str):
                 kwargs["bump"] = BumpOption(kwargs["bump"])
+            if "all" in kwargs and isinstance(kwargs["all"], str):
+                kwargs["all"] = BumpOption(kwargs["all"])
             return OptionsForTesting(**kwargs)
 
         return _create_options
@@ -901,11 +904,15 @@ class TestCrackerjackProcess:
             Path(__file__).parent / "data" / "docstrings_sample.txt"
         ).read_text()
         cleaned_code = code_cleaner.remove_docstrings(code_with_docstrings)
+        print(cleaned_code)
         assert '"""This is a docstring."""' not in cleaned_code, (
             f"Got: {cleaned_code!r}"
         )
         assert '"""Class docstring."""' not in cleaned_code, f"Got: {cleaned_code!r}"
-        assert '"""Method docstring."""' not in cleaned_code, f"Got: {cleaned_code!r}"
+        assert "'''Method docstring.'''" not in cleaned_code, f"Got: {cleaned_code!r}"
+        assert "This is a multi-line docstring." not in cleaned_code, (
+            f"Got: {cleaned_code!r}"
+        )
 
     def test_code_cleaner_remove_line_comments(self) -> None:
         from pathlib import Path
@@ -961,16 +968,25 @@ class TestCrackerjackProcess:
     def test_code_cleaner_reformat_code_failure(
         self, mock_execute: MagicMock, mock_console_print: MagicMock, tmp_path: Path
     ) -> None:
-        code_cleaner = CodeCleaner(console=Console())
+        from rich.console import Console
+
+        console = Console()
+
+        code_cleaner = CodeCleaner(console=console)
         code_to_format = "def test_func():\n    return True\n"
+
         with patch("subprocess.run") as mock_run:
             mock_run.return_value = MagicMock(returncode=1, stderr="Formatting error")
-            with patch("builtins.print") as mock_print:
-                with patch("pathlib.Path.write_text"):
+
+            with patch("pathlib.Path.write_text"):
+                with patch.object(console, "print") as mock_console_print_method:
                     formatted_code = code_cleaner.reformat_code(code_to_format)
+
                     assert formatted_code == code_to_format
+
                     mock_run.assert_called_once()
-                    mock_print.assert_any_call(
+
+                    mock_console_print_method.assert_any_call(
                         "Ruff formatting failed: Formatting error"
                     )
 

crackerjack-0.14.4/tests/data/docstrings_sample.txt

@@ -1,10 +0,0 @@
-"""def test_func():
-    \"\"\"This is a docstring.\"\"\"
-    return True
-
-class TestClass:
-    \"\"\"Class docstring.\"\"\"
-    def method(self):
-        \"\"\"Method docstring.\"\"\"
-        pass
-"""