wealthbox-cli 2.2.0__tar.gz → 2.2.1__tar.gz

{wealthbox_cli-2.2.0 → wealthbox_cli-2.2.1}/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to `wealthbox-cli` are documented here. The format follows
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.2.1] - 2026-05-13
+
+Bug-fix release. `wbox self upgrade` was silently no-op'ing for users who
+installed `wbox` via `uv tool install` or `pipx`: it computed the install root
+from `sys.executable` (the venv's `python.exe`) and tried to swap the
+console-script shim there, but `~/.local/bin/wbox.exe` (or pipx's equivalent)
+is a separate copy uv/pipx made — replacing the venv-side shim never changed
+what `PATH` resolved.
+
+### Fixed
+- `wbox self upgrade` now detects the install kind (`bundle` / `uv-tool` /
+  `pipx` / `pip`) up front. Non-bundle installs exit `1` with the correct
+  follow-up command (`uv tool upgrade wealthbox-cli`, `pipx upgrade
+  wealthbox-cli`, or `pip install --upgrade wealthbox-cli`) instead of
+  scheduling a swap that would never take effect on `PATH`.
+
 ## [2.2.0] - 2026-05-13
 
 Small feature + correctness release. Disambiguates the two IDs returned by

{wealthbox_cli-2.2.0 → wealthbox_cli-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wealthbox-cli
-Version: 2.2.0
+Version: 2.2.1
 Summary: CLI and client library for the Wealthbox CRM API
 Project-URL: Homepage, https://github.com/massive-value/wealthbox-cli
 Project-URL: Documentation, https://massive-value.github.io/wealthbox-cli/

{wealthbox_cli-2.2.0 → wealthbox_cli-2.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "wealthbox-cli"
-version = "2.2.0"
+version = "2.2.1"
 description = "CLI and client library for the Wealthbox CRM API"
 readme = "README.md"
 requires-python = ">=3.11"

{wealthbox_cli-2.2.0 → wealthbox_cli-2.2.1}/src/wealthbox_tools/cli/self_cmd.py

@@ -37,8 +37,29 @@ def _default_install_root() -> Path:
     return Path(sys.executable).resolve().parent
 
 
+_NON_BUNDLE_UPGRADE_HINTS = {
+    "uv-tool": "uv tool upgrade wealthbox-cli",
+    "pipx": "pipx upgrade wealthbox-cli",
+    "pip": "pip install --upgrade wealthbox-cli",
+}
+
+
 @app.command("upgrade", help="Upgrade the `wbox` CLI to the latest GitHub release.")
 def upgrade_cmd() -> None:
+    kind = self_upgrade._install_kind()
+    if kind != "bundle":
+        # The frozen-bundle swap would either silently no-op (uv copies the
+        # shim to ~/.local/bin so replacing the venv-side shim doesn't change
+        # what PATH resolves) or wedge the venv. Refuse before downloading.
+        hint = _NON_BUNDLE_UPGRADE_HINTS.get(kind, _NON_BUNDLE_UPGRADE_HINTS["pip"])
+        typer.echo(
+            "wbox self upgrade only swaps the standalone binary from "
+            "install.ps1.",
+            err=True,
+        )
+        typer.echo(f"This wbox was installed via {kind} — run: {hint}", err=True)
+        raise typer.Exit(code=1)
+
     candidate = self_upgrade.check()
     if candidate is None:
         typer.echo("Already on the latest version.")

{wealthbox_cli-2.2.0 → wealthbox_cli-2.2.1}/src/wealthbox_tools/self_upgrade.py

@@ -51,6 +51,7 @@ __all__ = [
     "check_release_staleness",
     "apply",
     "_cleanup_stale_backups",
+    "_install_kind",
 ]
 
 _RELEASES_LATEST_URL = (
@@ -139,6 +140,35 @@ def _running_version() -> str:
     return __version__
 
 
+def _install_kind() -> str:
+    """Classify how the running ``wbox`` was installed.
+
+    The :func:`apply` swap is only correct for the standalone PyInstaller
+    bundle that ``install.ps1`` ships. Under uv / pipx / pip the install is
+    a tiny console-script shim around a venv; replacing it with a frozen
+    binary would either silently no-op (PATH points at a copy uv made
+    elsewhere, e.g. ``~/.local/bin/wbox.exe``) or wedge the venv on the
+    next ``uv tool sync``. The gate in :mod:`cli.self_cmd` consults this
+    classifier to refuse with a clear "use <installer> instead" message.
+
+    Returns one of:
+
+    - ``"bundle"`` — frozen PyInstaller EXE (``sys.frozen`` is set).
+    - ``"uv-tool"`` — ``sys.executable`` lives under a ``uv/tools/`` venv.
+    - ``"pipx"`` — ``sys.executable`` lives under a ``pipx/`` venv.
+    - ``"pip"`` — anything else (ordinary pip/venv install).
+    """
+    if getattr(sys, "frozen", False):
+        return "bundle"
+    parts = [p.lower() for p in Path(sys.executable).resolve().parts]
+    for i in range(len(parts) - 1):
+        if parts[i] == "uv" and parts[i + 1] == "tools":
+            return "uv-tool"
+    if "pipx" in parts:
+        return "pipx"
+    return "pip"
+
+
 # ---------------------------------------------------------------------------
 # Internal helpers
 # ---------------------------------------------------------------------------