devklean 1.0.0__tar.gz → 1.0.2__tar.gz

{devklean-1.0.0 → devklean-1.0.2}/CHANGELOG.md

@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.2] - 2026-07-01
+
+### Changed
+
+- Replaced `print()` calls in the console layer with `click.echo()` for improved
+  Unicode and Windows terminal compatibility.
+- Fixed `src/devklean/__main__.py` to correctly import `main` from
+  `devklean.cli.main`.
+- Made package `__init__.py` imports lazy to avoid pulling in `send2trash`
+  during unrelated imports.
+- Added `click` as a runtime dependency.
+- Updated Windows guard test to work in subprocesses with `PYTHONPATH=src`.
+
+## [1.0.1] - 2026-06-30
+
+### Fixed
+
+- Pressing Ctrl+C (e.g. at a `clean` confirmation prompt) now exits cleanly with
+  a short `Aborted.` notice and exit code 130 (the Unix SIGINT convention)
+  instead of dumping a `KeyboardInterrupt` traceback.
+- `doctor` now flags records with an unrecognized `strategy` value as corrupt.
+  Stores containing legacy strategy values (e.g. `"recording"`, `"rec"`) were
+  previously reported as healthy; the only recognized strategy is `"trash"`.
+
 ## [1.0.0] - 2026-06-30
 
 First stable release. No breaking changes to the CLI since `0.1.0`; this
@@ -80,6 +104,8 @@ First public pre-release.
   per-target sizing.
 - **Packaging** — distributable via `pip`/`pipx`; MIT licensed.
 
-[Unreleased]: https://github.com/smurftyy/devklean/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/smurftyy/devklean/compare/v1.0.2...HEAD
+[1.0.2]: https://github.com/smurftyy/devklean/compare/v1.0.1...v1.0.2
+[1.0.1]: https://github.com/smurftyy/devklean/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/smurftyy/devklean/compare/v0.1.0...v1.0.0
 [0.1.0]: https://github.com/smurftyy/devklean/releases/tag/v0.1.0

{devklean-1.0.0 → devklean-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devklean
-Version: 1.0.0
+Version: 1.0.2
 Summary: Clean up common development artifacts (node_modules, .venv, caches) to reclaim disk space
 Project-URL: Homepage, https://github.com/smurftyy/devklean
 Project-URL: Repository, https://github.com/smurftyy/devklean
@@ -24,6 +24,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Filesystems
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
+Requires-Dist: click>=8.1.0
 Requires-Dist: send2trash>=1.8.2
 Requires-Dist: tomli>=2.0.0; python_version < '3.11'
 Provides-Extra: dev
@@ -43,6 +44,8 @@ Description-Content-Type: text/markdown
 
 **Reclaim disk space by safely cleaning up development artifacts** — `node_modules`, `.venv`, build caches, and other regenerable directories — with a trash-backed safety net so nothing is ever lost to a typo.
 
+![devklean in action](docs/assets/devklean.png)
+
 <!-- TODO: insert terminal recording GIF of `devklean clean` here -->
 
 ## Why

{devklean-1.0.0 → devklean-1.0.2}/README.md

@@ -7,6 +7,8 @@
 
 **Reclaim disk space by safely cleaning up development artifacts** — `node_modules`, `.venv`, build caches, and other regenerable directories — with a trash-backed safety net so nothing is ever lost to a typo.
 
+![devklean in action](docs/assets/devklean.png)
+
 <!-- TODO: insert terminal recording GIF of `devklean clean` here -->
 
 ## Why

{devklean-1.0.0 → devklean-1.0.2}/pyproject.toml

@@ -31,6 +31,7 @@ classifiers = [
 ]
 dependencies = [
     "tomli>=2.0.0; python_version < '3.11'",
+    "click>=8.1.0",
     "send2trash>=1.8.2",
 ]
 

{devklean-1.0.0 → devklean-1.0.2}/src/devklean/__main__.py

@@ -1,4 +1,4 @@
-from devklean.cli import main
+from devklean.cli.main import main
 
 if __name__ == "__main__":
     main()

{devklean-1.0.0 → devklean-1.0.2}/src/devklean/_version.py

@@ -5,4 +5,4 @@ this file (see ``[tool.hatch.version]`` in pyproject.toml), so a release bump is
 a one-line change here and nowhere else.
 """
 
-__version__ = "1.0.0"
+__version__ = "1.0.2"

devklean-1.0.2/src/devklean/cli/__init__.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+from importlib import import_module
+
+__all__ = ["main"]
+
+
+def __getattr__(name: str):
+    if name == "main":
+        return import_module("devklean.cli.main").main
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

devklean-1.0.2/src/devklean/cli/commands/__init__.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from importlib import import_module
+
+__all__ = ["run_clean", "run_scan"]
+
+
+def __getattr__(name: str):
+    if name == "run_clean":
+        return import_module("devklean.cli.commands.clean").run_clean
+    if name == "run_scan":
+        return import_module("devklean.cli.commands.scan").run_scan
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{devklean-1.0.0 → devklean-1.0.2}/src/devklean/cli/commands/clean.py

@@ -9,11 +9,17 @@ from devklean.cli.confirmation import (
     exceeds_threshold,
 )
 from devklean.config.models import AppConfig
-from devklean.deletion import SafetyValidator, delete_items
+from devklean.deletion.safety import SafetyValidator
 from devklean.models import CleanableItem
 from devklean.output.base import Renderer
 
 
+def delete_items(*args, **kwargs):
+    from devklean.deletion import delete_items as _delete_items
+
+    return _delete_items(*args, **kwargs)
+
+
 def _confirm_deletion(
     renderer: Renderer,
     count: int,

{devklean-1.0.0 → devklean-1.0.2}/src/devklean/cli/main.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 import sys
 
+import click
+
 from devklean.cli.dispatcher import dispatch
 from devklean.cli.parser import build_parser, resolve_bare_invocation
 from devklean.config import ConfigManager
@@ -30,32 +32,37 @@ def main() -> None:
     if hasattr(sys.stderr, "reconfigure"):
         sys.stderr.reconfigure(encoding="utf-8", errors="replace")
 
-    raw_argv = list(sys.argv)
-    argv = resolve_bare_invocation(raw_argv)
+    try:
+        raw_argv = list(sys.argv)
+        argv = resolve_bare_invocation(raw_argv)
 
-    configure_logging()
+        configure_logging()
 
-    config_manager = ConfigManager()
-    result = config_manager.load_full()
-    config = result.config
+        config_manager = ConfigManager()
+        result = config_manager.load_full()
+        config = result.config
 
-    parser = build_parser()
-    args = parser.parse_args(argv[1:])
-    args._config = config
-    config_manager.apply_defaults(args, raw_argv)
+        parser = build_parser()
+        args = parser.parse_args(argv[1:])
+        args._config = config
+        config_manager.apply_defaults(args, raw_argv)
 
-    log_invocation(raw_argv, getattr(args, "command", None))
+        log_invocation(raw_argv, getattr(args, "command", None))
 
-    # Surface config warnings on stderr so stdout/JSON stay clean.
-    if result.warnings:
-        warn_console = Console(
-            stream=sys.stderr, theme=getattr(config.defaults, "theme", "default")
-        )
-        for warning in result.warnings:
-            warn_console.warning(warning)
+        # Surface config warnings on stderr so stdout/JSON stay clean.
+        if result.warnings:
+            warn_console = Console(
+                stream=sys.stderr, theme=getattr(config.defaults, "theme", "default")
+            )
+            for warning in result.warnings:
+                warn_console.warning(warning)
 
-    renderer = select_renderer(args, config)
-    exit_code = dispatch(args, renderer, config)
+        renderer = select_renderer(args, config)
+        exit_code = dispatch(args, renderer, config)
 
-    if exit_code != 0:
-        sys.exit(exit_code)
+        if exit_code != 0:
+            sys.exit(exit_code)
+    except KeyboardInterrupt:
+        # 130 is the Unix convention for a SIGINT-terminated process (128 + 2).
+        click.echo("\nAborted.", file=sys.stderr)
+        sys.exit(130)

devklean-1.0.2/src/devklean/deletion/__init__.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+from importlib import import_module
+
+__all__ = [
+    "IntegrityReport",
+    "MetadataManager",
+    "SafetyValidator",
+    "SafetyViolation",
+    "check_integrity",
+    "delete_items",
+    "get_deletion_metadata_dir",
+]
+
+
+def __getattr__(name: str):
+    if name == "IntegrityReport":
+        return import_module("devklean.deletion.integrity").IntegrityReport
+    if name == "check_integrity":
+        return import_module("devklean.deletion.integrity").check_integrity
+    if name == "MetadataManager":
+        return import_module("devklean.deletion.metadata").MetadataManager
+    if name == "get_deletion_metadata_dir":
+        return import_module("devklean.deletion.paths").get_deletion_metadata_dir
+    if name == "SafetyValidator":
+        return import_module("devklean.deletion.safety").SafetyValidator
+    if name == "SafetyViolation":
+        return import_module("devklean.deletion.safety").SafetyViolation
+    if name == "delete_items":
+        return import_module("devklean.deletion.trash").delete_items
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{devklean-1.0.0 → devklean-1.0.2}/src/devklean/deletion/metadata.py

@@ -10,6 +10,11 @@ from uuid import uuid4
 from devklean.deletion.paths import get_deletion_metadata_dir
 from devklean.models import CleanableItem, DeleteResult
 
+# The only recognized strategy value. Shared with trash.py's STRATEGY_NAME so
+# the write side and this validation can't drift; a record with any other value
+# was written by a removed backend and is treated as corrupt.
+TRASH_STRATEGY = "trash"
+
 
 @dataclass(frozen=True)
 class DeletionMetadataItem:
@@ -101,6 +106,9 @@ def _parse_record(data: dict[str, object]) -> DeletionMetadataRecord:
     ):
         raise ValueError("missing or wrong-typed metadata fields")
 
+    if strategy != TRASH_STRATEGY:
+        raise ValueError(f"unrecognized strategy {strategy!r}")
+
     return DeletionMetadataRecord(
         schema_version=schema_version,
         deletion_id=deletion_id,

{devklean-1.0.0 → devklean-1.0.2}/src/devklean/deletion/trash.py

@@ -4,15 +4,15 @@ from collections.abc import Sequence
 
 from send2trash import send2trash
 
-from devklean.deletion.metadata import MetadataManager
+from devklean.deletion.metadata import TRASH_STRATEGY, MetadataManager
 from devklean.deletion.safety import SafetyValidator
 from devklean.logging_setup import get_logger
 from devklean.models import CleanableItem, DeleteFailure, DeleteResult
 
 # The single deletion backend is the native OS trash (Recycle Bin on Windows,
-# ~/.Trash on macOS, the freedesktop trash on Linux) via send2trash. There is
-# only one method, so the name recorded in metadata/history is a literal.
-STRATEGY_NAME = "trash"
+# ~/.Trash on macOS, the freedesktop trash on Linux) via send2trash. The name
+# recorded in metadata/history is the shared constant defined in metadata.py.
+STRATEGY_NAME = TRASH_STRATEGY
 
 
 def delete_items(

devklean-1.0.2/src/devklean/output/__init__.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from importlib import import_module
+
+__all__ = ["JsonRenderer", "Renderer", "TextRenderer"]
+
+
+def __getattr__(name: str):
+    if name == "Renderer":
+        return import_module("devklean.output.base").Renderer
+    if name == "JsonRenderer":
+        return import_module("devklean.output.json").JsonRenderer
+    if name == "TextRenderer":
+        return import_module("devklean.output.text").TextRenderer
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{devklean-1.0.0 → devklean-1.0.2}/src/devklean/output/console.py

@@ -4,6 +4,8 @@ import os
 import sys
 from typing import TextIO
 
+import click
+
 from devklean.output.theme import Palette, get_theme
 
 # Semantic symbols — fixed across every command and renderer.
@@ -73,7 +75,7 @@ class Console:
 
     def _line(self, symbol: str, role: str, message: str) -> None:
         prefix = self.paint(symbol, role)
-        print(f"{prefix} {message}", file=self._stream)
+        click.echo(f"{prefix} {message}", file=self._stream)
 
     def success(self, message: str) -> None:
         self._line(SYM_SUCCESS, "success", message)
@@ -88,7 +90,7 @@ class Console:
         self._line(SYM_INFO, "info", message)
 
     def detail(self, message: str) -> None:
-        print(self.paint(message, "detail"), file=self._stream)
+        click.echo(self.paint(message, "detail"), file=self._stream)
 
     def plain(self, message: str = "") -> None:
-        print(message, file=self._stream)
+        click.echo(message, file=self._stream)

{devklean-1.0.0 → devklean-1.0.2}/src/devklean/tui.py

@@ -5,13 +5,19 @@ from devklean.cli.confirmation import (
     confirm_large_deletion,
     exceeds_threshold,
 )
-from devklean.deletion import SafetyValidator, delete_items
+from devklean.deletion.safety import SafetyValidator
 from devklean.formatting import format_size, truncate
 from devklean.models import CleanableItem
 from devklean.output.base import Renderer
 from devklean.output.sorting import items_by_size_desc
 
 
+def delete_items(*args, **kwargs):
+    from devklean.deletion import delete_items as _delete_items
+
+    return _delete_items(*args, **kwargs)
+
+
 def interactive_ui(stdscr, items: list[CleanableItem], dry_run: bool) -> list[int] | None:
     import curses  # Unix-only; imported lazily so this module loads on Windows.
 

{devklean-1.0.0 → devklean-1.0.2}/tests/test_integrity.py

@@ -102,6 +102,35 @@ def test_check_integrity_reports_corrupt(tmp_path: Path) -> None:
     assert len(report.valid) == 1
 
 
+def test_load_records_flags_unrecognized_strategy_as_corrupt(tmp_path: Path) -> None:
+    # Records written by older builds carried strategy values ("recording",
+    # "rec") that no longer name a real deletion backend. The only valid
+    # strategy is "trash"; anything else is semantically corrupt.
+    payload = _valid_payload(deletion_id="a", trash_path=None)
+    payload["deletion"]["strategy"] = "recording"
+    _write(tmp_path, "stale.json", payload)
+
+    result = MetadataManager(storage_dir=tmp_path).load_records()
+
+    assert result.records == ()
+    assert len(result.corrupt) == 1
+    assert "strategy" in result.corrupt[0].reason.lower()
+
+
+def test_check_integrity_flags_unrecognized_strategy(tmp_path: Path) -> None:
+    meta = tmp_path / "meta"
+    _write(meta, "good.json", _valid_payload(deletion_id="a", trash_path=None))
+    stale = _valid_payload(deletion_id="b", trash_path=None)
+    stale["deletion"]["strategy"] = "rec"
+    _write(meta, "stale.json", stale)
+
+    report = check_integrity(MetadataManager(storage_dir=meta))
+
+    assert not report.healthy
+    assert len(report.valid) == 1
+    assert len(report.corrupt) == 1
+
+
 def test_check_integrity_does_not_treat_missing_trash_as_a_problem(tmp_path: Path) -> None:
     # Items now go to the native OS trash, which devklean does not track. A
     # record that references a no-longer-present path is still a valid record;

devklean-1.0.2/tests/test_main_signal.py

@@ -0,0 +1,34 @@
+"""Tests for top-level signal handling in the CLI entry point."""
+
+from __future__ import annotations
+
+import sys
+
+import pytest
+
+import devklean.cli.main  # noqa: F401  (ensure the submodule is imported)
+
+# devklean.cli.__init__ rebinds the name "main" to the function, shadowing the
+# submodule attribute, so reach the module object through sys.modules.
+main_module = sys.modules["devklean.cli.main"]
+
+
+def test_main_handles_keyboard_interrupt_cleanly(tmp_path, monkeypatch, capsys) -> None:
+    # Ctrl+C at a confirmation prompt raises KeyboardInterrupt from deep in the
+    # call stack. main() must turn that into a clean exit (code 130, the Unix
+    # SIGINT convention) with an "Aborted." notice rather than a traceback.
+    monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "data"))
+    monkeypatch.setenv("XDG_CONFIG_HOME", str(tmp_path / "config"))
+    monkeypatch.setenv("XDG_CACHE_HOME", str(tmp_path / "cache"))
+    monkeypatch.setattr("sys.argv", ["devklean", "scan", str(tmp_path)])
+
+    def _raise(*args, **kwargs):
+        raise KeyboardInterrupt
+
+    monkeypatch.setattr(main_module, "dispatch", _raise)
+
+    with pytest.raises(SystemExit) as excinfo:
+        main_module.main()
+
+    assert excinfo.value.code == 130
+    assert "Aborted." in capsys.readouterr().err

{devklean-1.0.0 → devklean-1.0.2}/tests/test_windows_guard.py

@@ -10,6 +10,7 @@ These are the Windows-relevant behaviors, so they run on every platform.
 from __future__ import annotations
 
 import io
+import os
 import subprocess
 import sys
 from argparse import Namespace
@@ -52,10 +53,12 @@ def test_tui_module_imports_cold_without_curses() -> None:
     crash every command on Windows) and an import-order/circular-import
     regression that an in-process import would mask.
     """
+    env = {**os.environ, "PYTHONPATH": str(Path(__file__).resolve().parents[1] / "src")}
     result = subprocess.run(
         [sys.executable, "-c", "import devklean.tui; print(devklean.tui.run_interactive.__name__)"],
         capture_output=True,
         text=True,
+        env=env,
     )
     assert result.returncode == 0, result.stderr
     assert "run_interactive" in result.stdout

devklean-1.0.0/src/devklean/cli/__init__.py

@@ -1,3 +0,0 @@
-from devklean.cli.main import main
-
-__all__ = ["main"]

devklean-1.0.0/src/devklean/cli/commands/__init__.py

@@ -1,4 +0,0 @@
-from devklean.cli.commands.clean import run_clean
-from devklean.cli.commands.scan import run_scan
-
-__all__ = ["run_clean", "run_scan"]

devklean-1.0.0/src/devklean/deletion/__init__.py

@@ -1,17 +0,0 @@
-from __future__ import annotations
-
-from devklean.deletion.integrity import IntegrityReport, check_integrity
-from devklean.deletion.metadata import MetadataManager
-from devklean.deletion.paths import get_deletion_metadata_dir
-from devklean.deletion.safety import SafetyValidator, SafetyViolation
-from devklean.deletion.trash import delete_items
-
-__all__ = [
-    "IntegrityReport",
-    "MetadataManager",
-    "SafetyValidator",
-    "SafetyViolation",
-    "check_integrity",
-    "delete_items",
-    "get_deletion_metadata_dir",
-]

devklean-1.0.0/src/devklean/output/__init__.py

@@ -1,5 +0,0 @@
-from devklean.output.base import Renderer
-from devklean.output.json import JsonRenderer
-from devklean.output.text import TextRenderer
-
-__all__ = ["JsonRenderer", "Renderer", "TextRenderer"]