crackerjack 0.21.6__py3-none-any.whl → 0.21.7__py3-none-any.whl

crackerjack/__init__.py

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

crackerjack/__main__.py

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

crackerjack/crackerjack.py

@@ -6,7 +6,6 @@ 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
@@ -86,55 +85,93 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
         except Exception as e:
             print(f"Error cleaning {file_path}: {e}")
 
-    def remove_docstrings(self, code: str) -> str:
-        lines = code.split("\n")
-        cleaned_lines = []
-        docstring_state = {
+    def _initialize_docstring_state(self) -> dict[str, t.Any]:
+        return {
             "in_docstring": False,
             "delimiter": None,
             "waiting": False,
             "function_indent": 0,
             "removed_docstring": False,
+            "in_multiline_def": False,
         }
-        for i, line in enumerate(lines):
-            stripped = line.strip()
-            if self._is_function_or_class_definition(stripped):
-                docstring_state["waiting"] = True
-                docstring_state["function_indent"] = len(line) - len(line.lstrip())
-                docstring_state["removed_docstring"] = False
-                cleaned_lines.append(line)
-                continue
-            if docstring_state["waiting"] and stripped:
-                if self._handle_docstring_start(stripped, docstring_state):
-                    if not docstring_state["in_docstring"]:
-                        if self._needs_pass_statement(
-                            lines, i + 1, docstring_state["function_indent"]
-                        ):
-                            pass_line = (
-                                " " * (docstring_state["function_indent"] + 4) + "pass"
-                            )
-                            cleaned_lines.append(pass_line)
-                    docstring_state["removed_docstring"] = True
-                    continue
-                else:
-                    docstring_state["waiting"] = False
-            if docstring_state["in_docstring"]:
-                if self._handle_docstring_end(stripped, docstring_state):
-                    if self._needs_pass_statement(
-                        lines, i + 1, docstring_state["function_indent"]
-                    ):
-                        pass_line = (
-                            " " * (docstring_state["function_indent"] + 4) + "pass"
-                        )
-                        cleaned_lines.append(pass_line)
-                    docstring_state["removed_docstring"] = False
-                    continue
-                else:
-                    continue
-            if docstring_state["removed_docstring"] and stripped:
-                docstring_state["removed_docstring"] = False
-            cleaned_lines.append(line)
 
+    def _handle_function_definition(
+        self, line: str, stripped: str, state: dict[str, t.Any]
+    ) -> bool:
+        if self._is_function_or_class_definition(stripped):
+            state["waiting"] = True
+            state["function_indent"] = len(line) - len(line.lstrip())
+            state["removed_docstring"] = False
+            state["in_multiline_def"] = not stripped.endswith(":")
+            return True
+        return False
+
+    def _handle_multiline_definition(
+        self, line: str, stripped: str, state: dict[str, t.Any]
+    ) -> bool:
+        if state["in_multiline_def"]:
+            if stripped.endswith(":"):
+                state["in_multiline_def"] = False
+            return True
+        return False
+
+    def _handle_waiting_docstring(
+        self, lines: list[str], i: int, stripped: str, state: dict[str, t.Any]
+    ) -> tuple[bool, str | None]:
+        if state["waiting"] and stripped:
+            if self._handle_docstring_start(stripped, state):
+                pass_line = None
+                if not state["in_docstring"]:
+                    function_indent: int = state["function_indent"]
+                    if self._needs_pass_statement(lines, i + 1, function_indent):
+                        pass_line = " " * (function_indent + 4) + "pass"
+                state["removed_docstring"] = True
+                return True, pass_line
+            else:
+                state["waiting"] = False
+        return False, None
+
+    def _handle_docstring_content(
+        self, lines: list[str], i: int, stripped: str, state: dict[str, t.Any]
+    ) -> tuple[bool, str | None]:
+        if state["in_docstring"]:
+            if self._handle_docstring_end(stripped, state):
+                pass_line = None
+                function_indent: int = state["function_indent"]
+                if self._needs_pass_statement(lines, i + 1, function_indent):
+                    pass_line = " " * (function_indent + 4) + "pass"
+                state["removed_docstring"] = False
+                return True, pass_line
+            else:
+                return True, None
+        return False, None
+
+    def _process_line(
+        self, lines: list[str], i: int, line: str, state: dict[str, t.Any]
+    ) -> tuple[bool, str | None]:
+        stripped = line.strip()
+        if self._handle_function_definition(line, stripped, state):
+            return True, line
+        if self._handle_multiline_definition(line, stripped, state):
+            return True, line
+        handled, pass_line = self._handle_waiting_docstring(lines, i, stripped, state)
+        if handled:
+            return True, pass_line
+        handled, pass_line = self._handle_docstring_content(lines, i, stripped, state)
+        if handled:
+            return True, pass_line
+        if state["removed_docstring"] and stripped:
+            state["removed_docstring"] = False
+        return False, line
+
+    def remove_docstrings(self, code: str) -> str:
+        lines = code.split("\n")
+        cleaned_lines = []
+        docstring_state = self._initialize_docstring_state()
+        for i, line in enumerate(lines):
+            _, result_line = self._process_line(lines, i, line, docstring_state)
+            if result_line:
+                cleaned_lines.append(result_line)
         return "\n".join(cleaned_lines)
 
     def _is_function_or_class_definition(self, stripped_line: str) -> bool:
@@ -177,9 +214,8 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
             line_indent = len(line) - len(line.lstrip())
             if line_indent <= function_indent:
                 return True
-            if line_indent == function_indent + 4:
+            if line_indent > function_indent:
                 return False
-
         return True
 
     def remove_line_comments(self, code: str) -> str:
@@ -192,7 +228,6 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
             cleaned_line = self._process_line_for_comments(line)
             if cleaned_line or not line.strip():
                 cleaned_lines.append(cleaned_line or line)
-
         return "\n".join(cleaned_lines)
 
     def _process_line_for_comments(self, line: str) -> str:
@@ -205,7 +240,6 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
                 break
             else:
                 result.append(char)
-
         return "".join(result).rstrip()
 
     def _handle_string_character(
@@ -216,18 +250,14 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
         string_state: dict[str, t.Any],
         result: list[str],
     ) -> bool:
-        """Handle string quote characters. Returns True if character was handled."""
         if char not in ("'", '"'):
             return False
-
         if index > 0 and line[index - 1] == "\\":
             return False
-
         if string_state["in_string"] is None:
             string_state["in_string"] = char
         elif string_state["in_string"] == char:
             string_state["in_string"] = None
-
         result.append(char)
         return True
 
@@ -239,14 +269,11 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
         string_state: dict[str, t.Any],
         result: list[str],
     ) -> bool:
-        """Handle comment character. Returns True if comment was found."""
         if char != "#" or string_state["in_string"] is not None:
             return False
-
         comment = line[index:].strip()
         if self._is_special_comment_line(comment):
             result.append(line[index:])
-
         return True
 
     def _is_special_comment_line(self, comment: str) -> bool:
@@ -270,13 +297,11 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
                 ):
                     continue
             cleaned_lines.append(line)
-
         return "\n".join(self._remove_trailing_empty_lines(cleaned_lines))
 
     def _update_function_state(
         self, line: str, stripped_line: str, function_tracker: dict[str, t.Any]
     ) -> None:
-        """Update function tracking state based on current line."""
         if stripped_line.startswith(("def ", "async def ")):
             function_tracker["in_function"] = True
             function_tracker["function_indent"] = len(line) - len(stripped_line)
@@ -287,7 +312,6 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
     def _is_function_end(
         self, line: str, stripped_line: str, function_tracker: dict[str, t.Any]
     ) -> bool:
-        """Check if current line marks the end of a function."""
         return (
             function_tracker["in_function"]
             and bool(line)
@@ -302,13 +326,10 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
         cleaned_lines: list[str],
         function_tracker: dict[str, t.Any],
     ) -> bool:
-        """Determine if an empty line should be skipped."""
         if line_idx > 0 and cleaned_lines and (not cleaned_lines[-1]):
             return True
-
         if function_tracker["in_function"]:
             return self._should_skip_function_empty_line(line_idx, lines)
-
         return False
 
     def _should_skip_function_empty_line(self, line_idx: int, lines: list[str]) -> bool:
@@ -323,7 +344,6 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
             return True
         if next_line in ("pass", "break", "continue", "raise"):
             return True
-
         return self._is_special_comment(next_line)
 
     def _is_special_comment(self, line: str) -> bool:
@@ -463,15 +483,12 @@ class ConfigManager(BaseModel, arbitrary_types_allowed=True):
         for tool, settings in our_toml_config.get("tool", {}).items():
             if tool not in pkg_toml_config["tool"]:
                 pkg_toml_config["tool"][tool] = {}
-
             pkg_tool_config = pkg_toml_config["tool"][tool]
-
             self._merge_tool_config(settings, pkg_tool_config, tool)
 
     def _merge_tool_config(
         self, our_config: dict[str, t.Any], pkg_config: dict[str, t.Any], tool: str
     ) -> None:
-        """Recursively merge tool configuration, preserving existing project settings."""
         for setting, value in our_config.items():
             if isinstance(value, dict):
                 self._merge_nested_config(setting, value, pkg_config)
@@ -481,21 +498,17 @@ class ConfigManager(BaseModel, arbitrary_types_allowed=True):
     def _merge_nested_config(
         self, setting: str, value: dict[str, t.Any], pkg_config: dict[str, t.Any]
     ) -> None:
-        """Handle nested configuration merging."""
         if setting not in pkg_config:
             pkg_config[setting] = {}
         elif not isinstance(pkg_config[setting], dict):
             pkg_config[setting] = {}
-
         self._merge_tool_config(value, pkg_config[setting], "")
-
         for k, v in value.items():
             self._merge_nested_value(k, v, pkg_config[setting])
 
     def _merge_nested_value(
         self, key: str, value: t.Any, nested_config: dict[str, t.Any]
     ) -> None:
-        """Merge individual nested values."""
         if isinstance(value, str | list) and "crackerjack" in str(value):
             nested_config[key] = self.swap_package_name(value)
         elif self._is_mergeable_list(key, value):
@@ -510,7 +523,6 @@ class ConfigManager(BaseModel, arbitrary_types_allowed=True):
     def _merge_direct_config(
         self, setting: str, value: t.Any, pkg_config: dict[str, t.Any]
     ) -> None:
-        """Handle direct configuration merging."""
         if isinstance(value, str | list) and "crackerjack" in str(value):
             pkg_config[setting] = self.swap_package_name(value)
         elif self._is_mergeable_list(setting, value):
@@ -773,7 +785,6 @@ class Crackerjack(BaseModel, arbitrary_types_allowed=True):
             self._add_benchmark_flags(test, options)
         else:
             self._add_worker_flags(test, options, project_size)
-
         return test
 
     def _detect_project_size(self) -> str:

crackerjack/errors.py

@@ -2,7 +2,6 @@ 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,7 +2,6 @@ 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
@@ -19,7 +18,6 @@ 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
 
 
@@ -289,7 +287,6 @@ class InteractiveCLI:
         )
         total_tasks = len(self.workflow.tasks)
         progress_task = progress.add_task("Running workflow", total=total_tasks)
