google-analytics-cli 0.1.4__tar.gz → 0.1.5__tar.gz

{google_analytics_cli-0.1.4 → google_analytics_cli-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-analytics-cli
-Version: 0.1.4
+Version: 0.1.5
 Summary: Command-line interface for Google Analytics 4
 Project-URL: Homepage, https://github.com/daidalytics/google-analytics-cli
 Project-URL: Repository, https://github.com/daidalytics/google-analytics-cli

{google_analytics_cli-0.1.4 → google_analytics_cli-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "google-analytics-cli"
-version = "0.1.4"
+version = "0.1.5"
 description = "Command-line interface for Google Analytics 4"
 readme = "README.md"
 requires-python = ">=3.10"

{google_analytics_cli-0.1.4 → google_analytics_cli-0.1.5}/src/ga_cli/commands/upgrade_cmd.py

@@ -20,7 +20,7 @@ upgrade_app = typer.Typer(
     name="upgrade", help="Check for and install updates", invoke_without_command=True
 )
 
-PYPI_URL = "https://pypi.org/pypi/ga-cli/json"
+PYPI_URL = "https://pypi.org/pypi/google-analytics-cli/json"
 PYPI_TIMEOUT = 5
 UPDATE_CHECK_INTERVAL = 86400  # 24 hours in seconds
 
@@ -49,11 +49,13 @@ def _is_newer(latest: str, current: str) -> bool:
 def _detect_installer() -> list[str]:
     """Detect the best install command to upgrade ga-cli.
 
-    Checks for pipx first, then falls back to pip via the current interpreter.
+    Checks for uv first, then pipx, then falls back to pip.
     """
+    if shutil.which("uv"):
+        return ["uv", "pip", "install", "--upgrade", "google-analytics-cli"]
     if shutil.which("pipx"):
-        return ["pipx", "upgrade", "ga-cli"]
-    return [sys.executable, "-m", "pip", "install", "--upgrade", "ga-cli"]
+        return ["pipx", "upgrade", "google-analytics-cli"]
+    return [sys.executable, "-m", "pip", "install", "--upgrade", "google-analytics-cli"]
 
 
 @upgrade_app.callback(invoke_without_command=True)
@@ -78,11 +80,12 @@ def upgrade_cmd(
     if force:
         info(f"Force-reinstalling ga-cli {current}...")
         cmd = _detect_installer()
-        # Append --force-reinstall for pip-based installs
-        if cmd[0] != "pipx":
-            cmd.append("--force-reinstall")
+        if cmd[0] == "pipx":
+            cmd = ["pipx", "install", "--force", "google-analytics-cli"]
+        elif cmd[0] == "uv":
+            cmd.append("--reinstall")
         else:
-            cmd = ["pipx", "install", "--force", "ga-cli"]
+            cmd.append("--force-reinstall")
         result = subprocess.run(cmd, capture_output=True, text=True)
         if result.returncode == 0:
             success(f"Reinstalled ga-cli {current}.")

{google_analytics_cli-0.1.4 → google_analytics_cli-0.1.5}/tests/test_upgrade_cmd.py

@@ -110,7 +110,7 @@ class TestUpgradeRun:
             "ga_cli.commands.upgrade_cmd.subprocess.run"
         ) as mock_run, patch(
             "ga_cli.commands.upgrade_cmd._detect_installer",
-            return_value=["pip", "install", "--upgrade", "ga-cli"],
+            return_value=["pip", "install", "--upgrade", "google-analytics-cli"],
         ):
             mock_run.return_value = MagicMock(returncode=0)
             result = runner.invoke(app, ["upgrade"])
@@ -137,7 +137,7 @@ class TestUpgradeRun:
             "ga_cli.commands.upgrade_cmd.subprocess.run"
         ) as mock_run, patch(
             "ga_cli.commands.upgrade_cmd._detect_installer",
-            return_value=["pip", "install", "--upgrade", "ga-cli"],
+            return_value=["pip", "install", "--upgrade", "google-analytics-cli"],
         ):
             mock_run.return_value = MagicMock(returncode=0)
             result = runner.invoke(app, ["upgrade", "--force"])
@@ -152,7 +152,7 @@ class TestUpgradeRun:
             "ga_cli.commands.upgrade_cmd.subprocess.run"
         ) as mock_run, patch(
             "ga_cli.commands.upgrade_cmd._detect_installer",
-            return_value=["pip", "install", "--upgrade", "ga-cli"],
+            return_value=["pip", "install", "--upgrade", "google-analytics-cli"],
         ):
             mock_run.return_value = MagicMock(returncode=1, stderr="install error")
             result = runner.invoke(app, ["upgrade"])
