devklean 1.0.0__tar.gz → 1.0.1__tar.gz

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

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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 +91,7 @@ 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.1...HEAD
+[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.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devklean
-Version: 1.0.0
+Version: 1.0.1
 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

{devklean-1.0.0 → devklean-1.0.1}/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.1"

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

@@ -30,32 +30,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).
+        print("\nAborted.", file=sys.stderr)
+        sys.exit(130)

{devklean-1.0.0 → devklean-1.0.1}/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.1}/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.0 → devklean-1.0.1}/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.1/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