assertion-cli 0.5.18__tar.gz → 0.5.19__tar.gz

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertion-cli
-Version: 0.5.18
+Version: 0.5.19
 Summary: CLI for the Assertion API
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
@@ -74,8 +74,7 @@ shows which token is in effect.
 Token resolution at call time, in order:
 
 1. the token in `repo_index` for the current repo's GitHub `owner/repo`;
-2. a legacy entry for the current repo path in `~/.assertion/credentials.json`;
-3. the `ASSERTION_API_TOKEN` environment variable (a backup for CI, or repos
+2. the `ASSERTION_API_TOKEN` environment variable (a backup for CI, or repos
    with no remote that `asrt login` won't store);
 
 with a clear "run `asrt login`" error when neither is present. The API base URL

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/README.md

@@ -61,8 +61,7 @@ shows which token is in effect.
 Token resolution at call time, in order:
 
 1. the token in `repo_index` for the current repo's GitHub `owner/repo`;
-2. a legacy entry for the current repo path in `~/.assertion/credentials.json`;
-3. the `ASSERTION_API_TOKEN` environment variable (a backup for CI, or repos
+2. the `ASSERTION_API_TOKEN` environment variable (a backup for CI, or repos
    with no remote that `asrt login` won't store);
 
 with a clear "run `asrt login`" error when neither is present. The API base URL

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/api.py

@@ -35,9 +35,9 @@ def _base_url() -> str:
 def _resolve_token() -> str | None:
     """Token for the current repo, else the shell env-var backup, else None.
 
-    Stored credentials are primarily keyed by the current repo's GitHub
-    ``owner/repo`` identity, with the legacy exact git-root path as fallback. A
-    real `export ASSERTION_API_TOKEN` only fills in when no stored entry matches.
+    Stored credentials are keyed by the current repo's GitHub ``owner/repo``
+    identity. A real `export ASSERTION_API_TOKEN` only fills in when no stored
+    entry matches.
     """
     repo_root = find_git_root_or_none(Path.cwd())
     repo_full_name = (

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/assertion_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assertion-cli
-Version: 0.5.18
+Version: 0.5.19
 Summary: CLI for the Assertion API
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
@@ -74,8 +74,7 @@ shows which token is in effect.
 Token resolution at call time, in order:
 
 1. the token in `repo_index` for the current repo's GitHub `owner/repo`;
-2. a legacy entry for the current repo path in `~/.assertion/credentials.json`;
-3. the `ASSERTION_API_TOKEN` environment variable (a backup for CI, or repos
+2. the `ASSERTION_API_TOKEN` environment variable (a backup for CI, or repos
    with no remote that `asrt login` won't store);
 
 with a clear "run `asrt login`" error when neither is present. The API base URL

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/credentials.py

@@ -10,14 +10,10 @@ points at a connected repo:
       "repo_index": {"acme/mvp": "alk_..."}
     }
 
-The legacy v1 ``repos`` path map is still read as a fallback:
-
-    {"version": 1, "repos": {"/abs/path/to/repo": "alk_..."}}
-
 This module is deliberately git-free and pure stdlib — callers pass in the repo
-root / repo full name (resolved via ``git.py``) and handle their own error
-reporting. Token resolution precedence (repo entry first, then the env-var
-backup) lives in ``api.py``; this module only owns on-disk reads and writes.
+full name (resolved via ``git.py``) and handle their own error reporting. Token
+resolution precedence (repo entry first, then the env-var backup) lives in
+``api.py``; this module only owns on-disk reads and writes.
 """
 
 from __future__ import annotations
@@ -46,7 +42,6 @@ def _empty_store() -> dict:
         "version": CREDENTIALS_VERSION,
         "tokens": {},
         "repo_index": {},
-        "repos": {},
     }
 
 
@@ -70,16 +65,10 @@ def load_store() -> dict:
         data["tokens"] = {}
     if not isinstance(data.get("repo_index"), dict):
         data["repo_index"] = _repo_index_from_tokens(data["tokens"])
-    if not isinstance(data.get("repos"), dict):
-        data["repos"] = {}
+    data.pop("repos", None)
     return data
 
 
-def _repo_key(repo_root: Path) -> str:
-    """Canonical store key for a repo root (absolute, symlinks resolved)."""
-    return str(repo_root.resolve())
-
-
 def _repo_name_key(repo_full_name: str) -> str:
     return repo_full_name.strip().lower()
 
@@ -124,14 +113,11 @@ def _write_store(store: dict) -> Path:
     return path
 
 
-def save_token(
-    token: str, *, repo_root: Path, repo_full_names: list[str] | None = None
-) -> Path:
+def save_token(token: str, *, repo_full_names: list[str] | None = None) -> Path:
     """Persist ``token`` and return the credentials file path.
 
     ``repo_full_names`` are canonical GitHub ``owner/repo`` names visible to the
-    token. The legacy path entry is still written so older CLIs can read the
-    file during a rolling upgrade.
+    token.
     """
     store = load_store()
     if repo_full_names is not None:
@@ -159,20 +145,17 @@ def save_token(
         store["tokens"][token] = normalized
         for repo in normalized:
             repo_index[repo] = token
-    store["repos"][_repo_key(repo_root)] = token
     return _write_store(store)
 
 
-def remove_token(*, repo_root: Path, repo_full_name: str | None = None) -> bool:
+def remove_token(*, repo_full_name: str | None = None) -> bool:
     """Delete this repo's saved credential. Return ``True`` if one was removed."""
     store = load_store()
-    key = _repo_key(repo_root)
-    token = store["repos"].pop(key, None)
-    removed = token is not None
+    removed = False
     if repo_full_name is not None:
         repo_key = _repo_name_key(repo_full_name)
         indexed_token = store["repo_index"].pop(repo_key, None)
-        target_token = token or indexed_token
+        target_token = indexed_token
         for saved_token, repos in list(store["tokens"].items()):
             if target_token is not None and saved_token != target_token:
                 continue
@@ -192,23 +175,6 @@ def remove_token(*, repo_root: Path, repo_full_name: str | None = None) -> bool:
             if saved_token == target_token:
                 break
         removed = removed or indexed_token is not None
-    if token:
-        repo_refs = 0
-        for saved in store["repos"].values():
-            if saved == token:
-                repo_refs += 1
-        indexed_refs = [
-            indexed_token
-            for indexed_token in store["repo_index"].values()
-            if indexed_token == token
-        ]
-        if (
-            repo_refs == 0
-            and not indexed_refs
-            and token in store["tokens"]
-            and repo_full_name is None
-        ):
-            del store["tokens"][token]
     if removed:
         _write_store(store)
     return removed
@@ -219,8 +185,8 @@ def resolve_token(
 ) -> str | None:
     """Return the stored token for ``repo_full_name`` / ``repo_root``.
 
-    Repo-name matching is primary and survives reclones/moved folders. The
-    legacy exact path match is retained so existing credentials keep working.
+    Repo-name matching survives reclones/moved folders because it uses the
+    checkout's GitHub ``owner/repo`` identity instead of the local path.
     """
     store = load_store()
     if repo_full_name is not None:
@@ -228,10 +194,7 @@ def resolve_token(
         token = store["repo_index"].get(local)
         if token:
             return token
-    if repo_root is None:
-        return None
-    token = store["repos"].get(_repo_key(repo_root))
-    return token or None
+    return None
 
 
 def describe_source(
@@ -246,8 +209,6 @@ def describe_source(
         and resolve_token(repo_root, repo_full_name) is not None
     ):
         return f"the saved token for {repo_full_name.strip().lower()}"
-    if repo_root is not None and resolve_token(repo_root) is not None:
-        return f"the saved token for {_repo_key(repo_root)}"
     if (os.environ.get(API_TOKEN_ENV) or "").strip():
         return f"the {API_TOKEN_ENV} environment variable"
     return None

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/main.py

@@ -174,9 +174,7 @@ def login(
             "the dashboard, then re-run `asrt login`."
         )
 
-    path = save_token(
-        token, repo_root=repo_root, repo_full_names=[s.repo for s in stack_list]
-    )
+    path = save_token(token, repo_full_names=[s.repo for s in stack_list])
     names = ", ".join(f"'{s.name}'" for s in matched)
     typer.echo(f"✓ {local} is connected to stack(s): {names}")
     typer.echo(f"Saved token for {repo_root} to {path}")
@@ -190,7 +188,7 @@ def logout() -> None:
         exit_with_error("Not inside a git repository.")
 
     local = current_repo_full_name(repo_root)
-    if remove_token(repo_root=repo_root, repo_full_name=local):
+    if remove_token(repo_full_name=local):
         typer.echo(f"Removed saved token for {repo_root}.")
     else:
         typer.echo(f"No saved token for {repo_root}.")

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "assertion-cli"
-version = "0.5.18"
+version = "0.5.19"
 description = "CLI for the Assertion API"
 readme = "README.md"
 requires-python = ">=3.13"

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/tests/test_auth.py

@@ -52,7 +52,7 @@ def test_login_saves_when_repo_matches_stack(repo: Path) -> None:
     assert result.exit_code == 0, result.output
     assert "connected to stack" in result.output.lower()
     assert route.called
-    assert credentials.resolve_token(repo) == "alk_new"
+    assert credentials.resolve_token(repo, "acme/mvp") == "alk_new"
     assert credentials.resolve_token(None, "acme/mvp") == "alk_new"
     assert credentials.resolve_token(None, "acme/docs") == "alk_new"
 
@@ -96,7 +96,7 @@ def test_login_no_remote_does_not_save_or_call_network(
 
 
 def test_logout_removes_token(repo: Path) -> None:
-    credentials.save_token("alk_new", repo_root=repo)
+    credentials.save_token("alk_new", repo_full_names=["acme/mvp"])
 
     result = runner.invoke(main.app, ["logout"])
 
@@ -114,7 +114,7 @@ def test_logout_when_nothing_saved(repo: Path) -> None:
 
 @respx.mock
 def test_whoami_reports_saved_token(repo: Path) -> None:
-    credentials.save_token("alk_new", repo_root=repo)
+    credentials.save_token("alk_new", repo_full_names=["acme/mvp"])
     respx.get(STACKS_URL).mock(return_value=_stacks_response("acme/mvp", "acme/other"))
 
     result = runner.invoke(main.app, ["whoami"])

{assertion_cli-0.5.18 → assertion_cli-0.5.19}/tests/test_credentials.py

@@ -26,14 +26,12 @@ def repo(tmp_path: Path) -> Path:
 
 
 def test_save_and_resolve_round_trip(repo: Path) -> None:
-    credentials.save_token(
-        "alk_one", repo_root=repo, repo_full_names=["acme/mvp", "Acme/Docs"]
-    )
+    credentials.save_token("alk_one", repo_full_names=["acme/mvp", "Acme/Docs"])
     assert credentials.resolve_token(repo, "ACME/MVP") == "alk_one"
 
 
 def test_resolve_unknown_repo_returns_none(repo: Path, tmp_path: Path) -> None:
-    credentials.save_token("alk_one", repo_root=repo, repo_full_names=["acme/mvp"])
+    credentials.save_token("alk_one", repo_full_names=["acme/mvp"])
     other = tmp_path / "other"
     other.mkdir()
     assert credentials.resolve_token(other) is None
@@ -44,28 +42,25 @@ def test_resolve_none_repo_root() -> None:
 
 
 def test_save_writes_file_mode_0600(repo: Path) -> None:
-    path = credentials.save_token("alk_one", repo_root=repo)
+    path = credentials.save_token("alk_one")
     mode = stat.S_IMODE(path.stat().st_mode)
     assert mode == 0o600
 
 
 def test_store_shape(repo: Path) -> None:
-    path = credentials.save_token(
-        "alk_one", repo_root=repo, repo_full_names=["Acme/MVP", "acme/mvp"]
-    )
+    path = credentials.save_token("alk_one", repo_full_names=["Acme/MVP", "acme/mvp"])
     data = json.loads(path.read_text())
     assert data["version"] == credentials.CREDENTIALS_VERSION
     assert data["tokens"]["alk_one"] == ["acme/mvp"]
     assert data["repo_index"]["acme/mvp"] == "alk_one"
-    assert data["repos"][str(repo.resolve())] == "alk_one"
+    assert "repos" not in data
 
 
 def test_save_is_idempotent_overwrite(repo: Path) -> None:
-    credentials.save_token("alk_one", repo_root=repo, repo_full_names=["acme/mvp"])
-    credentials.save_token("alk_two", repo_root=repo, repo_full_names=["acme/mvp"])
+    credentials.save_token("alk_one", repo_full_names=["acme/mvp"])
+    credentials.save_token("alk_two", repo_full_names=["acme/mvp"])
     assert credentials.resolve_token(repo, "acme/mvp") == "alk_two"
     store = credentials.load_store()
-    assert len(store["repos"]) == 1
     assert len(store["tokens"]) == 1
     assert store["repo_index"] == {"acme/mvp": "alk_two"}
 
@@ -74,8 +69,8 @@ def test_distinct_repos_get_distinct_entries(tmp_path: Path) -> None:
     a, b = tmp_path / "a", tmp_path / "b"
     a.mkdir()
     b.mkdir()
-    credentials.save_token("alk_a", repo_root=a, repo_full_names=["acme/a"])
-    credentials.save_token("alk_b", repo_root=b, repo_full_names=["acme/b"])
+    credentials.save_token("alk_a", repo_full_names=["acme/a"])
+    credentials.save_token("alk_b", repo_full_names=["acme/b"])
     assert credentials.resolve_token(a, "acme/a") == "alk_a"
     assert credentials.resolve_token(b, "acme/b") == "alk_b"
 
@@ -85,7 +80,6 @@ def test_load_store_missing_file_is_empty() -> None:
         "version": credentials.CREDENTIALS_VERSION,
         "tokens": {},
         "repo_index": {},
-        "repos": {},
     }
 
 
@@ -97,20 +91,19 @@ def test_load_store_tolerates_corrupt_file(_isolate_home: Path) -> None:
         "version": credentials.CREDENTIALS_VERSION,
         "tokens": {},
         "repo_index": {},
-        "repos": {},
     }
 
 
 def test_remove_token(repo: Path) -> None:
-    credentials.save_token("alk_one", repo_root=repo, repo_full_names=["acme/mvp"])
-    assert credentials.remove_token(repo_root=repo, repo_full_name="acme/mvp") is True
+    credentials.save_token("alk_one", repo_full_names=["acme/mvp"])
+    assert credentials.remove_token(repo_full_name="acme/mvp") is True
     assert credentials.resolve_token(repo, "acme/mvp") is None
     # Removing again is a no-op.
-    assert credentials.remove_token(repo_root=repo) is False
+    assert credentials.remove_token() is False
 
 
 def test_describe_source_repo_entry(repo: Path) -> None:
-    credentials.save_token("alk_one", repo_root=repo, repo_full_names=["acme/mvp"])
+    credentials.save_token("alk_one", repo_full_names=["acme/mvp"])
     assert credentials.describe_source(repo, "acme/mvp") == (
         "the saved token for acme/mvp"
     )
@@ -128,15 +121,17 @@ def test_describe_source_repo_entry_wins_over_env(
     repo: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
     monkeypatch.setenv(credentials.API_TOKEN_ENV, "alk_env")
-    credentials.save_token("alk_one", repo_root=repo)
-    assert credentials.describe_source(repo) == f"the saved token for {repo.resolve()}"
+    credentials.save_token("alk_one", repo_full_names=["acme/mvp"])
+    assert credentials.describe_source(repo, "acme/mvp") == (
+        "the saved token for acme/mvp"
+    )
 
 
 def test_describe_source_none(repo: Path) -> None:
     assert credentials.describe_source(repo) is None
 
 
-def test_resolve_legacy_path_store(repo: Path) -> None:
+def test_load_store_drops_legacy_path_store(repo: Path) -> None:
     path = credentials.credentials_path()
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_text(
@@ -144,7 +139,9 @@ def test_resolve_legacy_path_store(repo: Path) -> None:
         encoding="utf-8",
     )
 
-    assert credentials.resolve_token(repo, "acme/mvp") == "alk_old"
+    store = credentials.load_store()
+    assert "repos" not in store
+    assert credentials.resolve_token(repo, "acme/mvp") is None
 
 
 def test_load_store_builds_repo_index_from_token_only_v2_store() -> None:
@@ -162,26 +159,26 @@ def test_load_store_builds_repo_index_from_token_only_v2_store() -> None:
 def test_resolve_repo_name_after_reclone(repo: Path, tmp_path: Path) -> None:
     moved = tmp_path / "moved"
     moved.mkdir()
-    credentials.save_token("alk_one", repo_root=repo, repo_full_names=["acme/mvp"])
+    credentials.save_token("alk_one", repo_full_names=["acme/mvp"])
 
     assert credentials.resolve_token(moved, "acme/mvp") == "alk_one"
 
 
 def test_remove_token_keeps_other_repo_names(repo: Path) -> None:
     credentials.save_token(
-        "alk_one", repo_root=repo, repo_full_names=["acme/mvp", "acme/docs"]
+        "alk_one", repo_full_names=["acme/mvp", "acme/docs"]
     )
 
-    assert credentials.remove_token(repo_root=repo, repo_full_name="acme/mvp") is True
+    assert credentials.remove_token(repo_full_name="acme/mvp") is True
     assert credentials.resolve_token(None, "acme/mvp") is None
     assert credentials.resolve_token(None, "acme/docs") == "alk_one"
 
 
 def test_resaving_same_token_removes_stale_repo_index_entries(repo: Path) -> None:
     credentials.save_token(
-        "alk_one", repo_root=repo, repo_full_names=["acme/mvp", "acme/docs"]
+        "alk_one", repo_full_names=["acme/mvp", "acme/docs"]
     )
-    credentials.save_token("alk_one", repo_root=repo, repo_full_names=["acme/mvp"])
+    credentials.save_token("alk_one", repo_full_names=["acme/mvp"])
 
     store = credentials.load_store()
     assert store["tokens"]["alk_one"] == ["acme/mvp"]