mac-upkeep 2.4.0__tar.gz → 2.4.2__tar.gz

mac_upkeep-2.4.2/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "2.4.2"
+}

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.4.2](https://github.com/calvindotsg/mac-upkeep/compare/v2.4.1...v2.4.2) (2026-06-15)
+
+
+### Bug Fixes
+
+* git_sync timeout resilience + disable broken pnpm store-prune ([#39](https://github.com/calvindotsg/mac-upkeep/issues/39)) ([c9b2665](https://github.com/calvindotsg/mac-upkeep/commit/c9b2665cb9be85d4f49b39aa967ab001473f5b22))
+
+## [2.4.1](https://github.com/calvindotsg/mac-upkeep/compare/v2.4.0...v2.4.1) (2026-04-22)
+
+
+### Bug Fixes
+
+* correct Mole link in README to tw93/Mole ([#37](https://github.com/calvindotsg/mac-upkeep/issues/37)) ([6f0b1ff](https://github.com/calvindotsg/mac-upkeep/commit/6f0b1ff5ba107ab9b9aab0242c823e5aaf4e1a08))
+
 ## [2.4.0](https://github.com/calvindotsg/mac-upkeep/compare/v2.3.0...v2.4.0) (2026-04-20)
 
 

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/CLAUDE.md

@@ -103,7 +103,7 @@ A TaskDef with `handler="<name>"` and empty `command` bypasses subprocess buildi
 - **Do not open terminal windows from launchd** — fragile (focus stealing, macOS 13+ permission escalation). Use headless + notification + click-to-act.
 - **Testing**: `Config.load()` calls `get_brew_prefix()` which runs `subprocess.run(["brew", "--prefix"])`. Tests that mock `subprocess.run` or `shutil.which` will capture this call too (shared module objects). Mock `mac_upkeep.config.get_brew_prefix` directly in `init` command tests.
 - **`git_sync` SSH auth under launchd** relies on `~/.ssh/config` `IdentityAgent` (path-based, e.g. 1Password socket). `SSH_AUTH_SOCK` env vars are NOT inherited by LaunchAgents, so env-based agent forwarding won't work here — the `IdentityAgent` directive is the supported path.
-- **`git_sync` forces `GIT_TERMINAL_PROMPT=0` and defaults `GIT_ASKPASS=/usr/bin/true`** (user-set `GIT_ASKPASS` is respected) — fail-fast on auth misconfiguration instead of stalling to the 60 s subprocess timeout.
+- **`git_sync` forces `GIT_TERMINAL_PROMPT=0` and defaults `GIT_ASKPASS=/usr/bin/true`** (user-set `GIT_ASKPASS` is respected) — fail-fast on auth misconfiguration instead of stalling to the 60 s subprocess timeout. A genuine stall (network/server hang) still hits the timeout, so `_run_git` catches `subprocess.TimeoutExpired` and returns a synthetic `CompletedProcess(returncode=124, stderr="timed out after {timeout}s")`. That marks only the affected repo failed and lets the loop continue — a hung pull cannot abort the whole run (which would otherwise skip `output.summary()`/`notify()` and later tasks).
 
 ## Release Process
 

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mac-upkeep
-Version: 2.4.0
+Version: 2.4.2
 Summary: Automated macOS maintenance CLI
 Project-URL: Homepage, https://github.com/calvindotsg/mac-upkeep
 Project-URL: Repository, https://github.com/calvindotsg/mac-upkeep
@@ -61,9 +61,9 @@ uvx mac-upkeep run            # one-off without installing
 | `pnpm` | Prune pnpm content-addressable store | Monthly |
 | `uv` | Prune uv package cache | Monthly |
 | `fisher` | Update Fish shell plugins | Weekly |
-| `mo_clean` | Clean system and user caches ([mole](https://github.com/nicehash/mole)) | Weekly |
-| `mo_optimize` | Optimize DNS, Spotlight, fonts, Dock ([mole](https://github.com/nicehash/mole)) | Weekly |
-| `mo_purge` | Remove old project artifacts ([mole](https://github.com/nicehash/mole)) | Monthly |
+| `mo_clean` | Clean system and user caches ([Mole](https://github.com/tw93/Mole)) | Weekly |
+| `mo_optimize` | Optimize DNS, Spotlight, fonts, Dock ([Mole](https://github.com/tw93/Mole)) | Weekly |
+| `mo_purge` | Remove old project artifacts ([Mole](https://github.com/tw93/Mole)) | Monthly |
 | `brew_cleanup` | Remove old versions and cache files | Monthly |
 | `brew_bundle` | Remove packages not in Brewfile | Weekly |
 | `git_sync` | Pull configured git repositories | Daily |

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/README.md

@@ -34,9 +34,9 @@ uvx mac-upkeep run            # one-off without installing
 | `pnpm` | Prune pnpm content-addressable store | Monthly |
 | `uv` | Prune uv package cache | Monthly |
 | `fisher` | Update Fish shell plugins | Weekly |
-| `mo_clean` | Clean system and user caches ([mole](https://github.com/nicehash/mole)) | Weekly |
-| `mo_optimize` | Optimize DNS, Spotlight, fonts, Dock ([mole](https://github.com/nicehash/mole)) | Weekly |
-| `mo_purge` | Remove old project artifacts ([mole](https://github.com/nicehash/mole)) | Monthly |
+| `mo_clean` | Clean system and user caches ([Mole](https://github.com/tw93/Mole)) | Weekly |
+| `mo_optimize` | Optimize DNS, Spotlight, fonts, Dock ([Mole](https://github.com/tw93/Mole)) | Weekly |
+| `mo_purge` | Remove old project artifacts ([Mole](https://github.com/tw93/Mole)) | Monthly |
 | `brew_cleanup` | Remove old versions and cache files | Monthly |
 | `brew_bundle` | Remove packages not in Brewfile | Weekly |
 | `git_sync` | Pull configured git repositories | Daily |

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mac-upkeep"
-version = "2.4.0"
+version = "2.4.2"
 description = "Automated macOS maintenance CLI"
 readme = "README.md"
 license = "MIT"

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/src/mac_upkeep/defaults.toml

@@ -22,6 +22,10 @@ description = "Prune pnpm content-addressable store"
 command = "pnpm store prune"
 detect = "pnpm"
 frequency = "monthly"
+# Disabled by default: on pnpm 11 `store prune` corrupts the global virtual
+# store, removing in-use packages (pnpm/pnpm#10132). Re-enable per-machine via
+# `[tasks.pnpm]\nenabled = true` once upstream is fixed.
+enabled = false
 
 [tasks.uv]
 description = "Prune uv package cache"

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/src/mac_upkeep/git_sync.py

@@ -29,14 +29,23 @@ def _build_env() -> dict[str, str]:
 
 
 def _run_git(path: str, args: list[str], *, timeout: int = 60) -> subprocess.CompletedProcess[str]:
-    return subprocess.run(
-        ["git", "-C", path, *args],
-        capture_output=True,
-        text=True,
-        timeout=timeout,
-        stdin=subprocess.DEVNULL,
-        env=_build_env(),
-    )
+    cmd = ["git", "-C", path, *args]
+    try:
+        return subprocess.run(
+            cmd,
+            capture_output=True,
+            text=True,
+            timeout=timeout,
+            stdin=subprocess.DEVNULL,
+            env=_build_env(),
+        )
+    except subprocess.TimeoutExpired:
+        # A hung git call (e.g. network/auth stall on pull) must not abort the
+        # whole run. Return a synthetic failure so _sync_repo marks this repo
+        # failed and continues. 124 mirrors GNU timeout's convention.
+        return subprocess.CompletedProcess(
+            cmd, returncode=124, stdout="", stderr=f"timed out after {timeout}s"
+        )
 
 
 def _resolve_paths(patterns: list[str], output: Output) -> list[str]:
@@ -62,7 +71,12 @@ def _resolve_paths(patterns: list[str], output: Output) -> list[str]:
 
 
 def _sync_repo(path: str, *, skip_dirty: bool) -> tuple[str, str]:
-    """Sync one repo. Returns (status, reason) where status is pulled|up-to-date|skipped|failed."""
+    """Sync one repo. Returns (status, reason) where status is pulled|up-to-date|skipped|failed.
+
+    Only `pull` realistically times out (it's the sole network call); a 124 timeout on
+    the local pre-pull checks below would fall through to their "skipped" branches, which
+    is fine — the run still completes either way thanks to _run_git's TimeoutExpired catch.
+    """
     r = _run_git(path, ["rev-parse", "--is-inside-work-tree"])
     if r.returncode != 0:
         return "skipped", "not a git repo"

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/tests/test_config.py

@@ -394,7 +394,7 @@ def test_env_var_disables_task(monkeypatch):
     monkeypatch.setenv("MAC_UPKEEP_GCLOUD", "false")
     config = Config.load(Path("/nonexistent/config.toml"))
     assert not config.is_enabled("gcloud")
-    assert config.is_enabled("pnpm")
+    assert config.is_enabled("uv")  # unrelated task stays enabled
 
 
 def test_env_var_overrides_config(tmp_path):

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/tests/test_git_sync.py

@@ -277,3 +277,28 @@ def test_failure_surfaces_basename_and_stderr(tmp_path, monkeypatch):
     assert result.status == "failed"
     assert "1 failed: biz" == result.reason
     assert any("Permission denied" in c[0][0] for c in output.task_debug.call_args_list)
+
+
+def test_pull_timeout_does_not_crash_run(tmp_path, monkeypatch):
+    """A hung pull raises TimeoutExpired inside subprocess.run; it must be caught
+    and surfaced as a failed repo rather than aborting the whole run."""
+    p = _make_repo(tmp_path, "biz")
+    config = _config([p])
+    output = MagicMock()
+    # MagicMock raises any exception instance found in side_effect, so the pull
+    # step (last) raises TimeoutExpired exactly where _run_git calls subprocess.run.
+    run_mock = MagicMock(
+        side_effect=[
+            _cp(returncode=0, stdout="true\n"),
+            _cp(returncode=0, stdout="origin\n"),
+            _cp(returncode=0, stdout="main\n"),
+            _cp(returncode=0, stdout="origin/main\n"),
+            _cp(returncode=0, stdout=""),  # clean worktree
+            subprocess.TimeoutExpired(cmd=["git", "pull"], timeout=60),  # pull hangs
+        ]
+    )
+    monkeypatch.setattr("mac_upkeep.git_sync.subprocess.run", run_mock)
+    result = run_git_sync(config, output, dry_run=False)
+    assert result.status == "failed"
+    assert "1 failed: biz" == result.reason
+    assert any("timed out after 60s" in c[0][0] for c in output.task_debug.call_args_list)

{mac_upkeep-2.4.0 → mac_upkeep-2.4.2}/uv.lock

@@ -43,7 +43,7 @@ wheels = [
 
 [[package]]
 name = "mac-upkeep"
-version = "2.4.0"
+version = "2.4.2"
 source = { editable = "." }
 dependencies = [
     { name = "typer" },

mac_upkeep-2.4.0/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "2.4.0"
-}