@@ -160,12 +160,15 @@ class TestUpgradeRun:
         assert "Upgrade failed" in result.output
 
     def test_upgrade_detects_pipx(self):
+        def _which(name):
+            return "/usr/local/bin/pipx" if name == "pipx" else None
+
         with patch(
             "ga_cli.commands.upgrade_cmd._check_pypi_version", return_value="2.0.0"
         ), patch("ga_cli.commands.upgrade_cmd.__version__", "0.1.0"), patch(
             "ga_cli.commands.upgrade_cmd.subprocess.run"
         ) as mock_run, patch(
-            "ga_cli.commands.upgrade_cmd.shutil.which", return_value="/usr/local/bin/pipx"
+            "ga_cli.commands.upgrade_cmd.shutil.which", side_effect=_which
         ):
             mock_run.return_value = MagicMock(returncode=0)
             result = runner.invoke(app, ["upgrade"])
@@ -173,6 +176,46 @@ class TestUpgradeRun:
         cmd_args = mock_run.call_args[0][0]
         assert "pipx" in cmd_args
 
+    def test_upgrade_detects_uv(self):
+        def _which(name):
+            return "/usr/local/bin/uv" if name == "uv" else None
+
+        with patch(
+            "ga_cli.commands.upgrade_cmd._check_pypi_version", return_value="2.0.0"
+        ), patch("ga_cli.commands.upgrade_cmd.__version__", "0.1.0"), patch(
+            "ga_cli.commands.upgrade_cmd.subprocess.run"
+        ) as mock_run, patch(
+            "ga_cli.commands.upgrade_cmd.shutil.which", side_effect=_which
+        ):
+            mock_run.return_value = MagicMock(returncode=0)
+            result = runner.invoke(app, ["upgrade"])
+        assert result.exit_code == 0
+        cmd_args = mock_run.call_args[0][0]
+        assert "uv" in cmd_args
+
+    def test_upgrade_uv_preferred_over_pipx(self):
+        """When both uv and pipx are available, uv should be preferred."""
+        def _which(name):
+            if name == "uv":
+                return "/usr/local/bin/uv"
+            if name == "pipx":
+                return "/usr/local/bin/pipx"
+            return None
+
+        with patch(
+            "ga_cli.commands.upgrade_cmd._check_pypi_version", return_value="2.0.0"
+        ), patch("ga_cli.commands.upgrade_cmd.__version__", "0.1.0"), patch(
+            "ga_cli.commands.upgrade_cmd.subprocess.run"
+        ) as mock_run, patch(
+            "ga_cli.commands.upgrade_cmd.shutil.which", side_effect=_which
+        ):
+            mock_run.return_value = MagicMock(returncode=0)
+            result = runner.invoke(app, ["upgrade"])
+        assert result.exit_code == 0
+        cmd_args = mock_run.call_args[0][0]
+        assert "uv" in cmd_args
+        assert "pipx" not in cmd_args
+
 
 class TestDailyUpdateCheck:
     def test_skips_when_checked_recently(self, isolated_config_dir):

{google_analytics_cli-0.1.4 → google_analytics_cli-0.1.5}/uv.lock

@@ -306,7 +306,7 @@ wheels = [
 
 [[package]]
 name = "google-analytics-cli"
-version = "0.1.3"
+version = "0.1.4"
 source = { editable = "." }
 dependencies = [
     { name = "click" },