beakr-cli 0.3.1__tar.gz → 0.3.2__tar.gz

{beakr_cli-0.3.1 → beakr_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: beakr-cli
-Version: 0.3.1
+Version: 0.3.2
 Summary: CLI and MCP server for Beakr's knowledge base
 Project-URL: Homepage, https://thebeakr.com
 Project-URL: Repository, https://github.com/BeakrHub/beakr-cli

{beakr_cli-0.3.1 → beakr_cli-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "beakr-cli"
-version = "0.3.1"
+version = "0.3.2"
 description = "CLI and MCP server for Beakr's knowledge base"
 readme = "README.md"
 license = "MIT"

{beakr_cli-0.3.1 → beakr_cli-0.3.2}/src/beakr_cli/__init__.py

@@ -1,3 +1,3 @@
 """Beakr CLI -- command-line and MCP server for Beakr's knowledge base."""
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"

{beakr_cli-0.3.1 → beakr_cli-0.3.2}/src/beakr_cli/updates.py

@@ -15,6 +15,7 @@ from __future__ import annotations
 
 import json
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -164,30 +165,40 @@ def _uv_tool_dir() -> Path:
     return base / "uv" / "tools"
 
 
-def _receipt_is_local_source(receipt: Path) -> bool:
-    """True when the uv tool was installed from a directory, path, or git checkout.
+#: The ``{ name = "beakr-cli", ... }`` inline table in a uv tool receipt's
+#: ``requirements``. Parsed from the requirement entry alone: the receipt also
+#: carries ``entrypoints`` with ``install-path = ...``, and matching keys against
+#: the whole file made every uv tool install look like a local checkout.
+_RECEIPT_REQUIREMENT = re.compile(r'\{\s*name\s*=\s*"' + re.escape(PACKAGE_NAME) + r'"([^}]*)\}')
+_SOURCE_KEYS = re.compile(r"(?<![\w-])(directory|path|git|url|editable)\s*=")
+_PINNED_SPECIFIER = re.compile(r'(?<![\w-])specifier\s*=\s*"\s*==')
+
+
+def _receipt_requirement(receipt: Path) -> str | None:
+    """The body of this package's requirement entry in a uv receipt, if readable."""
+    try:
+        match = _RECEIPT_REQUIREMENT.search(receipt.read_text())
+    except OSError:
+        return None
+    return match.group(1) if match else None
+
+
+def _receipt_is_local_source(requirement: str) -> bool:
+    """True when the uv tool was installed from a directory, path, URL, or git.
 
     Upgrading such an install from PyPI would silently swap a developer's local
     build for the release, so it is reported rather than done.
     """
-    try:
-        text = receipt.read_text()
-    except OSError:
-        return False
-    return any(marker in text for marker in ("directory =", "path =", "git ="))
+    return _SOURCE_KEYS.search(requirement) is not None
 
 
-def _receipt_pins_version(receipt: Path) -> bool:
+def _receipt_pins_version(requirement: str) -> bool:
     """True when the uv tool was installed as ``beakr-cli==X``.
 
     ``uv tool upgrade`` honours the pin and does nothing, so offering it would
     report an upgrade that never happens.
     """
-    try:
-        text = receipt.read_text()
-    except OSError:
-        return False
-    return f'name = "{PACKAGE_NAME}", specifier = "==' in text
+    return _PINNED_SPECIFIER.search(requirement) is not None
 
 
 def detect_install(prefix: Path | None = None) -> InstallInfo:
@@ -200,8 +211,8 @@ def detect_install(prefix: Path | None = None) -> InstallInfo:
     except OSError:
         in_uv_tools = False
     if in_uv_tools or ("uv" in parts and "tools" in parts):
-        receipt = env / "uv-receipt.toml"
-        if _receipt_is_local_source(receipt):
+        requirement = _receipt_requirement(env / "uv-receipt.toml") or ""
+        if _receipt_is_local_source(requirement):
             return InstallInfo(
                 InstallMethod.uv_tool_source,
                 None,
@@ -209,7 +220,7 @@ def detect_install(prefix: Path | None = None) -> InstallInfo:
                 "`uv tool install --force <checkout>`, or switch to the published "
                 f"release with `uv tool install --force {PACKAGE_NAME}`.",
             )
-        if _receipt_pins_version(receipt):
+        if _receipt_pins_version(requirement):
             return InstallInfo(
                 InstallMethod.uv_tool_pinned,
                 None,

{beakr_cli-0.3.1 → beakr_cli-0.3.2}/tests/test_updates.py

@@ -137,14 +137,39 @@ def test_running_ahead_of_pypi_is_not_an_update() -> None:
 # Install detection
 # ---------------------------------------------------------------------------
 
+#: Receipts exactly as uv 0.11 writes them. The entrypoints block matters: its
+#: ``install-path = ...`` made every PyPI install look like a local checkout when
+#: detection searched the whole file for ``path =``, so `beakr update` refused to
+#: upgrade any uv tool install in 0.3.0 and 0.3.1.
+_ENTRYPOINTS = """entrypoints = [
+    { name = "beakr", install-path = "/Users/u/.local/bin/beakr", from = "beakr-cli" },
+]
+"""
+PYPI_RECEIPT = '[tool]\nrequirements = [{ name = "beakr-cli" }]\n' + _ENTRYPOINTS
+PINNED_RECEIPT = (
+    '[tool]\nrequirements = [{ name = "beakr-cli", specifier = "==0.3.0" }]\n' + _ENTRYPOINTS
+)
+RANGE_RECEIPT = (
+    '[tool]\nrequirements = [{ name = "beakr-cli", specifier = ">=0.3" }]\n' + _ENTRYPOINTS
+)
+SOURCE_RECEIPT = (
+    '[tool]\nrequirements = [{ name = "beakr-cli", directory = "/src/beakr-cli" }]\n'
+    'constraints = [{ name = "mcp", specifier = "<2" }]\n' + _ENTRYPOINTS
+)
+
 
-def test_detects_pypi_uv_tool_install(tmp_path, monkeypatch) -> None:
+def _uv_tool_env(tmp_path, monkeypatch, receipt: str) -> Path:
     tools = tmp_path / "uv" / "tools"
     env = tools / "beakr-cli"
     env.mkdir(parents=True)
-    (env / "uv-receipt.toml").write_text('[tool]\nrequirements = [{ name = "beakr-cli" }]\n')
+    (env / "uv-receipt.toml").write_text(receipt)
     monkeypatch.setenv("UV_TOOL_DIR", str(tools))
-    info = updates.detect_install(env)
+    return env
+
+
+@pytest.mark.parametrize("receipt", [PYPI_RECEIPT, RANGE_RECEIPT])
+def test_detects_pypi_uv_tool_install(receipt, tmp_path, monkeypatch) -> None:
+    info = updates.detect_install(_uv_tool_env(tmp_path, monkeypatch, receipt))
     assert info.method is updates.InstallMethod.uv_tool
     # --reinstall-package implies a refresh of the cached index; without one an
     # upgrade shortly after a release resolved the old version and still exited 0.
@@ -155,14 +180,7 @@ def test_detects_pypi_uv_tool_install(tmp_path, monkeypatch) -> None:
 
 def test_version_pinned_uv_tool_is_reported_not_upgraded(tmp_path, monkeypatch) -> None:
     """`uv tool upgrade` keeps a `==X` pin, so running it would upgrade nothing."""
-    tools = tmp_path / "uv" / "tools"
-    env = tools / "beakr-cli"
-    env.mkdir(parents=True)
-    (env / "uv-receipt.toml").write_text(
-        '[tool]\nrequirements = [{ name = "beakr-cli", specifier = "==0.3.0" }]\n'
-    )
-    monkeypatch.setenv("UV_TOOL_DIR", str(tools))
-    info = updates.detect_install(env)
+    info = updates.detect_install(_uv_tool_env(tmp_path, monkeypatch, PINNED_RECEIPT))
     assert info.method is updates.InstallMethod.uv_tool_pinned
     assert info.upgrade_command is None
     assert "uv tool install --force beakr-cli" in info.instructions
@@ -170,14 +188,7 @@ def test_version_pinned_uv_tool_is_reported_not_upgraded(tmp_path, monkeypatch)
 
 def test_local_checkout_uv_tool_is_never_upgraded_from_pypi(tmp_path, monkeypatch) -> None:
     """A developer's local build must not be silently replaced by the release."""
-    tools = tmp_path / "uv" / "tools"
-    env = tools / "beakr-cli"
-    env.mkdir(parents=True)
-    (env / "uv-receipt.toml").write_text(
-        '[tool]\nrequirements = [{ name = "beakr-cli", directory = "/src/beakr-cli" }]\n'
-    )
-    monkeypatch.setenv("UV_TOOL_DIR", str(tools))
-    info = updates.detect_install(env)
+    info = updates.detect_install(_uv_tool_env(tmp_path, monkeypatch, SOURCE_RECEIPT))
     assert info.method is updates.InstallMethod.uv_tool_source
     assert info.upgrade_command is None
 

{beakr_cli-0.3.1 → beakr_cli-0.3.2}/uv.lock

@@ -63,7 +63,7 @@ wheels = [
 
 [[package]]
 name = "beakr-cli"
-version = "0.3.1"
+version = "0.3.2"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },