cli-tools-kit 1.1.0__tar.gz → 1.2.0__tar.gz

{cli_tools_kit-1.1.0 → cli_tools_kit-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-tools-kit
-Version: 1.1.0
+Version: 1.2.0
 Summary: Installer protocol + helpers for self-installing Python CLI/GUI tools (desktop shortcuts, bash aliases, cron entries), plus reusable tkinter and curses installer screens
 Author: Steffen Probst
 License: MIT License
@@ -77,10 +77,10 @@ Provides:
 - **`gui_installer`** — a full, reusable tkinter GUI installer *engine*: it
   discovers every tool in a project tree that speaks `--advertise`, and offers
   batch install/remove, per-row skill toggles, themes, orphan cleanup, and an
-  opt-in login update-check. A thin wrapper points it at its own tree via
-  `gui_installer.run(root_dir=..., entry_script=...)`; everything else
-  (discovery layout, repo-cache bootstrap, login-check policy, window/desktop
-  identities) is configurable. See [§ GUI installer engine](#gui-installer-engine).
+  opt-in login update-check (`--enable-autostart-check`). A thin wrapper
+  points it at its own tree via `gui_installer.run(root_dir=...,
+  entry_script=...)`; everything else (discovery layout, repo-cache
+  bootstrap, login-check policy, window/desktop identities) is configurable. See [§ GUI installer engine](#gui-installer-engine).
 
 - **`sources`** — one installer offering tools from several repos. A TOML
   file lists them, the kit clones what is missing over HTTPS and hands the

{cli_tools_kit-1.1.0 → cli_tools_kit-1.2.0}/README.md

@@ -17,10 +17,10 @@ Provides:
 - **`gui_installer`** — a full, reusable tkinter GUI installer *engine*: it
   discovers every tool in a project tree that speaks `--advertise`, and offers
   batch install/remove, per-row skill toggles, themes, orphan cleanup, and an
-  opt-in login update-check. A thin wrapper points it at its own tree via
-  `gui_installer.run(root_dir=..., entry_script=...)`; everything else
-  (discovery layout, repo-cache bootstrap, login-check policy, window/desktop
-  identities) is configurable. See [§ GUI installer engine](#gui-installer-engine).
+  opt-in login update-check (`--enable-autostart-check`). A thin wrapper
+  points it at its own tree via `gui_installer.run(root_dir=...,
+  entry_script=...)`; everything else (discovery layout, repo-cache
+  bootstrap, login-check policy, window/desktop identities) is configurable. See [§ GUI installer engine](#gui-installer-engine).
 
 - **`sources`** — one installer offering tools from several repos. A TOML
   file lists them, the kit clones what is missing over HTTPS and hands the

{cli_tools_kit-1.1.0 → cli_tools_kit-1.2.0}/cli_tools_kit/__init__.py

@@ -56,4 +56,4 @@ __all__ = [
     "read_installed_skill",
 ]
 
-__version__ = "1.1.0"
+__version__ = "1.2.0"

{cli_tools_kit-1.1.0 → cli_tools_kit-1.2.0}/cli_tools_kit/gui_installer.py

@@ -1022,27 +1022,6 @@ class InstallerApp:
         # cleanup + .desktop/alias refresh, no pip).
         self._build_update_btn(footer)
 
-        # Login auto-check toggle: enable/disable the ~/.config/autostart entry that
-        # runs `installer.py --check` once per login — applies the same local-only
-        # reconciliations the badge does (no pip) and notifies for new tools. Same
-        # safety class as the badge, so it sits in the badge's group.
-        ttk.Separator(footer, orient="vertical").pack(side="left", fill="y", padx=15)
-        self._autostart_check_var = tk.BooleanVar(value=autostart.autostart_check_enabled())
-        self._autostart_check_cb = ttk.Checkbutton(
-            footer, text="Check on login", variable=self._autostart_check_var,
-            command=self._toggle_autostart_check)
-        self._autostart_check_cb.pack(side="left", padx=5)
-        self._attach_tooltip(
-            self._autostart_check_cb,
-            "Check for updates on login (local, no network)\n\n"
-            "Installs a startup entry that, once per login, applies "
-            "network-free reconciliations (drifted shortcuts, renamed aliases, and "
-            "stale installed skills — rewritten from the tool's source on disk, "
-            "never pip) and only notifies for updates that need the network (a new, "
-            "not-yet-installed tool).\n\n"
-            f"Entry: {state.AUTOSTART_CHECK_DESKTOP}\n"
-            f"Log: {state.CHECK_LOG}")
-
         # "Reinstall deps" is the deliberate, network-touching pip action — kept in
         # its own group (own separator) so it reads as distinct from the local badge.
         ttk.Separator(footer, orient="vertical").pack(side="left", fill="y", padx=15)
@@ -4064,16 +4043,6 @@ class InstallerApp:
         self.root.destroy()
         host.restart(argv)
 
-    def _toggle_autostart_check(self):
-        """Enable/disable the login update-check autostart entry."""
-        if self._autostart_check_var.get():
-            path = autostart.enable_autostart_check()
-            self._log(f"Login update check enabled → {path}", "success")
-            self._log("  On login: applies local reconciliations (no pip), notifies for new tools.", "info")
-        else:
-            autostart.disable_autostart_check()
-            self._log("Login update check disabled.", "info")
-
     def _reinstall_deps(self):
         """Full reinstall (pip dependencies + shortcuts) for every installed tool.
 

{cli_tools_kit-1.1.0 → cli_tools_kit-1.2.0}/cli_tools_kit/upgrade.py

@@ -246,7 +246,8 @@ def upgrade(items: Sequence[Item], tools: Sequence[discovery.ToolEntry],
     (through ``install.install_tool``, so a wrapper's hooks apply), because its
     code and its requirements may have changed. The kit is upgraded when it is
     in ``items`` or the installer's own checkout was pulled, since that can
-    change the installer's pin.
+    change the installer's pin. It is never replaced by an older version, even
+    when the pulled installer still pins one.
 
     Returns ``{"changed": bool, "errors": int}``. ``changed`` means the running
     installer is out of date and should restart.
@@ -269,10 +270,20 @@ def upgrade(items: Sequence[Item], tools: Sequence[discovery.ToolEntry],
     installer_pulled = any(i.kind == "installer" and i.path in pulled for i in items)
     if any(i.kind == "kit" for i in items) or installer_pulled:
         blocker = kit_blocker()
+        # Ask again after the pull: an installer that still pins an older kit
+        # exactly would otherwise make pip downgrade the one running now.
+        latest = None if blocker else latest_kit()
+        current = kit_version()
         if blocker:
             log(f"cli-tools-kit left as it is: {blocker}", "info")
+        elif latest is None:
+            errors += 1
+            log("  ✗ pip could not say which cli-tools-kit the installer asks for", "error")
+        elif _version_key(latest) <= _version_key(current):
+            log(f"cli-tools-kit stays at {current}: nothing newer within the "
+                "installer's pin", "info")
         else:
-            log("Upgrading cli-tools-kit", "header")
+            log(f"Upgrading cli-tools-kit {current} → {latest}", "header")
             cmd = [sys.executable, "-m", "pip", "install", "--upgrade",
                    "--disable-pip-version-check", *kit_requirement()]
             try:

{cli_tools_kit-1.1.0 → cli_tools_kit-1.2.0}/cli_tools_kit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-tools-kit
-Version: 1.1.0
+Version: 1.2.0
 Summary: Installer protocol + helpers for self-installing Python CLI/GUI tools (desktop shortcuts, bash aliases, cron entries), plus reusable tkinter and curses installer screens
 Author: Steffen Probst
 License: MIT License
@@ -77,10 +77,10 @@ Provides:
 - **`gui_installer`** — a full, reusable tkinter GUI installer *engine*: it
   discovers every tool in a project tree that speaks `--advertise`, and offers
   batch install/remove, per-row skill toggles, themes, orphan cleanup, and an
-  opt-in login update-check. A thin wrapper points it at its own tree via
-  `gui_installer.run(root_dir=..., entry_script=...)`; everything else
-  (discovery layout, repo-cache bootstrap, login-check policy, window/desktop
-  identities) is configurable. See [§ GUI installer engine](#gui-installer-engine).
+  opt-in login update-check (`--enable-autostart-check`). A thin wrapper
+  points it at its own tree via `gui_installer.run(root_dir=...,
+  entry_script=...)`; everything else (discovery layout, repo-cache
+  bootstrap, login-check policy, window/desktop identities) is configurable. See [§ GUI installer engine](#gui-installer-engine).
 
 - **`sources`** — one installer offering tools from several repos. A TOML
   file lists them, the kit clones what is missing over HTTPS and hands the

{cli_tools_kit-1.1.0 → cli_tools_kit-1.2.0}/tests/test_upgrade.py

@@ -119,6 +119,34 @@ def test_the_installer_checkout_is_checked_and_its_tools_reinstalled(
     assert any("cli-tools-kit left as it is: not under test" in line for line in lines)
 
 
+@pytest.mark.parametrize("pinned, pip_runs", [("0.7.1", False), (None, False), ("99.0.0", True)])
+def test_a_pulled_installer_never_downgrades_the_kit(
+        remote, monkeypatch: pytest.MonkeyPatch, pinned, pip_runs) -> None:
+    clone, push = remote
+    state.ENTRY_SCRIPT = str(clone / "installer.py")
+    push()
+    items = upgrade.check(force=True)
+    # pinned None: the installer's pin matches the running kit exactly.
+    monkeypatch.setattr(upgrade, "kit_blocker", lambda: None)
+    monkeypatch.setattr(upgrade, "latest_kit", lambda: pinned or upgrade.kit_version())
+    pip_calls = []
+    real_run = upgrade.subprocess.run
+
+    def run(cmd, **kwargs):
+        if "pip" in cmd:
+            pip_calls.append(cmd)
+            return _Result(0, "")
+        return real_run(cmd, **kwargs)
+
+    monkeypatch.setattr(upgrade.subprocess, "run", run)
+    lines = []
+    result = upgrade.upgrade(items, [], lambda msg, tag="info": lines.append(msg))
+    assert result == {"changed": True, "errors": 0}
+    assert bool(pip_calls) == pip_runs
+    if not pip_runs:
+        assert any("stays at" in line for line in lines)
+
+
 def test_a_pull_that_cannot_fast_forward_is_an_error(remote) -> None:
     clone, push = remote
     state.UPGRADE_REPOS = [("tools", str(clone))]