obsideo-cli 0.2.0__tar.gz → 0.2.2__tar.gz

{obsideo_cli-0.2.0 → obsideo_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obsideo-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal.
 License: MIT
 Project-URL: Homepage, https://obsideo.io
@@ -8,6 +8,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: boto3>=1.28
 Requires-Dist: cryptography>=41.0
+Requires-Dist: certifi
 
 # obsideo-cli
 

{obsideo_cli-0.2.0 → obsideo_cli-0.2.2}/obsideo/cli.py

@@ -11,6 +11,7 @@ leaves, so Obsideo can't read it. An interactive shell plus one-shot commands.
 import cmd
 import os
 import shlex
+import subprocess
 import sys
 import urllib.error
 import urllib.request
@@ -88,7 +89,7 @@ def show_notices() -> None:
             f"{config.signup_url()}/v1/notices",
             headers={"User-Agent": config.USER_AGENT},
         )
-        with urllib.request.urlopen(req, timeout=4) as resp:
+        with urllib.request.urlopen(req, timeout=4, context=config.ssl_context()) as resp:
             notices = json.loads(resp.read().decode()).get("notices", [])
     except Exception:
         return
@@ -106,6 +107,116 @@ def show_notices() -> None:
     _mark_seen(shown)
 
 
+# ── Branding banner + version self-check ──────────────────────────────────────
+
+_BANNER = r"""
+    /\
+   /  \    OBSIDEO DRIVE
+   \  /    encrypted storage not even we can read
+    \/
+"""
+
+_BANNER_SHOWN = False
+
+
+def _chrome_enabled() -> bool:
+    """Banner/prompt are human chrome: only on an interactive stdout, and never
+    when OBSIDEO_NO_BANNER / NO_COLOR is set. Keeps stdout clean for agents/pipes."""
+    if os.environ.get("OBSIDEO_NO_BANNER") or os.environ.get("NO_COLOR"):
+        return False
+    return sys.stdout.isatty()
+
+
+def show_banner() -> None:
+    """Branded ASCII banner to stderr, once per process, TTY-gated."""
+    global _BANNER_SHOWN
+    if _BANNER_SHOWN or not _chrome_enabled():
+        return
+    _BANNER_SHOWN = True
+    print(f"\033[36m{_BANNER}\033[0m", file=sys.stderr)
+
+
+def _usage_bar(pct: float, cells: int = 10) -> str:
+    filled = min(cells, max(0, round(pct * cells)))
+    return "#" * filled + "-" * (cells - filled)
+
+
+def show_status() -> None:
+    """One-line account status (tier · usage bar · upgrade hint) to stderr, TTY-gated.
+    Makes a network call, so it's shown at session start / post-login only."""
+    if not _chrome_enabled() or not config.is_logged_in():
+        return
+    usage = _fetch_usage()
+    if not usage:
+        return
+    used, quota = usage.get("used_bytes", 0), usage.get("quota_bytes", 0)
+    pct = usage.get("percent_used")
+    if pct is None:
+        pct = (used / quota) if quota else 0.0
+    hint = "  ·  \033[36mupgrade\033[0m for more" if pct >= 0.8 else ""
+    print(f"\033[2mFree\033[0m [{_usage_bar(pct)}] {_human(used)} of {_human(quota)}{hint}",
+          file=sys.stderr)
+
+
+def _parse_version(v: str) -> tuple:
+    """Lenient dotted-version → comparable int tuple. '0.2.10' > '0.2.9'."""
+    out = []
+    for part in v.split("."):
+        digits = ""
+        for ch in part:
+            if ch.isdigit():
+                digits += ch
+            else:
+                break
+        out.append(int(digits) if digits else 0)
+    return tuple(out)
+
+
+def _latest_pypi_version() -> str | None:
+    try:
+        req = urllib.request.Request(
+            f"https://pypi.org/pypi/{config.PACKAGE}/json",
+            headers={"User-Agent": config.USER_AGENT},
+        )
+        with urllib.request.urlopen(req, timeout=5, context=config.ssl_context()) as resp:
+            return json.loads(resp.read().decode())["info"]["version"]
+    except Exception:
+        return None
+
+
+def check_for_update() -> None:
+    """On interactive init: if PyPI has a newer obsideo-cli, offer to update now.
+    TTY-gated (never prompts agents/scripts), fail-silent (a network hiccup never
+    blocks startup). Disable with OBSIDEO_NO_UPDATE_CHECK."""
+    if not sys.stdout.isatty() or os.environ.get("OBSIDEO_NO_UPDATE_CHECK"):
+        return
+    current = config.VERSION
+    latest = _latest_pypi_version()
+    if not latest or _parse_version(latest) <= _parse_version(current):
+        return
+    print(f"\n\033[36mUpdate available: {current} -> {latest}\033[0m", file=sys.stderr)
+    try:
+        ans = input("Update now? [Y/n]: ").strip().lower()
+    except (EOFError, KeyboardInterrupt):
+        print(file=sys.stderr)
+        return
+    if ans not in ("", "y", "yes"):
+        print(f"Skipped. Update later with:  pip install -U {config.PACKAGE}", file=sys.stderr)
+        return
+    print(f"Updating to {latest}...", file=sys.stderr)
+    try:
+        rc = subprocess.run(
+            [sys.executable, "-m", "pip", "install", "-U", config.PACKAGE]
+        ).returncode
+    except Exception as e:
+        print(f"Update failed: {e}\nTry manually:  pip install -U {config.PACKAGE}", file=sys.stderr)
+        return
+    if rc == 0:
+        print(f"\nUpdated to {latest}. Restart `obsideo` to use the new version.", file=sys.stderr)
+        sys.exit(0)
+    print(f"Update didn't complete. Try:  pip install -U {config.PACKAGE}", file=sys.stderr)
+
+
 # ── Operator tooling: broadcast a message to all users ────────────────────────
 
 def run_admin(argv: list) -> int:
