shotgun-sh 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

shotgun/utils/update_checker.py

@@ -249,6 +249,9 @@ def perform_update(force: bool = False) -> tuple[bool, str]:
     if not compare_versions(__version__, latest):
         return False, f"Already at latest version ({__version__})"
 
+    # Store current version for comparison
+    current_version = __version__
+
     # Detect installation method
     method = detect_installation_method()
     command = get_update_command(method)
@@ -260,8 +263,108 @@ def perform_update(force: bool = False) -> tuple[bool, str]:
 
         result = subprocess.run(command, capture_output=True, text=True, timeout=60)  # noqa: S603
 
-        if result.returncode == 0:
-            message = f"Successfully updated from {__version__} to {latest}"
+        # Log output for debugging
+        if result.stdout:
+            logger.debug(f"Update stdout: {result.stdout}")
+        if result.stderr:
+            logger.debug(f"Update stderr: {result.stderr}")
+        logger.debug(f"Update return code: {result.returncode}")
+
+        # Check for success patterns in output (pipx specific)
+        output_combined = (result.stdout or "") + (result.stderr or "")
+
+        # For pipx, check if it mentions successful upgrade or already at latest
+        pipx_success_patterns = [
+            "successfully upgraded",
+            "is already at latest version",
+            f"installed package shotgun-sh {latest}",
+            "upgrading shotgun-sh...",
+        ]
+
+        pipx_success = method == "pipx" and any(
+            pattern.lower() in output_combined.lower()
+            for pattern in pipx_success_patterns
+        )
+
+        # Verify actual installation by checking version
+        update_successful = False
+        if result.returncode == 0 or pipx_success:
+            # Give the system a moment to update the package metadata
+            import time
+
+            time.sleep(1)
+
+            # Try to verify the installed version
+            try:
+                # For pipx, we need to check differently
+                if method == "pipx":
+                    # Use pipx list to verify the installed version
+                    verify_result = subprocess.run(
+                        ["pipx", "list", "--json"],  # noqa: S607
+                        capture_output=True,
+                        text=True,
+                        timeout=5,  # noqa: S603
+                    )
+                    if verify_result.returncode == 0:
+                        try:
+                            pipx_data = json.loads(verify_result.stdout)
+                            venvs = pipx_data.get("venvs", {})
+                            shotgun_info = venvs.get("shotgun-sh", {})
+                            metadata = shotgun_info.get("metadata", {})
+                            main_package = metadata.get("main_package", {})
+                            installed_version = main_package.get("package_version", "")
+                            if installed_version == latest:
+                                update_successful = True
+                                logger.debug(
+                                    f"Pipx verification successful: version {installed_version}"
+                                )
+                        except (json.JSONDecodeError, KeyError) as e:
+                            logger.debug(
+                                f"Pipx JSON parsing failed: {e}, trusting patterns"
+                            )
+                            update_successful = pipx_success
+                    else:
+                        # Fallback to checking with command
+                        import shutil
+
+                        shotgun_path = shutil.which("shotgun")
+                        if shotgun_path:
+                            verify_result = subprocess.run(  # noqa: S603
+                                [shotgun_path, "--version"],
+                                capture_output=True,
+                                text=True,
+                                timeout=5,
+                            )
+                            if (
+                                verify_result.returncode == 0
+                                and latest in verify_result.stdout
+                            ):
+                                update_successful = True
+                                logger.debug(
+                                    f"Version verification successful: {verify_result.stdout.strip()}"
+                                )
+                        else:
+                            update_successful = pipx_success
+                else:
+                    # For pip/venv, check with python module
+                    verify_result = subprocess.run(  # noqa: S603
+                        [sys.executable, "-m", "shotgun", "--version"],
+                        capture_output=True,
+                        text=True,
+                        timeout=5,
+                    )
+                    if verify_result.returncode == 0 and latest in verify_result.stdout:
+                        update_successful = True
+                        logger.debug(
+                            f"Version verification successful: {verify_result.stdout.strip()}"
+                        )
+            except Exception as e:
+                logger.debug(f"Version verification failed: {e}")
+                # If verification fails, trust the return code or pipx patterns
+                update_successful = result.returncode == 0 or pipx_success
+
+        if update_successful:
+            message = f"Successfully updated from {current_version} to {latest}"
             logger.info(message)
 
             # Clear cache to trigger fresh check next time

{shotgun_sh-0.1.3.dist-info → shotgun_sh-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.1.3
+Version: 0.1.5
 Summary: AI-powered research, planning, and task management CLI tool
 Project-URL: Homepage, https://shotgun.sh/
 Project-URL: Repository, https://github.com/shotgun-sh/shotgun

{shotgun_sh-0.1.3.dist-info → shotgun_sh-0.1.5.dist-info}/RECORD

@@ -122,9 +122,9 @@ shotgun/tui/utils/mode_progress.py,sha256=lseRRo7kMWLkBzI3cU5vqJmS2ZcCjyRYf9Zwtv
 shotgun/utils/__init__.py,sha256=WinIEp9oL2iMrWaDkXz2QX4nYVPAm8C9aBSKTeEwLtE,198
 shotgun/utils/env_utils.py,sha256=8QK5aw_f_V2AVTleQQlcL0RnD4sPJWXlDG46fsHu0d8,1057
 shotgun/utils/file_system_utils.py,sha256=l-0p1bEHF34OU19MahnRFdClHufThfGAjQ431teAIp0,1004
-shotgun/utils/update_checker.py,sha256=Q3va_lsDTWtIS7B_8RQh7bjrWlLt7pzDR_AR-4aAKnc,18522
-shotgun_sh-0.1.3.dist-info/METADATA,sha256=hDNmyhwY-wCZnGaZgSIXibqfpbjCHNXnpiCW4VcQVd8,11191
-shotgun_sh-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.1.3.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.1.3.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.1.3.dist-info/RECORD,,
+shotgun/utils/update_checker.py,sha256=LPRzHyhjxxB8KE_EWVu9k2GobhB7DMh8EipbKT9NxVQ,23310
+shotgun_sh-0.1.5.dist-info/METADATA,sha256=-hkPsG_SzDWh6UKYw5oUxn-9Yf_zCjT_n4vQ1gxp7uM,11191
+shotgun_sh-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.1.5.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.1.5.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.1.5.dist-info/RECORD,,