crackerjack 0.20.0__py3-none-any.whl → 0.20.2__py3-none-any.whl

crackerjack/.pre-commit-config.yaml

@@ -34,7 +34,7 @@ repos:
           - keyring
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.7.10
+    rev: 0.7.12
     hooks:
       - id: uv-lock
         files: ^pyproject\.toml$
@@ -55,7 +55,7 @@ repos:
           - tomli
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.12
+    rev: v0.11.13
     hooks:
       - id: ruff-check
       - id: ruff-format

crackerjack/__main__.py

@@ -34,6 +34,8 @@ class Options(BaseModel):
     benchmark: bool = False
     benchmark_regression: bool = False
     benchmark_regression_threshold: float = 5.0
+    test_workers: int = 0
+    test_timeout: int = 0
     all: BumpOption | None = None
     ai_agent: bool = False
     create_pr: bool = False
@@ -103,6 +105,16 @@ cli_options = {
         "--benchmark-regression-threshold",
         help="Maximum allowed performance regression percentage (default: 5.0%).",
     ),
+    "test_workers": typer.Option(
+        0,
+        "--test-workers",
+        help="Number of parallel workers for running tests (0 = auto-detect, 1 = disable parallelization).",
+    ),
+    "test_timeout": typer.Option(
+        0,
+        "--test-timeout",
+        help="Timeout in seconds for individual tests (0 = use default based on project size).",
+    ),
     "skip_hooks": typer.Option(
         False,
         "-s",
@@ -154,6 +166,8 @@ def main(
     benchmark_regression_threshold: float = cli_options[
         "benchmark_regression_threshold"
     ],
+    test_workers: int = cli_options["test_workers"],
+    test_timeout: int = cli_options["test_timeout"],
     skip_hooks: bool = cli_options["skip_hooks"],
     create_pr: bool = cli_options["create_pr"],
     rich_ui: bool = cli_options["rich_ui"],
@@ -173,6 +187,8 @@ def main(
         benchmark=benchmark,
         benchmark_regression=benchmark_regression,
         benchmark_regression_threshold=benchmark_regression_threshold,
+        test_workers=test_workers,
+        test_timeout=test_timeout,
         skip_hooks=skip_hooks,
         all=all,
         ai_agent=ai_agent,

crackerjack/crackerjack.py

@@ -1,8 +1,10 @@
 import io
 import os
 import platform
+import queue
 import re
 import subprocess
+import threading
 import time
 import tokenize
 import typing as t
@@ -42,6 +44,8 @@ class OptionsProtocol(t.Protocol):
     benchmark: bool
     benchmark_regression: bool
     benchmark_regression_threshold: float
+    test_workers: int = 0
+    test_timeout: int = 0
     publish: t.Any | None
     bump: t.Any | None
     all: t.Any | None
@@ -683,6 +687,22 @@ class Crackerjack:
         if options.verbose:
             test.append("-v")
 
+        # Detect project size to adjust timeouts and parallelization
+        project_size = self._detect_project_size()
+
+        # User can override the timeout, otherwise use project size to determine
+        if options.test_timeout > 0:
+            test_timeout = options.test_timeout
+        else:
+            # Use a longer timeout for larger projects
+            test_timeout = (
+                300
+                if project_size == "large"
+                else 120
+                if project_size == "medium"
+                else 60
+            )
+
         test.extend(
             [
                 "--capture=fd",  # Capture stdout/stderr at file descriptor level
@@ -690,7 +710,7 @@ class Crackerjack:
                 "--no-header",  # Reduce output noise
                 "--disable-warnings",  # Disable warning capture
                 "--durations=0",  # Show slowest tests to identify potential hanging tests
-                "--timeout=60",  # 1-minute timeout for tests
+                f"--timeout={test_timeout}",  # Dynamic timeout based on project size or user override
             ]
         )
 
@@ -711,11 +731,60 @@ class Crackerjack:
                     ]
                 )
         else:
-            # No benchmarks - use parallel execution for speed
-            test.append("-xvs")
+            # Use user-specified number of workers if provided
+            if options.test_workers > 0:
+                # User explicitly set number of workers
+                if options.test_workers == 1:
+                    # Single worker means no parallelism, just use normal pytest mode
+                    test.append("-vs")
+                else:
+                    # Use specified number of workers
+                    test.extend(["-xvs", "-n", str(options.test_workers)])
+            else:
+                # Auto-detect based on project size
+                if project_size == "large":
+                    # For large projects, use a fixed number of workers to avoid overwhelming the system
+                    test.extend(
+                        ["-xvs", "-n", "2"]
+                    )  # Only 2 parallel processes for large projects
+                elif project_size == "medium":
+                    test.extend(
+                        ["-xvs", "-n", "auto"]
+                    )  # Auto-detect number of processes but limit it
+                else:
+                    test.append("-xvs")  # Default behavior for small projects
 
         return test
 
+    def _detect_project_size(self) -> str:
+        """Detect the approximate size of the project to adjust test parameters.
+
+        Returns:
+            "small", "medium", or "large" based on codebase size
+        """
+        # Check for known large projects by name
+        if self.pkg_name in ("acb", "fastblocks"):
+            return "large"
+
+        # Count Python files to estimate project size
+        try:
+            py_files = list(self.pkg_path.rglob("*.py"))
+            test_files = list(self.pkg_path.rglob("test_*.py"))
+
+            total_files = len(py_files)
+            num_test_files = len(test_files)
+
+            # Rough heuristics for project size
+            if total_files > 100 or num_test_files > 50:
+                return "large"
+            elif total_files > 50 or num_test_files > 20:
+                return "medium"
+            else:
+                return "small"
+        except Exception:
+            # Default to medium in case of error
+            return "medium"
+
     def _setup_test_environment(self) -> None:
         os.environ["PYTHONASYNCIO_DEBUG"] = "0"  # Disable asyncio debug mode
         os.environ["RUNNING_UNDER_CRACKERJACK"] = "1"  # Signal to conftest.py
@@ -725,9 +794,29 @@ class Crackerjack:
     def _run_pytest_process(
         self, test_command: list[str]
     ) -> subprocess.CompletedProcess[str]:
+        import queue
+
         from .errors import ErrorCode, ExecutionError, handle_error
 
         try:
+            # Detect project size to determine appropriate timeout
+            project_size = self._detect_project_size()
+            # Longer timeouts for larger projects
+            global_timeout = (
+                1200
+                if project_size == "large"
+                else 600
+                if project_size == "medium"
+                else 300
+            )
+
+            # Show timeout information
+            self.console.print(f"[blue]Project size detected as: {project_size}[/blue]")
+            self.console.print(
+                f"[blue]Using global timeout of {global_timeout} seconds[/blue]"
+            )
+
+            # Use non-blocking IO to avoid deadlocks
             process = subprocess.Popen(
                 test_command,
                 stdout=subprocess.PIPE,
@@ -736,21 +825,62 @@ class Crackerjack:
                 bufsize=1,
                 universal_newlines=True,
             )
-            timeout = 300
-            start_time = time.time()
+
             stdout_data = []
             stderr_data = []
+
+            # Output collection queues
+            stdout_queue = queue.Queue()
+            stderr_queue = queue.Queue()
+
+            # Use separate threads to read from stdout and stderr to prevent deadlocks
+            def read_output(
+                pipe: t.TextIO,
+                output_queue: "queue.Queue[str]",
+                data_collector: list[str],
+            ) -> None:
+                try:
+                    for line in iter(pipe.readline, ""):
+                        output_queue.put(line)
+                        data_collector.append(line)
+                except (OSError, ValueError):
+                    # Pipe has been closed
+                    pass
+                finally:
+                    pipe.close()
+
+            # Start output reader threads
+            stdout_thread = threading.Thread(
+                target=read_output,
+                args=(process.stdout, stdout_queue, stdout_data),
+                daemon=True,
+            )
+            stderr_thread = threading.Thread(
+                target=read_output,
+                args=(process.stderr, stderr_queue, stderr_data),
+                daemon=True,
+            )
+
+            stdout_thread.start()
+            stderr_thread.start()
+
+            # Start time for timeout tracking
+            start_time = time.time()
+
+            # Process is running, monitor and display output until completion or timeout
             while process.poll() is None:
-                if time.time() - start_time > timeout:
+                # Check for timeout
+                elapsed = time.time() - start_time
+                if elapsed > global_timeout:
                     error = ExecutionError(
-                        message="Test execution timed out after 5 minutes.",
+                        message=f"Test execution timed out after {global_timeout // 60} minutes.",
                         error_code=ErrorCode.COMMAND_TIMEOUT,
-                        details=f"Command: {' '.join(test_command)}\nTimeout: {timeout} seconds",
+                        details=f"Command: {' '.join(test_command)}\nTimeout: {global_timeout} seconds",
                         recovery="Check for infinite loops or deadlocks in your tests. Consider increasing the timeout or optimizing your tests.",
                     )
 
                     self.console.print(
-                        "[red]Test execution timed out after 5 minutes. Terminating...[/red]"
+                        f"[red]Test execution timed out after {global_timeout // 60} minutes. Terminating...[/red]"
                     )
                     process.terminate()
                     try:
@@ -762,26 +892,27 @@ class Crackerjack:
                         )
                     break
 