@@ -148,7 +259,7 @@ def run_admin(argv: list) -> int:
         method="POST",
     )
     try:
-        with urllib.request.urlopen(req, timeout=15) as resp:
+        with urllib.request.urlopen(req, timeout=15, context=config.ssl_context()) as resp:
             out = json.loads(resp.read().decode())
     except urllib.error.HTTPError as e:
         detail = e.read().decode()[:200]
@@ -482,7 +593,7 @@ class ObsideoShell(cmd.Cmd):
         if parts[0] == "set" and len(parts) == 3:
             key, value = parts[1], parts[2]
             cfg = config.load_config()
-            if key == "encrypt":
+            if key in ("encrypt", "encrypt_names"):
                 value = value.lower() in ("true", "1", "yes", "on")
             cfg[key] = value
             config.save_config(cfg)
@@ -515,7 +626,7 @@ def _fetch_usage() -> dict | None:
             f"{config.signup_url()}/v1/account/usage",
             headers={"Authorization": f"Bearer {token}", "User-Agent": config.USER_AGENT},
         )
-        with urllib.request.urlopen(req, timeout=15) as resp:
+        with urllib.request.urlopen(req, timeout=15, context=config.ssl_context()) as resp:
             return json.loads(resp.read().decode())
     except Exception:
         return None
@@ -524,6 +635,11 @@ def _fetch_usage() -> dict | None:
 def main():
     argv = sys.argv[1:]
 
+    # Branded banner on every init (stderr, TTY-gated). Skip for `admin` so
+    # operator tooling output stays clean.
+    if not (argv and argv[0] == "admin"):
+        show_banner()
+
     # Standard --help / -h (cmd.Cmd would otherwise read "--help" as a command).
     if argv and argv[0] in ("-h", "--help", "help"):
         ObsideoShell().onecmd("help")
@@ -532,6 +648,8 @@ def main():
     # `obsideo login` is interactive and handled specially.
     if argv and argv[0] == "login":
         ok = run_login()
+        if ok:
+            show_status()
         sys.exit(0 if ok else 1)
 
     # `obsideo admin ...` is operator tooling, not a shell command.
@@ -543,11 +661,15 @@ def main():
 
     shell = ObsideoShell()
 
-    # One-shot: `obsideo ls`, `obsideo put file.txt`, etc.
+    # One-shot: `obsideo ls`, `obsideo put file.txt`, etc. No update prompt or
+    # status line here — one-shots stay fast and scriptable.
     if argv:
         shell.onecmd(" ".join(argv))
         return
 