-
         return {
             "progress": progress,
             "progress_task": progress_task,
@@ -299,14 +296,11 @@ class InteractiveCLI:
     def _execute_workflow_loop(
         self, layout: Layout, progress_tracker: dict[str, t.Any], live: Live
     ) -> None:
-        """Execute the main workflow loop."""
         while not self.workflow.all_tasks_completed():
             layout["tasks"].update(self.show_task_table())
             next_task = self.workflow.get_next_task()
-
             if not next_task:
                 break
-
             if self._should_execute_task(layout, next_task, live):
                 self._execute_task(layout, next_task, progress_tracker)
             else:
@@ -322,20 +316,16 @@ class InteractiveCLI:
     def _execute_task(
         self, layout: Layout, task: Task, progress_tracker: dict[str, t.Any]
     ) -> None:
-        """Execute a single task and update progress."""
         task.start()
         layout["details"].update(self.show_task_status(task))
         time.sleep(1)
-
         success = self._simulate_task_execution()
-
         if success:
             task.complete()
             progress_tracker["completed_tasks"] += 1
         else:
             error = self._create_task_error(task.name)
             task.fail(error)
-
         progress_tracker["progress"].update(
             progress_tracker["progress_task"],
             completed=progress_tracker["completed_tasks"],

crackerjack/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "pdm-backend" ]
 
 [project]
 name = "crackerjack"
-version = "0.21.5"
+version = "0.21.6"
 description = "Crackerjack: code quality toolkit"
 readme = "README.md"
 keywords = [

{crackerjack-0.21.6.dist-info → crackerjack-0.21.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.21.6
+Version: 0.21.7
 Summary: Crackerjack: code quality toolkit
 Keywords: bandit,black,creosote,mypy,pyright,pytest,refurb,ruff
 Author-Email: lesleslie <les@wedgwoodwebworks.com>
@@ -102,7 +102,7 @@ If you're new to Crackerjack, follow these steps:
 
     Or use the interactive Rich UI:
     ```
-    python -m crackerjack --rich-ui
+    python -m crackerjack --interactive
     ```
 
 ---
@@ -269,7 +269,7 @@ python -m crackerjack -t --benchmark-regression --benchmark-regression-threshold
 
     Or with the interactive Rich UI:
     ```
-    python -m crackerjack --rich-ui
+    python -m crackerjack --interactive
     ```
 
 ## Usage
@@ -361,7 +361,7 @@ runner.process(MyOptions())
 -   `--benchmark-regression`: Fail tests if benchmarks regress beyond threshold.
 -   `--benchmark-regression-threshold`: Set threshold percentage for benchmark regression (default 5.0%).
 -   `-a`, `--all`: Run with `-x -t -p <micro|minor|major> -c` development options.
--   `--rich-ui`: Enable the interactive Rich UI for a more user-friendly experience with visual progress tracking and interactive prompts.
+-   `--interactive`: Enable the interactive Rich UI for a more user-friendly experience with visual progress tracking and interactive prompts.
 -   `--ai-agent`: Enable AI agent mode with structured output (see [AI Agent Integration](#ai-agent-integration)).
 -   `--help`: Display help.
 
@@ -461,7 +461,7 @@ runner.process(MyOptions())
 
 - **Rich Interactive Mode** - Run with the interactive Rich UI:
   ```bash
-  python -m crackerjack --rich-ui
+  python -m crackerjack --interactive
   ```
 
 - **AI Integration** - Run with structured output for AI tools:
@@ -500,10 +500,10 @@ Crackerjack now offers an enhanced interactive experience through its Rich UI:
 - **Error Visualization:** Errors are presented in a structured, easy-to-understand format with recovery suggestions
 - **File Selection:** Interactive file browser for operations that require selecting files
 
-To use the Rich UI, run Crackerjack with the `--rich-ui` flag:
+To use the Rich UI, run Crackerjack with the `--interactive` flag:
 
 ```bash
-python -m crackerjack --rich-ui
+python -m crackerjack --interactive
 ```
 
 This launches an interactive terminal interface where you can:
@@ -542,7 +542,7 @@ python -m crackerjack -v
 For the most comprehensive error details with visual formatting, combine verbose mode with the Rich UI:
 
 ```bash
-python -m crackerjack --rich-ui -v
+python -m crackerjack --interactive -v
 ```
 
 ## Python 3.13+ Features

{crackerjack-0.21.6.dist-info → crackerjack-0.21.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
-crackerjack-0.21.6.dist-info/METADATA,sha256=YcmoMu7VODbnvoQf63uApMapVEOpKbHjdeFs0Qutza4,26414
-crackerjack-0.21.6.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-crackerjack-0.21.6.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crackerjack-0.21.6.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.21.7.dist-info/METADATA,sha256=suf-qK6MQQTYL6v8ZXcTUT70x6ADX6u1Dd8YvhQSV60,26442
+crackerjack-0.21.7.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+crackerjack-0.21.7.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crackerjack-0.21.7.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
 crackerjack/.gitignore,sha256=n8cD6U16L3XZn__PvhYm_F7-YeFHFucHCyxWj2NZCGs,259
 crackerjack/.libcst.codemod.yaml,sha256=a8DlErRAIPV1nE6QlyXPAzTOgkB24_spl2E9hphuf5s,772
 crackerjack/.pdm.toml,sha256=dZe44HRcuxxCFESGG8SZIjmc-cGzSoyK3Hs6t4NYA8w,23
@@ -34,7 +34,7 @@ crackerjack/.ruff_cache/0.11.7/10386934055395314831,sha256=lBNwN5zAgM4OzbkXIOzCc
 crackerjack/.ruff_cache/0.11.7/3557596832929915217,sha256=fKlwUbsvT3YIKV6UR-aA_i64lLignWeVfVu-MMmVbU0,207
 crackerjack/.ruff_cache/0.11.8/530407680854991027,sha256=xAMAL3Vu_HR6M-h5ojCTaak0By5ii8u-14pXULLgLqw,224
 crackerjack/.ruff_cache/0.12.0/5056746222905752453,sha256=MqrIT5qymJcgAOBZyn-TvYoGCFfDFCgN9IwSULq8n14,256
-crackerjack/.ruff_cache/0.12.1/5056746222905752453,sha256=ksDcvUi9t_w2SUbEhH8Yk-ArZbLaWKIkwnKqJ0Q9ceA,256
+crackerjack/.ruff_cache/0.12.1/5056746222905752453,sha256=CHy2IV23GK0EauutmCmddO7Ck-fHMzbvpvZ1ZO9Cp8Y,256
 crackerjack/.ruff_cache/0.2.0/10047773857155985907,sha256=j9LNa_RQ4Plor7go1uTYgz17cEENKvZQ-dP6b9MX0ik,248
 crackerjack/.ruff_cache/0.2.1/8522267973936635051,sha256=u_aPBMibtAp_iYvLwR88GMAECMcIgHezxMyuapmU2P4,248
 crackerjack/.ruff_cache/0.2.2/18053836298936336950,sha256=Xb_ebP0pVuUfSqPEZKlhQ70so_vqkEfMYpuHQ06iR5U,248
@@ -62,11 +62,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=8tBSPAru_YDuPpjz05cL7pNbZjYFoRT_agGd_FWa3gY,839
-crackerjack/__main__.py,sha256=AknITUlFjq3YUK9s2xeL62dM0GN82JBQyDkPzQ_hCUg,6561
-crackerjack/crackerjack.py,sha256=p5079e4I_pMHKiTFm0ckiuKJ1jvYCq8Na_0Vk-R12xA,35155
-crackerjack/errors.py,sha256=QEPtVuMtKtQHuawgr1ToMaN1KbUg5h9-4mS33YB5Znk,4062
-crackerjack/interactive.py,sha256=5KXKSvWKttLvHcI1L4VEDc3Rb-ZpHBOl_Qr7lhD-O4Q,16262
+crackerjack/__init__.py,sha256=LyIPEfjBcqWp7UVuJ-b7cc8oiFxrQqyL8RJ7g6c17Qs,838
+crackerjack/__main__.py,sha256=GP5GBbWK5lDTQanCHKVEyS3hDWvshwlrhWagzQlRuD4,6560
+crackerjack/crackerjack.py,sha256=jlepiHgMkvTyl83O8HUqC4mCsQbZIejerOHNQD15JcU,35854
+crackerjack/errors.py,sha256=xvXO3bk0VrxQz0lysIuVOju6SxxDgf04Wne1BedLFB8,4061
+crackerjack/interactive.py,sha256=ierA2jeUsigTJhKOcJJsjhBZm2WwsQpvow3Y5ppF7IE,16151
 crackerjack/py313.py,sha256=buYE7LO11Q64ffowEhTZRFQoAGj_8sg3DTlZuv8M9eo,5890
-crackerjack/pyproject.toml,sha256=w4ssNTiRx9zQqQuywBGMIISalKLwg59DPSza9eGXuGk,4988
-crackerjack-0.21.6.dist-info/RECORD,,
+crackerjack/pyproject.toml,sha256=OIoNmIktC1abFPgePb95Zg9BDTGfRxXftK-KccWgalc,4988
+crackerjack-0.21.7.dist-info/RECORD,,