-                if process.stdout:
-                    line = process.stdout.readline()
-                    if line:
-                        stdout_data.append(line)
-                        self.console.print(line, end="")
-                if process.stderr:
-                    line = process.stderr.readline()
-                    if line:
-                        stderr_data.append(line)
-                        self.console.print(f"[red]{line}[/red]", end="")
-                time.sleep(0.1)
-
-            if process.stdout:
-                for line in process.stdout:
-                    stdout_data.append(line)
-                    self.console.print(line, end="")
-            if process.stderr:
-                for line in process.stderr:
-                    stderr_data.append(line)
-                    self.console.print(f"[red]{line}[/red]", end="")
+                # Print any available output
+                self._process_output_queue(stdout_queue, stderr_queue)
+
+                # Small sleep to avoid CPU spinning but still be responsive
+                time.sleep(0.05)
+
+                # Periodically output a heartbeat for very long-running tests
+                if elapsed > 60 and elapsed % 60 < 0.1:  # Roughly every minute
+                    self.console.print(
+                        f"[blue]Tests still running, elapsed time: {int(elapsed)} seconds...[/blue]"
+                    )
+
+            # Process has exited, get remaining output
+            time.sleep(0.1)  # Allow threads to flush final output
+            self._process_output_queue(stdout_queue, stderr_queue)
+
+            # Ensure threads are done
+            if stdout_thread.is_alive():
+                stdout_thread.join(1.0)
+            if stderr_thread.is_alive():
+                stderr_thread.join(1.0)
 
             returncode = process.returncode or 0
             stdout = "".join(stdout_data)