+    # Interactive session ("initialization"): offer an update if one's out.
+    check_for_update()
+
     # First-run nudge: not logged in -> offer login.
     if not config.is_logged_in():
         print("Welcome to Obsideo - encrypted storage we can't read.")
@@ -558,6 +680,7 @@ def main():
             print("Run 'obsideo login' when you're ready.")
             return
 
+    show_status()
     try:
         shell.cmdloop()
     except KeyboardInterrupt:

{obsideo_cli-0.2.0 → obsideo_cli-0.2.2}/obsideo_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obsideo-cli
-Version: 0.2.0
+Version: 0.2.2
 Summary: Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal.
 License: MIT
 Project-URL: Homepage, https://obsideo.io
@@ -8,6 +8,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: boto3>=1.28
 Requires-Dist: cryptography>=41.0
+Requires-Dist: certifi
 
 # obsideo-cli
 

{obsideo_cli-0.2.0 → obsideo_cli-0.2.2}/obsideo_cli.egg-info/requires.txt

@@ -1,2 +1,3 @@
 boto3>=1.28
 cryptography>=41.0
+certifi

{obsideo_cli-0.2.0 → obsideo_cli-0.2.2}/obsideo_core/config.py

@@ -28,16 +28,31 @@ _DEFAULT_REGION = "us-east-1"
 # Sent on every request to the signup shim. A descriptive User-Agent avoids
 # Cloudflare's default-`Python-urllib` bot block (HTTP 403 / error 1010) that
 # fronts signup.obsideo.io; without it, `obsideo login` and usage lookups fail.
+PACKAGE = "obsideo-cli"  # PyPI distribution name (used for version + update checks)
 try:
     from importlib.metadata import version as _pkg_version, PackageNotFoundError
     try:
-        _VERSION = _pkg_version("obsideo-cloud")
+        _VERSION = _pkg_version(PACKAGE)
     except PackageNotFoundError:
-        _VERSION = "0.2.0"
+        _VERSION = "0.2.1"
 except Exception:
-    _VERSION = "0.2.0"
+    _VERSION = "0.2.1"
 
-USER_AGENT = f"obsideo-cloud/{_VERSION}"
+VERSION = _VERSION
+USER_AGENT = f"obsideo-cli/{_VERSION}"
+
+
+def ssl_context():
+    """An SSL context that verifies against certifi's CA bundle. urllib otherwise
+    trusts the OS certificate store, which is often incomplete on fresh/locked-down
+    Windows installs (CERTIFICATE_VERIFY_FAILED on a perfectly valid cert). Falls
+    back to the system default if certifi isn't importable."""
+    import ssl
+    try:
+        import certifi
+        return ssl.create_default_context(cafile=certifi.where())
+    except Exception:
+        return ssl.create_default_context()
 
 
 def write_secret_file(path: Path, value: str) -> None:

{obsideo_cli-0.2.0 → obsideo_cli-0.2.2}/obsideo_core/login.py

@@ -24,7 +24,7 @@ def _post_json(url: str, payload: dict) -> dict:
         method="POST",
     )
     try:
-        with urllib.request.urlopen(req, timeout=30) as resp:
+        with urllib.request.urlopen(req, timeout=30, context=config.ssl_context()) as resp:
             return json.loads(resp.read().decode())
     except urllib.error.HTTPError as e:
         try:

{obsideo_cli-0.2.0 → obsideo_cli-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "obsideo-cli"
-version = "0.2.0"
+version = "0.2.2"
 description = "Obsideo Cloud - encrypted storage we can't read. Save, browse, and sync whatever you want, from your terminal."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -12,6 +12,7 @@ license = {text = "MIT"}
 dependencies = [
     "boto3>=1.28",
     "cryptography>=41.0",
+    "certifi",
 ]
 
 [project.urls]

{obsideo_cli-0.2.0 → obsideo_cli-0.2.2}/tests/test_cli.py

@@ -151,3 +151,80 @@ def test_put_folder_into_cwd(shell, tmp_path):
     sh.do_cd("backup")
     sh.do_put(str(folder))
     assert "backup/docs/x.txt" in fake.objs
+
+
+# ── Banner + update check (0.2.1) ─────────────────────────────────────────────
+
+def test_banner_tty_gated_once(monkeypatch, capsys):
+    monkeypatch.setattr(cli.sys.stdout, "isatty", lambda: True, raising=False)
+    monkeypatch.delenv("OBSIDEO_NO_BANNER", raising=False)
+    monkeypatch.delenv("NO_COLOR", raising=False)
+    cli._BANNER_SHOWN = False
+    cli.show_banner()
+    assert "OBSIDEO DRIVE" in capsys.readouterr().err
+    cli.show_banner()  # once per process
+    assert capsys.readouterr().err == ""
+    # non-tty: silent
+    monkeypatch.setattr(cli.sys.stdout, "isatty", lambda: False, raising=False)
+    cli._BANNER_SHOWN = False
+    cli.show_banner()
+    assert capsys.readouterr().err == ""
+
+
+def test_parse_version_ordering():
+    assert cli._parse_version("0.2.10") > cli._parse_version("0.2.9")
+    assert cli._parse_version("0.3.0") > cli._parse_version("0.2.99")
+    assert cli._parse_version("0.2.1") == cli._parse_version("0.2.1")
+    assert not (cli._parse_version("0.2.0") > cli._parse_version("0.2.1"))
+
+
+def test_update_check_silent_when_not_tty(monkeypatch, capsys):
+    monkeypatch.setattr(cli.sys.stdout, "isatty", lambda: False, raising=False)
+    called = []
+    monkeypatch.setattr(cli, "_latest_pypi_version", lambda: called.append(1) or "9.9.9")
+    cli.check_for_update()
+    assert capsys.readouterr().err == ""
+    assert called == []  # short-circuits before any network call
+
+
+def test_update_check_noop_when_current(monkeypatch, capsys):
+    monkeypatch.setattr(cli.sys.stdout, "isatty", lambda: True, raising=False)
+    monkeypatch.delenv("OBSIDEO_NO_UPDATE_CHECK", raising=False)
+    monkeypatch.setattr(cli.config, "VERSION", "0.2.1")
+    monkeypatch.setattr(cli, "_latest_pypi_version", lambda: "0.2.1")  # not newer
+    asked = []
+    monkeypatch.setattr("builtins.input", lambda *a: asked.append(1) or "y")
+    cli.check_for_update()
+    assert asked == []  # never prompts when already current
+    assert "Update available" not in capsys.readouterr().err
+
+
+def test_update_check_prompts_and_respects_no(monkeypatch, capsys):
+    monkeypatch.setattr(cli.sys.stdout, "isatty", lambda: True, raising=False)
+    monkeypatch.delenv("OBSIDEO_NO_UPDATE_CHECK", raising=False)
+    monkeypatch.setattr(cli.config, "VERSION", "0.2.1")
+    monkeypatch.setattr(cli, "_latest_pypi_version", lambda: "0.2.2")
+    monkeypatch.setattr("builtins.input", lambda *a: "n")
+    ran = []
+    monkeypatch.setattr(cli.subprocess, "run", lambda *a, **k: ran.append(a))
+    cli.check_for_update()
+    err = capsys.readouterr().err
+    assert "Update available: 0.2.1 -> 0.2.2" in err
+    assert ran == []  # declined -> no pip invocation
+
+
+def test_update_check_runs_pip_on_yes(monkeypatch, capsys):
+    monkeypatch.setattr(cli.sys.stdout, "isatty", lambda: True, raising=False)
+    monkeypatch.delenv("OBSIDEO_NO_UPDATE_CHECK", raising=False)
+    monkeypatch.setattr(cli.config, "VERSION", "0.2.1")
+    monkeypatch.setattr(cli, "_latest_pypi_version", lambda: "0.2.2")
+    monkeypatch.setattr("builtins.input", lambda *a: "y")
+
+    class _R:
+        returncode = 0
+    calls = []
+    monkeypatch.setattr(cli.subprocess, "run", lambda *a, **k: calls.append(a[0]) or _R())
+    with pytest.raises(SystemExit) as e:
+        cli.check_for_update()
+    assert e.value.code == 0
+    assert calls and calls[0][1:] == ["-m", "pip", "install", "-U", "obsideo-cli"]