certmate-cli 0.1.3__tar.gz → 0.1.5__tar.gz

{certmate_cli-0.1.3 → certmate_cli-0.1.5}/.gitignore

@@ -79,6 +79,7 @@ htmlcov/
 .pytest_cache/
 .coverage
 coverage.xml
+coverage.json
 test_results.json
 
 # Local dev / debug scripts (kept on developer machines only)
@@ -114,3 +115,7 @@ theme-baseline/
 UI_DRACONIAN_ANALYSIS.md
 UI_UX_Opinioni_CertMate.pdf
 UI_REDESIGN_PLAN.md
+
+# Local nginx reverse-proxy config: copy nginx.conf.example to nginx.conf and
+# fill in your domain. The copy is yours; the example is tracked (#576).
+nginx.conf

{certmate_cli-0.1.3 → certmate_cli-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: certmate-cli
-Version: 0.1.3
+Version: 0.1.5
 Summary: CertMate command-line interface — the SSL certificate lifecycle from your terminal
 Project-URL: Homepage, https://github.com/fabriziosalmi/certmate
 Project-URL: Source, https://github.com/fabriziosalmi/certmate/tree/main/clients/certmate-cli
@@ -23,7 +23,7 @@ Classifier: Topic :: Security
 Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9
-Requires-Dist: certmate-sdk>=0.1.3
+Requires-Dist: certmate-sdk>=0.1.5
 Requires-Dist: rich>=13
 Requires-Dist: typer>=0.9
 Description-Content-Type: text/markdown

{certmate_cli-0.1.3 → certmate_cli-0.1.5}/certmate_cli/__init__.py

@@ -1,2 +1,2 @@
 """certmate-cli — the CertMate SSL lifecycle from your terminal (built on certmate-sdk)."""
-__version__ = "0.1.2"
+__version__ = "0.1.5"

{certmate_cli-0.1.3 → certmate_cli-0.1.5}/certmate_cli/main.py

@@ -39,6 +39,24 @@ app.add_typer(deploy_app, name="deploy")
 out = Console()
 err = Console(stderr=True)
 
+
+def _version_callback(value: bool) -> None:
+    """`--version` prints the version and exits 0, before anything else runs.
+
+    It has to be eager: the flag must work with no server configured, no
+    token, and no network — reporting which build you have is the first thing
+    anyone does when something is wrong.
+    """
+    if value:
+        from certmate_cli import __version__
+
+        # Plain print, not `out.print`: a version string gets piped and
+        # compared, so it must not pick up Rich's wrapping or markup.
+        print(__version__)
+        raise typer.Exit(0)
+
+
+
 # A lax hostname/wildcard check for the client-side --dry-run preflight; the
 # server is the real authority, this just catches obvious typos before we
 # spend an API call.
@@ -71,6 +89,13 @@ def _main(
                                         help="API bearer token. Prefer the CERTMATE_TOKEN "
                                              "environment variable: --token is visible to other "
                                              "local processes (ps) and shell history."),
+    # Lives on THIS callback rather than a second one: Typer keeps only one
+    # root callback, so a separate `@app.callback()` silently replaces this
+    # whole function — including the --token warning above.
+    version: Optional[bool] = typer.Option(None, "--version", "-V",
+                                           callback=_version_callback,
+                                           is_eager=True,
+                                           help="Show the certmate-cli version and exit."),
 ):
     # Kept for compatibility, but discourage --token interactively: argv is
     # world-readable via ps and lands in shell history. Warn only on a TTY so
@@ -141,11 +166,31 @@ def cert_ls(ctx: typer.Context):
     table.add_column("DAYS", justify="right")
     table.add_column("CA")
     table.add_column("AUTO-RENEW")
-    for c in sorted(certs, key=lambda x: (x.days_until_expiry if x.days_until_expiry is not None else 1 << 30)):
+    # Sort by seconds where the server sends them: a certificate with 23 hours
+    # left and one that lapsed an hour ago are both 0 or -1 in whole days, and
+    # would otherwise land next to each other in either order.
+    def _remaining(cert):
+        if cert.seconds_left is not None:
+            return cert.seconds_left
+        if cert.days_until_expiry is not None:
+            return cert.days_until_expiry * 86400
+        return 1 << 40
+
+    for c in sorted(certs, key=_remaining):
         days = c.days_until_expiry
-        days_str = "-" if days is None else str(days)
-        colour = "green"
-        if days is not None:
+        expired = c.has_expired()
+        # "0" for a certificate with 23 hours left was read as expired by
+        # everything that saw it, including CertMate's own dashboard until
+        # server 2.32.2. Say which of the two it is instead of printing the
+        # number that cannot tell them apart.
+        if expired is True:
+            days_str, colour = "expired", "red"
+        elif days is None:
+            days_str, colour = "-", "green"
+        elif days == 0:
+            days_str, colour = ("<1" if expired is False else "?"), "red"
+        else:
+            days_str = str(days)
             colour = "red" if days < 7 else ("yellow" if days < 30 else "green")
         table.add_row(
             c.domain,
@@ -162,8 +207,16 @@ def cert_info(ctx: typer.Context, domain: str):
     """Show a certificate's details."""
     c = _run(lambda: _client(ctx).get_certificate(domain))
     out.print(f"[bold]{c.domain}[/]")
-    out.print(f"  expires:     {c.expiry_date or '-'}  "
-              f"({c.days_until_expiry if c.days_until_expiry is not None else '?'} days)")
+    if c.has_expired() is True:
+        remaining = "[red]expired[/]"
+    elif c.days_until_expiry is None:
+        remaining = "? days"
+    elif c.days_until_expiry == 0:
+        # Under a day, and not expired, or the server is too old to say.
+        remaining = "less than a day" if c.has_expired() is False else "? days"
+    else:
+        remaining = f"{c.days_until_expiry} days"
+    out.print(f"  expires:     {c.expiry_date or '-'}  ({remaining})")
     out.print(f"  CA:          {c.ca_provider or '-'}")
     out.print(f"  DNS:         {c.dns_provider or '-'}")
     out.print(f"  auto-renew:  {c.auto_renew}")

{certmate_cli-0.1.3 → certmate_cli-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "certmate-cli"
-version = "0.1.3"
+version = "0.1.5"
 description = "CertMate command-line interface — the SSL certificate lifecycle from your terminal"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -30,10 +30,13 @@ classifiers = [
 ]
 # Built ON the SDK (never the reverse). typer for the command surface, rich
 # for tables/spinners. Still light — no server deps.
-# The SDK floor tracks the CLI release: 0.1.2 needs TransportError and the
-# renew/audit semantics introduced in certmate-sdk 0.1.2.
+# The SDK floor tracks the CLI release, and now something enforces that:
+# tests/test_version_consistency.py fails if this floor falls behind the SDK
+# in the tree. It had already drifted once, sitting at 0.1.3 while both
+# packages were 0.1.4. 0.1.5 is needed for Certificate.has_expired(), which
+# `cert ls` and `cert info` call on every row.
 dependencies = [
-    "certmate-sdk>=0.1.3",
+    "certmate-sdk>=0.1.5",
     "typer>=0.9",
     "rich>=13",
 ]