@@ -807,6 +938,28 @@ class Crackerjack:
 
             return subprocess.CompletedProcess(test_command, 1, "", str(e))
 
+    def _process_output_queue(
+        self, stdout_queue: "queue.Queue[str]", stderr_queue: "queue.Queue[str]"
+    ) -> None:
+        """Process and display output from the queues without blocking."""
+        # Process stdout
+        while not stdout_queue.empty():
+            try:
+                line = stdout_queue.get_nowait()
+                if line:
+                    self.console.print(line, end="")
+            except queue.Empty:
+                break
+
+        # Process stderr
+        while not stderr_queue.empty():
+            try:
+                line = stderr_queue.get_nowait()
+                if line:
+                    self.console.print(f"[red]{line}[/red]", end="")
+            except queue.Empty:
+                break
+
     def _report_test_results(
         self, result: subprocess.CompletedProcess[str], ai_agent: str
     ) -> None:

crackerjack/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "pdm-backend" ]
 
 [project]
 name = "crackerjack"
-version = "0.19.8"
+version = "0.20.1"
 description = "Crackerjack: code quality toolkit"
 readme = "README.md"
 keywords = [
@@ -56,7 +56,7 @@ dependencies = [
     "rich>=14",
     "tomli-w>=1.2",
     "typer>=0.16",
-    "uv>=0.7.10",
+    "uv>=0.7.12",
 ]
 urls.documentation = "https://github.com/lesleslie/crackerjack"
 urls.homepage = "https://github.com/lesleslie/crackerjack"

{crackerjack-0.20.0.dist-info → crackerjack-0.20.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.20.0
+Version: 0.20.2
 Summary: Crackerjack: code quality toolkit
 Keywords: bandit,black,creosote,mypy,pyright,pytest,refurb,ruff
 Author-Email: lesleslie <les@wedgwoodwebworks.com>
@@ -37,7 +37,7 @@ Requires-Dist: pytest-xdist>=3.7
 Requires-Dist: rich>=14
 Requires-Dist: tomli-w>=1.2
 Requires-Dist: typer>=0.16
-Requires-Dist: uv>=0.7.10
+Requires-Dist: uv>=0.7.12
 Description-Content-Type: text/markdown
 
 # Crackerjack: Elevate Your Python Development
@@ -192,9 +192,35 @@ Crackerjack provides advanced testing capabilities powered by pytest:
 ### Standard Testing
 
 - **Parallel Test Execution:** Tests run in parallel by default using pytest-xdist for faster execution
-- **Timeout Protection:** All tests have a default 60-second timeout to prevent hanging tests
+- **Smart Parallelization:** Automatically adjusts the number of worker processes based on project size
+- **Timeout Protection:** Tests have dynamic timeouts based on project size to prevent hanging tests
 - **Coverage Reports:** Automatically generates test coverage reports with configurable thresholds
 
+### Advanced Test Configuration
+
+Crackerjack offers fine-grained control over test execution:
+
+- **Worker Control:** Set the number of parallel workers with `--test-workers` (0 = auto-detect, 1 = disable parallelization)
+- **Timeout Control:** Customize test timeouts with `--test-timeout` (in seconds)
+- **Project Size Detection:** Automatically detects project size and adjusts timeout and parallelization settings
+- **Deadlock Prevention:** Uses advanced threading techniques to prevent deadlocks in test output processing
+- **Progress Tracking:** Shows periodic heartbeat messages for long-running tests
+
+Example test execution options:
+```bash
+# Run tests with a single worker (no parallelization)
+python -m crackerjack -t --test-workers=1
+
+# Run tests with a specific number of workers (e.g., 4)
+python -m crackerjack -t --test-workers=4
+
+# Run tests with a custom timeout (5 minutes per test)
+python -m crackerjack -t --test-timeout=300
+
+# Combine options for maximum control
+python -m crackerjack -t --test-workers=2 --test-timeout=600
+```
+
 ### Benchmark Testing
 
 Crackerjack includes benchmark testing capabilities:
@@ -278,10 +304,16 @@ class MyOptions:
         # Process options
         self.clean = True            # Clean code (remove docstrings, comments, etc.)
         self.test = True             # Run tests using pytest
+        self.skip_hooks = False      # Skip running pre-commit hooks
+
+        # Test execution options
+        self.test_workers = 2        # Number of parallel workers (0 = auto-detect, 1 = disable parallelization)
+        self.test_timeout = 120      # Timeout in seconds for individual tests (0 = use default based on project size)
+
+        # Benchmark options
         self.benchmark = False       # Run tests in benchmark mode
         self.benchmark_regression = False  # Fail tests if benchmarks regress beyond threshold
         self.benchmark_regression_threshold = 5.0  # Threshold percentage for benchmark regression
-        self.skip_hooks = False      # Skip running pre-commit hooks
 
         # Version and publishing options
         self.publish = None          # Publish to PyPI (micro, minor, major)
@@ -321,6 +353,8 @@ runner.process(MyOptions())
 -   `-s`, `--skip-hooks`: Skip running pre-commit hooks (useful with `-t`).
 -   `-x`, `--clean`: Clean code by removing docstrings, line comments, and extra whitespace.
 -   `-t`, `--test`: Run tests using `pytest`.
+-   `--test-workers`: Set the number of parallel workers for testing (0 = auto-detect, 1 = disable parallelization).
+-   `--test-timeout`: Set the timeout in seconds for individual tests (0 = use default based on project size).
 -   `--benchmark`: Run tests in benchmark mode (disables parallel execution).
 -   `--benchmark-regression`: Fail tests if benchmarks regress beyond threshold.
 -   `--benchmark-regression-threshold`: Set threshold percentage for benchmark regression (default 5.0%).
@@ -356,6 +390,28 @@ runner.process(MyOptions())
   python -m crackerjack -t -s
   ```
 
+#### Test Execution Options
+
+- **Single-Process Testing** - Run tests sequentially (no parallelization):
+  ```bash
+  python -m crackerjack -t --test-workers=1
+  ```
+
+- **Customized Parallel Testing** - Run tests with a specific number of workers:
+  ```bash
+  python -m crackerjack -t --test-workers=4
+  ```
+
+- **Long-Running Tests** - Increase test timeout for complex tests:
+  ```bash
+  python -m crackerjack -t --test-timeout=600
+  ```
+
+- **Optimized for Large Projects** - Reduce workers and increase timeout for large codebases:
+  ```bash
+  python -m crackerjack -t --test-workers=2 --test-timeout=300
+  ```
+
 #### Version Management
 
 - **Bump and Publish** - Bump version and publish to PyPI:

{crackerjack-0.20.0.dist-info → crackerjack-0.20.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-crackerjack-0.20.0.dist-info/METADATA,sha256=t81zxXt6ujA39tWQNwQYgv2at3gFYDZ3iKudx6N23c8,24058
-crackerjack-0.20.0.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-crackerjack-0.20.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crackerjack-0.20.0.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.20.2.dist-info/METADATA,sha256=JxIeMJ6WVmtpOW1CYU2eP6mLxb36wqiZNOIHYWcVZ8I,26354
+crackerjack-0.20.2.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+crackerjack-0.20.2.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crackerjack-0.20.2.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
-crackerjack/.pre-commit-config.yaml,sha256=5xN133ZjeVpOlWRcoOOfu-tdzQvfWfRaZeVLM1B-XNk,2935
+crackerjack/.pre-commit-config.yaml,sha256=r7T5Valb9febof0yH4tBu2u8PhQRfQBmf1W-gJIkJSI,2935
 crackerjack/.pytest_cache/.gitignore,sha256=Ptcxtl0GFQwTji2tsL4Gl1UIiKa0frjEXsya26i46b0,37
 crackerjack/.pytest_cache/CACHEDIR.TAG,sha256=N9yI75oKvt2-gQU6bdj9-xOvthMEXqHrSlyBWnSjveQ,191
 crackerjack/.pytest_cache/README.md,sha256=c_1vzN2ALEGaay2YPWwxc7fal1WKxLWJ7ewt_kQ9ua0,302
@@ -23,6 +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=-JUoRdDv_1mo2i4m_u0dAa9ByNdbOSvEGWE_LiSl6tc,256
 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
 crackerjack/.ruff_cache/0.11.4/9818742842212983150,sha256=QF9j6-3MH_d0pDNotdbF2hlqCL66SxN8OLVKR3PZyZU,224
@@ -58,10 +59,10 @@ crackerjack/.ruff_cache/0.9.9/12813592349865671909,sha256=tmr8_vhRD2OxsVuMfbJPdT
 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=w5jukdION0D0fyeKYl-7hfCPzI0isXbEjzdjw8RecKA,840
-crackerjack/__main__.py,sha256=sNLM6iFkZlw3vpL1ziyc3NXjS7GEQNXguiF0hLOoe_M,6189
-crackerjack/crackerjack.py,sha256=mQtluOnLNbQe-bec3-WGpOGcgBQq1GG7L9m4r9y0cW0,46864
+crackerjack/__main__.py,sha256=jg-eO0Z1VZkx5F-97dsd1rxOQ0uwHWabuKma8thUJVw,6779
+crackerjack/crackerjack.py,sha256=OWw-EyQzDZsoxH-snikhxuQL8t0Es4MD9bsGfu6zwv4,52600
 crackerjack/errors.py,sha256=OtbmtA912kzDOWVo6JASuFbaMU-VhmQD_fUNsvnWCZc,4311
 crackerjack/interactive.py,sha256=Ay7_s3pc4ntc_3F_bRKBsWxmjor6nkN9v6tqqJe1iRw,15904
 crackerjack/py313.py,sha256=VgthlcpLL6nNDcg3evvEmGNYWCdMuojnMhow58ISEdY,6184
-crackerjack/pyproject.toml,sha256=6b9I1m0mEnaIswIs6dostny_TPEeAebvsVYvz7eCohs,4843
-crackerjack-0.20.0.dist-info/RECORD,,
+crackerjack/pyproject.toml,sha256=2SSoGzy_2YAUS7Tuf8nnShK3JTRCc0mBHEdm89QUQ4E,4843
+crackerjack-0.20.2.dist-info/RECORD,,