crackerjack 0.20.13__py3-none-any.whl → 0.20.15__py3-none-any.whl

crackerjack/__init__.py

@@ -1,4 +1,5 @@
 import typing as t
+
 from .crackerjack import Crackerjack, create_crackerjack_runner
 from .errors import (
     CleaningError,

crackerjack/__main__.py

@@ -1,4 +1,5 @@
 from enum import Enum
+
 import typer
 from pydantic import BaseModel, field_validator
 from rich.console import Console

crackerjack/crackerjack.py

@@ -1,4 +1,3 @@
-import ast
 import re
 import subprocess
 import typing as t
@@ -7,6 +6,7 @@ from pathlib import Path
 from subprocess import CompletedProcess
 from subprocess import run as execute
 from tomllib import loads
+
 from pydantic import BaseModel
 from rich.console import Console
 from tomli_w import dumps
@@ -73,8 +73,8 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
     def clean_file(self, file_path: Path) -> None:
         try:
             code = file_path.read_text()
-            code = self.remove_docstrings(code)
             code = self.remove_line_comments(code)
+            code = self.remove_docstrings(code)
             code = self.remove_extra_whitespace(code)
             code = self.reformat_code(code)
             file_path.write_text(code)
@@ -83,18 +83,44 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
             print(f"Error cleaning {file_path}: {e}")
 
     def remove_docstrings(self, code: str) -> str:
-        tree = ast.parse(code)
-        for node in ast.walk(tree):
-            if isinstance(
-                node, ast.FunctionDef | ast.AsyncFunctionDef | ast.ClassDef | ast.Module
-            ):
-                if ast.get_docstring(node):
-                    node.body = (
-                        node.body[1:]
-                        if isinstance(node.body[0], ast.Expr)
-                        else node.body
-                    )
-        return ast.unparse(tree)
+        lines = code.split("\n")
+        cleaned_lines = []
+        in_docstring = False
+        docstring_delimiter = None
+        waiting_for_docstring = False
+        for line in lines:
+            stripped = line.strip()
+            if stripped.startswith(("def ", "class ", "async def ")):
+                waiting_for_docstring = True
+                cleaned_lines.append(line)
+                continue
+            if waiting_for_docstring and stripped:
+                if stripped.startswith(('"""', "'''", '"', "'")):
+                    if stripped.startswith(('"""', "'''")):
+                        docstring_delimiter = stripped[:3]
+                    else:
+                        docstring_delimiter = stripped[0]
+                    if stripped.endswith(docstring_delimiter) and len(stripped) > len(
+                        docstring_delimiter
+                    ):
+                        waiting_for_docstring = False
+                        continue
+                    else:
+                        in_docstring = True
+                        waiting_for_docstring = False
+                        continue
+                else:
+                    waiting_for_docstring = False
+            if in_docstring:
+                if docstring_delimiter and stripped.endswith(docstring_delimiter):
+                    in_docstring = False
+                    docstring_delimiter = None
+                    continue
+                else:
+                    continue
+            cleaned_lines.append(line)
+
+        return "\n".join(cleaned_lines)
 
     def remove_line_comments(self, code: str) -> str:
         lines = code.split("\n")
@@ -119,7 +145,7 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
                 elif char == "#" and in_string is None:
                     comment = line[i:].strip()
                     if re.match(
-                        "^#\\s*(?:type:\\s*ignore|noqa|nosec|pragma:\\s*no\\s*cover|pylint:\\s*disable|mypy:\\s*ignore)",
+                        r"^#\s*(?:type:\s*ignore(?:\[.*?\])?|noqa|nosec|pragma:\s*no\s*cover|pylint:\s*disable|mypy:\s*ignore)",
                         comment,
                     ):
                         result.append(line[i:])
@@ -167,16 +193,14 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
                             or (
                                 next_line.startswith("#")
                                 and any(
-                                    (
-                                        pattern in next_line
-                                        for pattern in (
-                                            "type:",
-                                            "noqa",
-                                            "nosec",
-                                            "pragma:",
-                                            "pylint:",
-                                            "mypy:",
-                                        )
+                                    pattern in next_line
+                                    for pattern in (
+                                        "type:",
+                                        "noqa",
+                                        "nosec",
+                                        "pragma:",
+                                        "pylint:",
+                                        "mypy:",
                                     )
                                 )
                             )

crackerjack/errors.py

@@ -2,6 +2,7 @@ import sys
 import typing as t
 from enum import Enum
 from pathlib import Path
+
 from rich.console import Console
 from rich.panel import Panel
 

crackerjack/interactive.py

@@ -2,6 +2,7 @@ import time
 import typing as t
 from enum import Enum, auto
 from pathlib import Path
+
 from rich.box import ROUNDED
 from rich.console import Console
 from rich.layout import Layout
@@ -18,6 +19,7 @@ from rich.prompt import Confirm, Prompt
 from rich.table import Table
 from rich.text import Text
 from rich.tree import Tree
+
 from .errors import CrackerjackError, ErrorCode, handle_error
 
 
@@ -66,10 +68,8 @@ class Task:
 
     def can_run(self) -> bool:
         return all(
-            (
-                dep.status in (TaskStatus.SUCCESS, TaskStatus.SKIPPED)
-                for dep in self.dependencies
-            )
+            dep.status in (TaskStatus.SUCCESS, TaskStatus.SKIPPED)
+            for dep in self.dependencies
         )
 
     def __str__(self) -> str:
@@ -107,11 +107,8 @@ class WorkflowManager:
 
     def all_tasks_completed(self) -> bool:
         return all(
-            (
-                task.status
-                in (TaskStatus.SUCCESS, TaskStatus.FAILED, TaskStatus.SKIPPED)
-                for task in self.tasks.values()
-            )
+            task.status in (TaskStatus.SUCCESS, TaskStatus.FAILED, TaskStatus.SKIPPED)
+            for task in self.tasks.values()
         )
 
     def run_task(self, task: Task, func: t.Callable[[], t.Any]) -> bool:
@@ -257,7 +254,7 @@ class InteractiveCLI:
                 status = "[grey]⏸️ Pending[/grey]"
             duration = task.duration
             duration_text = f"{duration:.2f}s" if duration else "-"
-            deps = ", ".join((dep.name for dep in task.dependencies)) or "-"
+            deps = ", ".join(dep.name for dep in task.dependencies) or "-"
             table.add_row(task.name, status, duration_text, deps)
         return table
 
@@ -317,25 +314,19 @@ class InteractiveCLI:
                     layout["details"].update(self.show_task_status(next_task))
                 layout["tasks"].update(self.show_task_table())
                 successful = sum(
-                    (
-                        1
-                        for task in self.workflow.tasks.values()
-                        if task.status == TaskStatus.SUCCESS
-                    )
+                    1
+                    for task in self.workflow.tasks.values()
+                    if task.status == TaskStatus.SUCCESS
                 )
                 failed = sum(
-                    (
-                        1
-                        for task in self.workflow.tasks.values()
-                        if task.status == TaskStatus.FAILED
-                    )
+                    1
+                    for task in self.workflow.tasks.values()
+                    if task.status == TaskStatus.FAILED
                 )
                 skipped = sum(
-                    (
-                        1
-                        for task in self.workflow.tasks.values()
-                        if task.status == TaskStatus.SKIPPED
-                    )
+                    1
+                    for task in self.workflow.tasks.values()
+                    if task.status == TaskStatus.SKIPPED
                 )
                 summary = Panel(
                     f"Workflow completed!\n\n[green]✅ Successful tasks: {successful}[/green]\n[red]❌ Failed tasks: {failed}[/red]\n[blue]⏩ Skipped tasks: {skipped}[/blue]",

crackerjack/py313.py

@@ -168,7 +168,7 @@ def clean_python_code(code: str) -> str:
                 continue
             case s if "#" in s and (
                 not any(
-                    (skip in s for skip in ("# noqa", "# type:", "# pragma", "# skip"))
+                    skip in s for skip in ("# noqa", "# type:", "# pragma", "# skip")
                 )
             ):
                 code_part = line.split("#", 1)[0].rstrip()

crackerjack/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "pdm-backend" ]
 
 [project]
 name = "crackerjack"
-version = "0.20.12"
+version = "0.20.14"
 description = "Crackerjack: code quality toolkit"
 readme = "README.md"
 keywords = [
@@ -54,6 +54,7 @@ dependencies = [
     "pytest-mock>=3.14.1",
     "pytest-timeout>=2.4",
     "pytest-xdist>=3.7",
+    "pyyaml>=6.0.2",
     "rich>=14",
     "tomli-w>=1.2",
     "typer>=0.16",

{crackerjack-0.20.13.dist-info → crackerjack-0.20.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.20.13
+Version: 0.20.15
 Summary: Crackerjack: code quality toolkit
 Keywords: bandit,black,creosote,mypy,pyright,pytest,refurb,ruff
 Author-Email: lesleslie <les@wedgwoodwebworks.com>
@@ -35,6 +35,7 @@ Requires-Dist: pytest-cov>=6.1.1
 Requires-Dist: pytest-mock>=3.14.1
 Requires-Dist: pytest-timeout>=2.4
 Requires-Dist: pytest-xdist>=3.7
+Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=14
 Requires-Dist: tomli-w>=1.2
 Requires-Dist: typer>=0.16

{crackerjack-0.20.13.dist-info → crackerjack-0.20.15.dist-info}/RECORD

@@ -1,7 +1,7 @@
-crackerjack-0.20.13.dist-info/METADATA,sha256=3KcyynnFmWmncj4aGPVu5kFy5wnnPMYVf7aCyTrsOoc,26384
-crackerjack-0.20.13.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-crackerjack-0.20.13.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crackerjack-0.20.13.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.20.15.dist-info/METADATA,sha256=4D46kwc6c2hBR-8JdW9pxD03lCbbH1chHMYJa3STNOI,26413
+crackerjack-0.20.15.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+crackerjack-0.20.15.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crackerjack-0.20.15.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
 crackerjack/.gitignore,sha256=4DYG7ZoVEHR5Tv1gQliRWmsNku5Fw2_k756cG_t12Cg,185
 crackerjack/.libcst.codemod.yaml,sha256=a8DlErRAIPV1nE6QlyXPAzTOgkB24_spl2E9hphuf5s,772
 crackerjack/.pdm.toml,sha256=dZe44HRcuxxCFESGG8SZIjmc-cGzSoyK3Hs6t4NYA8w,23
@@ -23,7 +23,7 @@ crackerjack/.ruff_cache/0.11.12/16869036553936192448,sha256=pYYUCDrYh7fPq8xkFLxv
 crackerjack/.ruff_cache/0.11.12/1867267426380906393,sha256=2w4M0Lrjd9flwuq6uJxehTbm7FVUcK5sL2sz1gS2Yvo,256
 crackerjack/.ruff_cache/0.11.12/4240757255861806333,sha256=uph5uIRG-XnF7ywAEcCxqqgIkWALPCvJFcwCgnNfTI4,77
 crackerjack/.ruff_cache/0.11.12/4441409093023629623,sha256=eHrESew3XCFJ2WqmKvtGLO1r4mY5Q_mv7yGlDmM1sSc,153
-crackerjack/.ruff_cache/0.11.13/1867267426380906393,sha256=KmwKiZGTVUDcLqqzw2kSoqlT6ABtaGbSBFLbNLO_MHw,256
+crackerjack/.ruff_cache/0.11.13/1867267426380906393,sha256=3VLkfclRTHCDt_uDlX4Dw0IGRPdVZkfTml68T3BrjEI,256
 crackerjack/.ruff_cache/0.11.13/4240757255861806333,sha256=l35TwAYyTusgJgyePvfP4_CCllPs1sWapEiLFZw8chQ,83
 crackerjack/.ruff_cache/0.11.2/4070660268492669020,sha256=FTRTUmvj6nZw_QQBp_WHI-h3_iqRejzL39api-9wTvs,224
 crackerjack/.ruff_cache/0.11.3/9818742842212983150,sha256=U-4mT__a-OljovvAJvv5M6X7TCMa3dReLXx3kTNGgwU,224
@@ -59,11 +59,11 @@ crackerjack/.ruff_cache/0.9.3/13948373885254993391,sha256=kGhtIkzPUtKAgvlKs3D8j4
 crackerjack/.ruff_cache/0.9.9/12813592349865671909,sha256=tmr8_vhRD2OxsVuMfbJPdT9fDFX-d5tfC5U9jgziyho,224
 crackerjack/.ruff_cache/0.9.9/8843823720003377982,sha256=e4ymkXfQsUg5e_mtO34xTsaTvs1uA3_fI216Qq9qCAM,136
 crackerjack/.ruff_cache/CACHEDIR.TAG,sha256=WVMVbX4MVkpCclExbq8m-IcOZIOuIZf5FrYw5Pk-Ma4,43
-crackerjack/__init__.py,sha256=LyIPEfjBcqWp7UVuJ-b7cc8oiFxrQqyL8RJ7g6c17Qs,838
-crackerjack/__main__.py,sha256=g-vag4kDCPjbY_ik6l6Qqc5ZRVuKGN4ofVA5x3syfFI,6733
-crackerjack/crackerjack.py,sha256=nwsAFZwTfc4zmdMUeuhFzF7QXY0U2pC60XC5LaimiXY,25869
-crackerjack/errors.py,sha256=xvXO3bk0VrxQz0lysIuVOju6SxxDgf04Wne1BedLFB8,4061
-crackerjack/interactive.py,sha256=hNYhsLkdy956AUQ10_21pE_ZBqfV81iKK9i2EKVSY9Q,15332
-crackerjack/py313.py,sha256=o6ywqlRANq4I_IESPMuaOU_IEQDOBiHkApFu1klvbZ4,5892
-crackerjack/pyproject.toml,sha256=szylSeogkB0mlSeToFr84pk-hY_XdtgOoizGhW672V4,4880
-crackerjack-0.20.13.dist-info/RECORD,,
+crackerjack/__init__.py,sha256=8tBSPAru_YDuPpjz05cL7pNbZjYFoRT_agGd_FWa3gY,839
+crackerjack/__main__.py,sha256=A_qOog8kowRG3Z65pG11MK25t3n7eGdEldQNELurwJk,6734
+crackerjack/crackerjack.py,sha256=OOw3wWeLPJ8MuSvcEjFIQNCe3dNQG2EaJInfZpGUr0I,26842
+crackerjack/errors.py,sha256=QEPtVuMtKtQHuawgr1ToMaN1KbUg5h9-4mS33YB5Znk,4062
+crackerjack/interactive.py,sha256=gP2Mb7jjBfR6RIlCUXh77_M-an5OXfTVXfUmnN-9ggA,15076
+crackerjack/py313.py,sha256=buYE7LO11Q64ffowEhTZRFQoAGj_8sg3DTlZuv8M9eo,5890
+crackerjack/pyproject.toml,sha256=7EQyIpWXpXhShafixce7WtKWOk75GdMsTBZwX9vh92Q,4901
+crackerjack-0.20.15.dist-info/RECORD,,