cave-cli 3.5.2__tar.gz → 3.5.4__tar.gz

{cave_cli-3.5.2/cave_cli.egg-info → cave_cli-3.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cave_cli
-Version: 3.5.2
+Version: 3.5.4
 Summary: CLI for creating and managing Docker-based CAVE web applications.
 Author-email: MIT-CAVE <cave-contact@mit.edu>
 License: Apache-2.0

{cave_cli-3.5.2 → cave_cli-3.5.4}/cave_cli/commands/create.py

@@ -9,7 +9,7 @@ from cave_cli.commands.reset import reset
 from cave_cli.commands.run import run_cave
 from cave_cli.utils.constants import HTTPS_URL
 from cave_cli.utils.display import print_section, step_done, step_fail, step_start
-from cave_cli.utils.docker import build_image, check_docker, generate_secret_key
+from cave_cli.utils.docker import build_image, generate_secret_key
 from cave_cli.utils.env import create_env_interactive
 from cave_cli.utils.git import add, branch_rename, clone, commit, init
 from cave_cli.utils.logger import logger

cave_cli-3.5.4/cave_cli/commands/update.py

@@ -0,0 +1,80 @@
+import argparse
+import shutil
+import subprocess
+import sys
+import tempfile
+
+from cave_cli.utils.display import step_done, step_start
+from cave_cli.utils.logger import logger
+
+PIPX_DOCS_URL = "https://pipx.pypa.io/stable/installation/"
+CLI_REPO_URL = "https://github.com/MIT-CAVE/cave_cli.git"
+
+
+def update(args: argparse.Namespace) -> None:
+    """
+    Usage:
+
+    - Updates the CAVE CLI via pipx.
+
+    Notes:
+
+    - Without ``--version``, installs the latest version from PyPI via
+      ``pipx install --force cave_cli``.
+    - With ``--version``, reinstalls via ``pipx install --force`` from the
+      specified git tag or branch.
+    - On Windows, the update runs in a new console window because Windows
+      locks running executables and cave.exe cannot replace itself.
+    """
+    pipx = shutil.which("pipx")
+    if not pipx:
+        logger.error(
+            "pipx not found. Please install pipx and reinstall cave_cli."
+        )
+        logger.error(f"See: {PIPX_DOCS_URL}")
+        sys.exit(1)
+
+    version = getattr(args, "version", None)
+    if version:
+        label = f"Reinstalling CAVE CLI ({version})"
+        spec = f"cave_cli @ git+{CLI_REPO_URL}@{version}"
+    else:
+        label = "Updating CAVE CLI"
+        spec = "cave_cli"
+
+    step_start(label)
+
+    if sys.platform == "win32":
+        # Windows locks running executables, so cave.exe cannot be replaced
+        # while this process is alive. Write a temp batch file and spawn a
+        # new console window that waits for this process to exit first.
+        # A batch file avoids quoting issues with paths containing spaces.
+        with tempfile.NamedTemporaryFile(
+            mode="w", suffix=".bat", delete=False
+        ) as f:
+            f.write("@echo off\r\n")
+            f.write("timeout /t 1 /nobreak >nul\r\n")
+            f.write(f'"{pipx}" install --force "{spec}"\r\n')
+            f.write('del "%~f0"\r\n')
+            bat_path = f.name
+        subprocess.Popen(
+            ["cmd", "/k", bat_path],
+            creationflags=subprocess.CREATE_NEW_CONSOLE,
+        )
+        step_done(label)
+        logger.success("CAVE CLI update started in a new window.")
+        return
+
+    result = subprocess.run(
+        [pipx, "install", "--force", spec],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        text=True,
+    )
+    if result.returncode == 0:
+        step_done(label)
+        logger.success("CAVE CLI updated.")
+    else:
+        logger.error("Failed to update CAVE CLI.")
+        if result.stderr:
+            logger.error(result.stderr.strip())

{cave_cli-3.5.2 → cave_cli-3.5.4/cave_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cave_cli
-Version: 3.5.2
+Version: 3.5.4
 Summary: CLI for creating and managing Docker-based CAVE web applications.
 Author-email: MIT-CAVE <cave-contact@mit.edu>
 License: Apache-2.0

{cave_cli-3.5.2 → cave_cli-3.5.4}/pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cave_cli"
-version = "3.5.2"
+version = "3.5.4"
 description = "CLI for creating and managing Docker-based CAVE web applications."
 authors = [
     {name = "MIT-CAVE", email = "cave-contact@mit.edu"}

cave_cli-3.5.2/cave_cli/commands/update.py

@@ -1,57 +0,0 @@
-import argparse
-import shutil
-import subprocess
-import sys
-
-from cave_cli.utils.display import step_done, step_start
-from cave_cli.utils.logger import logger
-
-PIPX_DOCS_URL = "https://pipx.pypa.io/stable/installation/"
-
-
-def update(args: argparse.Namespace) -> None:
-    """
-    Usage:
-
-    - Updates the CAVE CLI via pipx.
-
-    Notes:
-
-    - Without ``--version``, runs ``pipx upgrade cave_cli``.
-    - With ``--version``, reinstalls via ``pipx install --force`` from the
-      specified git tag or branch.
-    """
-    pipx = shutil.which("pipx")
-    if not pipx:
-        logger.error(
-            "pipx not found. Please install pipx and reinstall cave_cli."
-        )
-        logger.error(f"See: {PIPX_DOCS_URL}")
-        sys.exit(1)
-
-    version = getattr(args, "version", None)
-    if version:
-        spec = (
-            f"cave_cli @ "
-            f"git+https://github.com/MIT-CAVE/cave_cli.git@{version}"
-        )
-        cmd = [pipx, "install", "--force", spec]
-        label = f"Reinstalling CAVE CLI ({version})"
-    else:
-        cmd = [pipx, "upgrade", "cave_cli"]
-        label = "Updating CAVE CLI"
-
-    step_start(label)
-    result = subprocess.run(
-        cmd,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        text=True,
-    )
-    if result.returncode == 0:
-        step_done(label)
-        logger.success("CAVE CLI updated.")
-    else:
-        logger.error("Failed to update CAVE CLI.")
-        if result.stderr:
-            logger.error(result.stderr.strip())