commandertui 1.4.2__tar.gz → 1.4.3__tar.gz

{commandertui-1.4.2 → commandertui-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.4.2
+Version: 1.4.3
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT

commandertui-1.4.3/commandertui/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.4.3"

{commandertui-1.4.2 → commandertui-1.4.3}/commandertui/main_screen.py

@@ -350,7 +350,9 @@ class MainScreen(Screen):
                     )
                 else:
                     self.app.push_screen(
-                        MessageScreen("The update did not finish. Check the terminal output, then try again.")
+                        MessageScreen(
+                            "The update did not finish. The package index may not have the new version yet:\nwait a few minutes and try again, or check the terminal output."
+                        )
                     )
 
         self.app.push_screen(UpdateScreen(info), on_choice)

{commandertui-1.4.2 → commandertui-1.4.3}/commandertui/updater.py

@@ -112,10 +112,12 @@ makepkg -si
 
 def update_command(install: str, latest: str) -> list[str] | None:
     """The command to run for `install`, or None when there isn't a safe one."""
+    # --no-cache-dir: pip keeps the package index for minutes, so right after a release it
+    # can still say "already up to date" for a version PyPI already serves.
     if install == "pipx":
-        return ["pipx", "upgrade", PACKAGE]
+        return ["pipx", "upgrade", "--pip-args=--no-cache-dir", PACKAGE]
     if install == "pip":
-        return [sys.executable, "-m", "pip", "install", "--upgrade", PACKAGE]
+        return [sys.executable, "-m", "pip", "install", "--upgrade", "--no-cache-dir", PACKAGE]
     if install == "pacman":
         return ["bash", "-c", _ARCH_SCRIPT.format(repo=REPO, latest=latest)]
     return None  # git checkout: the user updates it with git
@@ -174,9 +176,25 @@ def skip_version(version: str) -> None:
     _save_cache(cache)
 
 
+def installed_version() -> str | None:
+    """The version on disk right now (not the one this process started with), or None if unknown."""
+    try:
+        from importlib import metadata
+
+        metadata.MetadataPathFinder.invalidate_caches()
+        return metadata.version(PACKAGE)
+    except Exception:
+        return None
+
+
 def run_update(info: UpdateInfo) -> bool:
-    """Run the upgrade attached to the real terminal. True if it exited 0."""
+    """Run the upgrade attached to the real terminal. True only if it exited 0 AND the
+    new version is really installed: a package manager can exit 0 with "already up to date"
+    when its index has not caught up with the release yet."""
     command = update_command(info.install, info.latest)
     if command is None:
         return False
-    return subprocess.run(command).returncode == 0
+    if subprocess.run(command).returncode != 0:
+        return False
+    now = installed_version()
+    return now is None or now == info.latest  # unknown version: trust the exit code

{commandertui-1.4.2 → commandertui-1.4.3}/commandertui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commandertui
-Version: 1.4.2
+Version: 1.4.3
 Summary: Dual-pane retro terminal file manager: compare, sync, copy and move folders
 Author: Humberto Barchini
 License-Expression: MIT

{commandertui-1.4.2 → commandertui-1.4.3}/tests/test_updater.py

@@ -62,9 +62,14 @@ def test_fake_latest_env_shows_an_update_without_a_release(monkeypatch):
 
 
 def test_update_commands_per_install_kind():
-    assert updater.update_command("pipx", "2.0.0") == ["pipx", "upgrade", "commandertui"]
+    assert updater.update_command("pipx", "2.0.0") == [
+        "pipx",
+        "upgrade",
+        "--pip-args=--no-cache-dir",
+        "commandertui",
+    ]
     pip = updater.update_command("pip", "2.0.0")
-    assert pip[1:] == ["-m", "pip", "install", "--upgrade", "commandertui"]
+    assert pip[1:] == ["-m", "pip", "install", "--upgrade", "--no-cache-dir", "commandertui"]
     assert updater.update_command("source", "2.0.0") is None
     arch = updater.update_command("pacman", "2.0.0")
     assert arch[:2] == ["bash", "-c"]
@@ -116,3 +121,30 @@ def test_check_status_tells_ok_new_skipped_and_offline(monkeypatch):
     assert updater.check_status(current="1.1.0") == (None, "skipped")
     monkeypatch.setattr(updater, "fetch_latest", lambda: None)
     assert updater.check_status(current="1.1.0") == (None, "offline")
+
+
+def _info(latest="2.0.0", install="pipx"):
+    return updater.UpdateInfo(current="1.0.0", latest=latest, install=install)
+
+
+def test_run_update_requires_the_new_version_to_be_installed(monkeypatch):
+    import subprocess
+
+    monkeypatch.setattr(updater.subprocess, "run", lambda cmd, **kw: subprocess.CompletedProcess(cmd, 0))
+    monkeypatch.setattr(updater, "installed_version", lambda: "2.0.0")
+    assert updater.run_update(_info()) is True
+    # pipx said "already up to date" (exit 0) but the old version is still there
+    monkeypatch.setattr(updater, "installed_version", lambda: "1.0.0")
+    assert updater.run_update(_info()) is False
+    # version unknown: trust the exit code
+    monkeypatch.setattr(updater, "installed_version", lambda: None)
+    assert updater.run_update(_info()) is True
+
+
+def test_run_update_fails_on_nonzero_exit_without_checking_version(monkeypatch):
+    import subprocess
+
+    monkeypatch.setattr(updater.subprocess, "run", lambda cmd, **kw: subprocess.CompletedProcess(cmd, 1))
+    monkeypatch.setattr(updater, "installed_version", lambda: "2.0.0")
+    assert updater.run_update(_info()) is False
+    assert updater.run_update(_info(install="source")) is False

commandertui-1.4.2/commandertui/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.4.2"