blog-cli 0.4.2__tar.gz → 0.4.4__tar.gz

{blog_cli-0.4.2 → blog_cli-0.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blog-cli
-Version: 0.4.2
+Version: 0.4.4
 Summary: Agent-friendly CLI for managing a personal site. Articles, projects, services, media, and a bundled ChatGPT/Codex skill.
 Author: tanaka-mambinge
 License: MIT

{blog_cli-0.4.2 → blog_cli-0.4.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "blog-cli"
-version = "0.4.2"
+version = "0.4.4"
 description = "Agent-friendly CLI for managing a personal site. Articles, projects, services, media, and a bundled ChatGPT/Codex skill."
 readme = "README.md"
 requires-python = ">=3.13"

{blog_cli-0.4.2 → blog_cli-0.4.4}/src/blog_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blog-cli
-Version: 0.4.2
+Version: 0.4.4
 Summary: Agent-friendly CLI for managing a personal site. Articles, projects, services, media, and a bundled ChatGPT/Codex skill.
 Author: tanaka-mambinge
 License: MIT

{blog_cli-0.4.2 → blog_cli-0.4.4}/src/personal_cli/cli.py

@@ -13,7 +13,7 @@ from personal_cli.credentials import (
     CredentialStore,
     MissingCredentialError,
 )
-from personal_cli.formatting import emit_result, read_markdown_from_source
+from personal_cli.formatting import emit_error, emit_result, read_markdown_from_source
 from personal_cli.setup_server import run_setup
 
 app = typer.Typer(help="Agent-facing article CLI.")
@@ -73,7 +73,7 @@ def _with_article_url(article: dict) -> dict:
 
 
 def _service_url(service: dict) -> str:
-    return f"{_site_url()}/services/{service['slug']}"
+    return f"{_site_url()}/services?service={service['slug']}"
 
 
 def _with_service_url(service: dict) -> dict:
@@ -127,26 +127,43 @@ def run(coro):
     return asyncio.run(coro)
 
 
-def _run(operation: Callable[[], Result]) -> Result:
-    """Run an operation, opening the setup page when credentials are missing/rejected."""
-    while True:
-        try:
-            return operation()
-        except MissingCredentialError:
-            run_setup(
-                CredentialStore(),
-                output=_emit,
-                prompt="Credentials are missing. Open this link in your browser",
-            )
-        except CLIError as exc:
-            if exc.status_code not in (401, 403):
-                raise
-            _emit("The server rejected the stored API key. Re-enter it in the setup page.")
-            run_setup(
-                CredentialStore(),
-                output=_emit,
-                prompt="Enter replacement credentials in your browser",
-            )
+_SETUP_COMMAND = "blog-cli keys setup"
+_AUTH_MESSAGE = (
+    "Authentication required. Run `blog-cli keys setup` in an attached process. "
+    "Keep it running while the user enters and validates credentials in the browser, "
+    "then rerun the original command."
+)
+
+
+def _run(operation: Callable[[], Result], *, json_output: bool = False) -> Result:
+    """Run an operation and return machine-readable auth failures."""
+    try:
+        return operation()
+    except MissingCredentialError as exc:
+        emit_error(
+            "authentication_required",
+            _AUTH_MESSAGE,
+            json_output=True,
+            setup_command=_SETUP_COMMAND,
+        )
+        raise typer.Exit(code=2) from exc
+    except CredentialError as exc:
+        emit_error(
+            "credential_store_unavailable",
+            str(exc),
+            json_output=True,
+        )
+        raise typer.Exit(code=2) from exc
+    except CLIError as exc:
+        if exc.status_code not in (401, 403):
+            raise
+        emit_error(
+            "authentication_required",
+            "The stored API key was rejected. Run `blog-cli keys setup`, keep it attached until setup succeeds, then rerun the original command.",
+            json_output=True,
+            setup_command=_SETUP_COMMAND,
+        )
+        raise typer.Exit(code=2) from exc
 
 
 @article_app.command("list")
@@ -165,7 +182,7 @@ def article_list(
         emit_result(articles, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -185,7 +202,7 @@ def article_show(
         emit_result(article, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -224,7 +241,7 @@ def blog_create(
         emit_result(article, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -266,7 +283,7 @@ def project_create(
         emit_result(article, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -330,7 +347,7 @@ def article_update(
         emit_result(article, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -351,7 +368,7 @@ def article_publish(
         emit_result(article, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -370,7 +387,7 @@ def article_delete(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -390,7 +407,7 @@ def article_unarchive(
         emit_result(article, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -413,7 +430,7 @@ def article_preview(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -433,7 +450,7 @@ def tag_list(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -453,7 +470,7 @@ def tag_add(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -475,7 +492,7 @@ def tag_remove(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -495,7 +512,7 @@ def media_upload(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -515,7 +532,7 @@ def media_update(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -534,12 +551,32 @@ def media_delete(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
 
 
+@keys_app.command("setup")
+def keys_setup(
+    json_output: bool = typer.Option(False, "--json", help="Emit JSON output after setup succeeds."),
+) -> None:
+    """Start the browser-based credential setup server and wait for valid credentials."""
+    try:
+        run_setup(
+            CredentialStore(),
+            output=_emit,
+            prompt="Open this setup URL in your browser",
+        )
+        emit_result(
+            {"configured": True, "message": "Credentials saved."},
+            json_output=json_output,
+        )
+    except CredentialError as exc:
+        emit_error("credential_store_unavailable", str(exc), json_output=True)
+        raise typer.Exit(code=2) from exc
+
+
 @keys_app.command("revoke")
 def keys_revoke(
     json_output: bool = typer.Option(False, "--json", help="Emit JSON output."),
@@ -623,7 +660,7 @@ def service_create(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -644,7 +681,7 @@ def service_list(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -663,7 +700,7 @@ def service_show(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -731,7 +768,7 @@ def service_update(
         emit_result(result, json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc
@@ -749,7 +786,7 @@ def service_delete(
         emit_result(run(client.delete_service(slug)), json_output=json_output)
 
     try:
-        _run(_op)
+        _run(_op, json_output=json_output)
     except CLIError as exc:
         typer.echo(str(exc), err=True)
         raise typer.Exit(code=1) from exc

{blog_cli-0.4.2 → blog_cli-0.4.4}/src/personal_cli/formatting.py

@@ -36,3 +36,17 @@ def emit_result(data: Any, *, json_output: bool = False) -> None:
 
     print(data)
 
+
+def emit_error(
+    code: str,
+    message: str,
+    *,
+    json_output: bool = False,
+    **details: Any,
+) -> None:
+    if json_output:
+        error: dict[str, Any] = {"code": code, "message": message}
+        error.update(details)
+        print(json.dumps({"error": error}, ensure_ascii=False, default=str), file=sys.stderr)
+        return
+    print(message, file=sys.stderr)

{blog_cli-0.4.2 → blog_cli-0.4.4}/tests/test_cli.py

@@ -345,7 +345,7 @@ def test_service_cli_lifecycle(monkeypatch, runner: CliRunner, client: FakeApiCl
     assert create_result.exit_code == 0
     created = json.loads(create_result.stdout)
     assert created["slug"] == "web"
-    assert created["url"] == "http://testsite/services/web"
+    assert created["url"] == "http://testsite/services?service=web"
     assert created["types"] == ["Static websites", "Web apps with a database"]
     assert created["offerings"][0]["title"] == "Static websites"
 
@@ -355,7 +355,7 @@ def test_service_cli_lifecycle(monkeypatch, runner: CliRunner, client: FakeApiCl
 
     list_result = runner.invoke(app, ["service", "list", "--category", "Web", "--json"])
     assert list_result.exit_code == 0
-    assert json.loads(list_result.stdout)[0]["url"] == "http://testsite/services/web"
+    assert json.loads(list_result.stdout)[0]["url"] == "http://testsite/services?service=web"
 
 
 def test_service_cli_does_not_expose_homepage_options(runner: CliRunner) -> None:
@@ -395,13 +395,33 @@ def test_media_cli_smoke(monkeypatch, runner: CliRunner, client: FakeApiClient,
     assert deleted["name"] == "hero-image"
 
 
-def test_missing_credentials_triggers_setup(
+def test_authentication_required_is_structured_and_does_not_start_setup(
     monkeypatch: pytest.MonkeyPatch,
     runner: CliRunner,
     credential_store: FakeKeyringBackend,
 ) -> None:
     credential_store.delete_password("personal-cli", "default")
 
+    setup_calls: list[int] = []
+    monkeypatch.setattr("personal_cli.cli.run_setup", lambda *args, **kwargs: setup_calls.append(1))
+    monkeypatch.setattr("personal_cli.cli.build_client", lambda *args, **kwargs: (_ for _ in ()).throw(MissingCredentialError("missing")))
+
+    for args in (["article", "list"], ["article", "list", "--json"]):
+        result = runner.invoke(app, args)
+        assert result.exit_code == 2
+        error = json.loads(result.stderr.strip())
+        assert error["error"]["code"] == "authentication_required"
+        assert error["error"]["setup_command"] == "blog-cli keys setup"
+        assert "http" not in result.stderr
+
+    assert not setup_calls
+
+
+def test_keys_setup_runs_attached_setup_server(
+    monkeypatch: pytest.MonkeyPatch,
+    runner: CliRunner,
+    credential_store: FakeKeyringBackend,
+) -> None:
     setup_calls: list[int] = []
 
     def _fake_run_setup(store, output=None, prompt=""):
@@ -415,17 +435,45 @@ def test_missing_credentials_triggers_setup(
 
     monkeypatch.setattr("personal_cli.cli.run_setup", _fake_run_setup)
 
-    attempts: list[int] = []
+    result = runner.invoke(app, ["keys", "setup", "--json"])
 
-    def _flaky_build_client(server_url=None, insecure=False):
-        attempts.append(1)
-        if len(attempts) == 1:
-            raise MissingCredentialError("missing")
-        return FakeApiClient()
+    assert result.exit_code == 0
+    assert setup_calls == [1]
+    assert "http://127.0.0.1:3233/setup?token=fake" in result.stderr
+    assert json.loads(result.stdout)["configured"] is True
 
-    monkeypatch.setattr("personal_cli.cli.build_client", _flaky_build_client)
-    monkeypatch.setattr("personal_cli.cli.run", lambda coro: __import__("asyncio").run(coro))
 
-    result = runner.invoke(app, ["article", "list", "--json"])
-    assert setup_calls, "run_setup should have been called"
+def test_keys_revoke_removes_stored_credentials(
+    runner: CliRunner,
+    credential_store: FakeKeyringBackend,
+) -> None:
+    result = runner.invoke(app, ["keys", "revoke", "--json"])
+
     assert result.exit_code == 0
+    assert json.loads(result.stdout) == {
+        "revoked": True,
+        "message": "Credentials revoked.",
+    }
+    assert credential_store.get_password("personal-cli", "default") is None
+
+
+def test_json_credential_store_error_is_structured(
+    monkeypatch: pytest.MonkeyPatch,
+    runner: CliRunner,
+) -> None:
+    def _credential_store_failure(server_url=None, insecure=False):
+        raise CredentialError("Could not access the operating system credential store.")
+
+    monkeypatch.setattr("personal_cli.cli.build_client", _credential_store_failure)
+
+    result = runner.invoke(app, ["article", "list", "--json"])
+
+    assert result.exit_code == 2
+    error = json.loads(result.stderr.strip())
+    assert error == {
+        "error": {
+            "code": "credential_store_unavailable",
+            "message": "Could not access the operating system credential store.",
+        }
+    }
+    assert "Traceback" not in result.output