specfuse 0.2.4__tar.gz → 0.2.6__tar.gz

{specfuse-0.2.4/specfuse.egg-info → specfuse-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specfuse
-Version: 0.2.4
+Version: 0.2.6
 Summary: Specfuse umbrella CLI — bridges the pip-installed driver and the Claude Code plugin (init / upgrade).
 Author: Specfuse contributors
 License: Apache-2.0
@@ -17,7 +17,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: specfuse-loop>=0.3.2
+Requires-Dist: specfuse-loop>=0.3.3
 Provides-Extra: dev
 Requires-Dist: coverage>=7.0; extra == "dev"
 Requires-Dist: ruff>=0.6; extra == "dev"

{specfuse-0.2.4 → specfuse-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "specfuse"
-version = "0.2.4"
+version = "0.2.6"
 description = "Specfuse umbrella CLI — bridges the pip-installed driver and the Claude Code plugin (init / upgrade)."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -25,7 +25,7 @@ classifiers = [
 # `specfuse.loop.scaffold`, which only exists in specfuse-loop 0.3.0+ (added by
 # FEAT-2026-0026). A 0.2.x driver would import-fail at `specfuse init`.
 dependencies = [
-  "specfuse-loop>=0.3.2",
+  "specfuse-loop>=0.3.3",
 ]
 
 [project.optional-dependencies]
@@ -38,7 +38,7 @@ specfuse = "specfuse.cli:main"
 # not its dependencies' — without these, `specfuse-loop`/`specfuse-lint` (from
 # the specfuse-loop dep) would be hidden and users would have to install the
 # driver separately or pass --include-deps. The targets resolve against the
-# specfuse.loop modules the pinned specfuse-loop>=0.3.2 dependency provides.
+# specfuse.loop modules the pinned specfuse-loop>=0.3.3 dependency provides.
 specfuse-loop = "specfuse.loop.loop:main"
 specfuse-lint = "specfuse.loop.lint_plan:main"
 

{specfuse-0.2.4 → specfuse-0.2.6}/specfuse/cli.py

@@ -23,6 +23,7 @@ thin user-facing bridge over it.
 from __future__ import annotations
 
 import argparse
+import importlib.util
 import shutil
 import subprocess
 import sys
@@ -31,7 +32,7 @@ from pathlib import Path
 
 from specfuse.loop import scaffold
 
-__version__ = "0.2.4"
+__version__ = "0.2.6"
 
 MARKETPLACE = "specfuse/specfuse"
 PLUGIN = "specfuse@specfuse"
@@ -54,6 +55,50 @@ def _pip_install(packages: list[str], *, upgrade: bool, runner=None) -> int:
     return getattr(proc, "returncode", 0)
 
 
+def _scaffold_is_current(target: Path) -> tuple[bool, str]:
+    """Return (already_current, installed_seed_version).
+
+    already_current is True when the target's .specfuse/VERSION equals the
+    installed seed version — i.e. there is nothing newer to overlay.
+    """
+    installed = scaffold.scaffold_version()
+    vpath = target / ".specfuse" / "VERSION"
+    if not vpath.exists():
+        return (False, installed)
+    current = vpath.read_text(encoding="utf-8").strip()
+    try:
+        same = scaffold._parse_version(current) == scaffold._parse_version(installed)
+    except ValueError:
+        return (False, installed)
+    return (same, installed)
+
+
+def _pip_upgrade_or_advise(runner=None) -> int:
+    """Pip-upgrade the driver + CLI, unless this is a pipx-managed or pip-less
+    install — pipx owns its venv (and may ship no pip), so `python -m pip` either
+    fails ('No module named pip') or fights pipx. In that case skip and advise
+    the right command instead of erroring. Returns a process-style rc (0 = ok or
+    cleanly skipped)."""
+    pipx_managed = "/pipx/venvs/" in Path(sys.executable).as_posix()
+    pip_missing = importlib.util.find_spec("pip") is None
+    if pipx_managed or pip_missing:
+        why = "pipx-managed install" if pipx_managed else "no pip in this environment"
+        print(
+            f"specfuse: skipping automatic package upgrade ({why}). Update the "
+            f"driver + CLI with:\n"
+            f"  pipx upgrade specfuse                 # if installed via pipx\n"
+            f"  python3 -m pip install -U specfuse    # if installed in a venv",
+            file=sys.stderr,
+        )
+        return 0
+    rc = _pip_install(["specfuse-loop", "specfuse"], upgrade=True, runner=runner)
+    if rc != 0:
+        print(f"specfuse: pip upgrade failed (exit {rc}).", file=sys.stderr)
+    else:
+        print("specfuse: pip packages upgraded (specfuse-loop, specfuse).")
+    return rc
+
+
 def cmd_init(args: argparse.Namespace, *, runner=None) -> int:
     """Scaffold a repo's .specfuse/ + .claude wiring from the package (no pip,
     no curl-bash). Refuses if .specfuse/ already exists (points at `upgrade`)."""
@@ -104,8 +149,13 @@ def cmd_upgrade(args: argparse.Namespace, *, runner=None) -> int:
         print(f"specfuse: target '{target}' is not a directory.", file=sys.stderr)
         return 2
     ci_check = getattr(args, "ci_check", None)
+    current, installed = _scaffold_is_current(target)
 
     if getattr(args, "dry_run", False):
+        if current:
+            print(f"specfuse: [dry-run] .specfuse/ is already at the latest "
+                  f"scaffold version ({installed}); nothing to overlay.")
+            return 0
         # Preview the overlay against a faithful copy of the target's .specfuse/;
         # the target is never touched and no pip runs.
         with tempfile.TemporaryDirectory() as tmp:
@@ -137,13 +187,16 @@ def cmd_upgrade(args: argparse.Namespace, *, runner=None) -> int:
     except scaffold.ScaffoldDowngradeError as exc:
         print(f"specfuse: {exc}", file=sys.stderr)
         return 1
-    print(f"specfuse: overlaid {len(written)} versioned file(s) onto {target}/.specfuse/.")
-
-    rc = _pip_install(["specfuse-loop", "specfuse"], upgrade=True, runner=runner)
+    if current:
+        print(f"specfuse: .specfuse/ already at the latest scaffold version "
+              f"({installed}); .claude wiring refreshed.")
+    else:
+        print(f"specfuse: overlaid {len(written)} versioned file(s) onto "
+              f"{target}/.specfuse/.")
+
+    rc = _pip_upgrade_or_advise(runner)
     if rc != 0:
-        print(f"specfuse: pip upgrade failed (exit {rc}).", file=sys.stderr)
         return rc
-    print("specfuse: pip packages upgraded (specfuse-loop, specfuse).")
     print(PLUGIN_UPDATE_HINT)
     return 0
 

{specfuse-0.2.4 → specfuse-0.2.6/specfuse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: specfuse
-Version: 0.2.4
+Version: 0.2.6
 Summary: Specfuse umbrella CLI — bridges the pip-installed driver and the Claude Code plugin (init / upgrade).
 Author: Specfuse contributors
 License: Apache-2.0
@@ -17,7 +17,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: specfuse-loop>=0.3.2
+Requires-Dist: specfuse-loop>=0.3.3
 Provides-Extra: dev
 Requires-Dist: coverage>=7.0; extra == "dev"
 Requires-Dist: ruff>=0.6; extra == "dev"

{specfuse-0.2.4 → specfuse-0.2.6}/specfuse.egg-info/requires.txt

@@ -1,4 +1,4 @@
-specfuse-loop>=0.3.2
+specfuse-loop>=0.3.3
 
 [dev]
 coverage>=7.0

{specfuse-0.2.4 → specfuse-0.2.6}/tests/test_cli.py

@@ -101,10 +101,16 @@ class TestUpgrade(unittest.TestCase):
         with redirect_stdout(io.StringIO()):
             cli.cmd_init(_args(target=d))
 
+    def _make_stale(self, d):
+        """Force the target's scaffold VERSION older than the seed so upgrade
+        actually overlays (a freshly-init'd target is already current)."""
+        (Path(d) / ".specfuse" / "VERSION").write_text("0.1.0\n", encoding="utf-8")
+
     def test_upgrade_overlays_then_pip(self):
         # Red test for T04: overlay precedes pip; both happen.
         with tempfile.TemporaryDirectory() as d:
             self._init(d)
+            self._make_stale(d)
             runner = _ok_runner(0)
             out = io.StringIO()
             with redirect_stdout(out):
@@ -144,6 +150,7 @@ class TestUpgrade(unittest.TestCase):
         them (regression: shutil.Error 'No such file or directory')."""
         with tempfile.TemporaryDirectory() as d:
             self._init(d)
+            self._make_stale(d)  # force an actual overlay so the copytree runs
             skills = Path(d) / ".specfuse" / "skills"
             skills.mkdir(parents=True, exist_ok=True)
             # Point at a target that does not exist → dangling symlink.
@@ -155,6 +162,57 @@ class TestUpgrade(unittest.TestCase):
             self.assertEqual(rc, 0, "dry-run must survive dangling legacy symlinks")
             self.assertIn("dry-run", out.getvalue())
 
+    def test_upgrade_dry_run_reports_already_latest(self):
+        """A freshly-init'd target is at the seed version; --dry-run must say so,
+        not dump the full versioned-file list."""
+        with tempfile.TemporaryDirectory() as d:
+            self._init(d)  # VERSION == installed seed
+            out = io.StringIO()
+            with redirect_stdout(out):
+                rc = cli.cmd_upgrade(_args(target=d, dry_run=True), runner=_ok_runner(0))
+            self.assertEqual(rc, 0)
+            text = out.getvalue()
+            self.assertIn("already at the latest", text)
+            self.assertNotIn("would overlay", text)
+            self.assertNotIn("  .specfuse/", text)  # no file list
+
+    def test_upgrade_real_reports_already_latest(self):
+        """Real upgrade on a current target reports 'already at latest', not a
+        misleading 'overlaid N file(s)'."""
+        with tempfile.TemporaryDirectory() as d:
+            self._init(d)
+            out = io.StringIO()
+            with redirect_stdout(out):
+                rc = cli.cmd_upgrade(_args(target=d), runner=_ok_runner(0))
+            self.assertEqual(rc, 0)
+            self.assertIn("already at the latest", out.getvalue())
+
+    def test_pip_step_skipped_when_pip_unavailable(self):
+        """In a pip-less (e.g. pipx-managed) environment, the upgrade skips the
+        auto pip-install with guidance rather than erroring, and does not call
+        the runner."""
+        import importlib.util as _ilu
+        real_find_spec = _ilu.find_spec
+
+        def _no_pip(name, *a, **k):
+            return None if name == "pip" else real_find_spec(name, *a, **k)
+
+        runner = _ok_runner(0)
+        err = io.StringIO()
+        with tempfile.TemporaryDirectory() as d:
+            self._init(d)
+            self._make_stale(d)
+            orig = cli.importlib.util.find_spec
+            cli.importlib.util.find_spec = _no_pip
+            try:
+                with redirect_stderr(err):
+                    rc = cli.cmd_upgrade(_args(target=d), runner=runner)
+            finally:
+                cli.importlib.util.find_spec = orig
+            self.assertEqual(rc, 0, "pip-less env must not fail the upgrade")
+            self.assertEqual(runner.calls, [], "must not attempt pip when pip absent")
+            self.assertIn("pipx upgrade specfuse", err.getvalue())
+
 
 class TestParser(unittest.TestCase):