obsideo-cli 0.2.4__tar.gz → 0.2.6__tar.gz

{obsideo_cli-0.2.4 → obsideo_cli-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obsideo-cli
-Version: 0.2.4
+Version: 0.2.6
 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

{obsideo_cli-0.2.4 → obsideo_cli-0.2.6}/obsideo/cli.py

@@ -200,8 +200,15 @@ def check_for_update() -> None:
     except (EOFError, KeyboardInterrupt):
         print(file=sys.stderr)
         return
+    manual = f"pip install -U --no-cache-dir {config.PACKAGE}"
     if ans not in ("", "y", "yes"):
-        print(f"Skipped. Update later with:  pip install -U {config.PACKAGE}", file=sys.stderr)
+        print(f"Skipped. Update later with:  {manual}", file=sys.stderr)
+        return
+    if sys.platform == "win32":
+        # Windows file-locks the running obsideo.exe, so pip can't replace it from
+        # inside a live session (WinError 32). Hand over the one command to run.
+        print(f"\nWindows can't replace the CLI while it's running. To finish, close\n"
+              f"obsideo and run:\n    {manual}", file=sys.stderr)
         return
     print(f"Updating to {latest}...", file=sys.stderr)
     try:
@@ -209,7 +216,7 @@ def check_for_update() -> None:
             [sys.executable, "-m", "pip", "install", "-U", "--no-cache-dir", config.PACKAGE]
         ).returncode
     except Exception as e:
-        print(f"Update failed: {e}\nTry manually:  pip install -U {config.PACKAGE}", file=sys.stderr)
+        print(f"Update failed: {e}\nTry manually:  {manual}", file=sys.stderr)
         return
     if rc == 0:
         print(f"\nUpdated to {latest}. Restart `obsideo` to use the new version.", file=sys.stderr)
@@ -303,6 +310,13 @@ def run_login(url: str | None = None) -> bool:
         print("Note: storage activation is finishing rollout; if an upload fails, retry shortly.")
     print("Your files are encrypted with a local key. Back it up:")
     print(f"  {crypto.DATA_KEY_FILE}")
+    # Create the sync folder now so it's ready (never make the user mkdir it).
+    try:
+        from obsideo import sync as _sync
+        sd = _sync.ensure_sync_dir()
+        print(f"Your sync folder is ready (drop files here, then `sync push`):\n  {sd}")
+    except Exception:
+        pass
     print("Type 'obsideo' to open the shell, or 'obsideo put <file>' to store something.")
     return True
 
@@ -534,27 +548,105 @@ class ObsideoShell(cmd.Cmd):
 
     # ── account ───────────────────────────────────────────────────────────────
     def do_account(self, arg):
-        """Show your plan: storage used vs. your free quota."""
+        """Show your account: plan, storage used, and where your files/keys live."""
         if not self._require_login():
             return
-        usage = _fetch_usage()
+        from obsideo import sync as sync_mod
         print()
         print("  -- Obsideo account --------------------------")
         print("     Plan:  Free")
-        if usage:
-            used, quota = usage["used_bytes"], usage["quota_bytes"]
-            pct = usage.get("percent_used", (used / quota if quota else 0))
-            print(f"     Used:  {_human(used)} / {_human(quota)} ({pct*100:.1f}%)")
-            bar_len = 30
-            filled = int(bar_len * min(pct, 1.0))
-            print(f"     [{'#'*filled}{'-'*(bar_len-filled)}]")
-            if pct >= 0.8:
-                print("     You're near your limit - reply to any Obsideo email to upgrade.")
+        if not config.account_token():
+            # No shim token (e.g. creds set via env / pre-login account): we can't
+            # query usage. Don't claim the service is down — tell them how to link it.
+            print("     Usage: sign in with `obsideo login` to see usage details")
         else:
-            print("     (usage unavailable - is the account service reachable?)")
+            usage = _fetch_usage()
+            if usage:
+                used, quota = usage["used_bytes"], usage["quota_bytes"]
+                pct = usage.get("percent_used", (used / quota if quota else 0))
+                print(f"     Used:  {_human(used)} / {_human(quota)} ({pct*100:.1f}%)")
+                bar_len = 30
+                filled = int(bar_len * min(pct, 1.0))
+                print(f"     [{'#'*filled}{'-'*(bar_len-filled)}]")
+                if pct >= 0.8:
+                    print("     You're near your limit - reply to any Obsideo email to upgrade.")
+            else:
+                print("     Usage: couldn't reach the account service - try again shortly")
+        print(f"     Files: bucket '{storage.bucket()}'  ·  sync folder {sync_mod.ensure_sync_dir()}")
+        print(f"     Keys:  {config.CONFIG_DIR}  (back up data.key)")
         print("  ---------------------------------------------")
         print()
 
+    # ── about / faq / messages ────────────────────────────────────────────────
+    def do_about(self, arg):
+        """What Obsideo is."""
+        print("""
+  OBSIDEO DRIVE - encrypted storage we can't read.
+
+  Your files are encrypted on your device (AES-256-GCM) before they ever leave
+  it, then stored across three independent providers (RF=3). Obsideo's servers
+  only ever see ciphertext - never your filenames, never your data.
+
+  - Free: 3 GB, no card, no expiry.
+  - Your keys live only on your machine (~/.obsideo). Back up data.key - lose it
+    and the data is unrecoverable by design. That's the point: not even we can read it.
+  - Install / update:  pip install -U obsideo-cli      More:  https://obsideo.io
+""")
+
+    def do_faq(self, arg):
+        """Frequently asked questions."""
+        print("""
+  -- Obsideo FAQ --
+
+  Q: Can Obsideo read my files?
+  A: No. They're encrypted on your device before upload; we only store ciphertext.
+
+  Q: What's free?
+  A: 3 GB, no credit card, no expiry.
+
+  Q: What if I lose my key?
+  A: Your key is ~/.obsideo/data.key - back it up. Without it the data can't be
+     decrypted by anyone, including us.
+
+  Q: Two folders - what's the difference?
+  A: ~/.obsideo  = your keys + settings (don't touch).
+     ~/obsideo-sync = your SYNC folder - files you put here sync with `sync push`.
+
+  Q: What does `sync` do?
+  A: Mirrors your sync folder to/from the cloud. `sync push` uploads new/changed
+     files, `sync pull` downloads, `sync status` shows what's pending. It's manual
+     (you run it) and covers files in the top of the folder.
+
+  Q: How do I change settings (sync folder, encryption)?
+  A: `config` shows them; `config set sync_dir <path>` / `config set encrypt_names false`.
+
+  Q: More space?
+  A: Reply to any Obsideo email to upgrade. (A referral program is coming.)
+
+  Q: Updating?
+  A: pip install -U obsideo-cli  - the CLI also nudges you when an update is out.
+""")
+
+    def do_messages(self, arg):
+        """Messages from the Obsideo team."""
+        try:
+            req = urllib.request.Request(
+                f"{config.signup_url()}/v1/notices",
+                headers={"User-Agent": config.USER_AGENT},
+            )
+            with urllib.request.urlopen(req, timeout=10, context=config.ssl_context()) as resp:
+                notices = json.loads(resp.read().decode()).get("notices", [])
+        except Exception:
+            print("\n  Couldn't reach the message service - try again shortly.\n")
+            return
+        if not notices:
+            print("\n  No messages from the Obsideo team right now.\n")
+            return
+        print("\n  -- Messages from the Obsideo team --")
+        for n in notices:
+            print(f"   - {n.get('body', '').strip()}")
+        print()
+
     # ── sync ──────────────────────────────────────────────────────────────────
     def do_sync(self, arg):
         """Sync your local folder with Obsideo. Usage: sync push|pull|status"""

{obsideo_cli-0.2.4 → obsideo_cli-0.2.6}/obsideo/sync.py

@@ -18,18 +18,24 @@ def _sync_dir() -> Path:
     return Path(config.load_config().get("sync_dir", str(Path.home() / "obsideo-sync")))
 
 
+def ensure_sync_dir() -> Path:
+    """Return the sync folder, creating it if needed. Called on login and by every
+    sync command so a user never has to make the folder by hand — it just exists."""
+    sd = _sync_dir()
+    sd.mkdir(parents=True, exist_ok=True)
+    return sd
+
+
 def _remote_key(name: str) -> str:
     return f"{REMOTE_PREFIX}{name}"
 
 
 def sync_status() -> dict:
-    sync_dir = _sync_dir()
+    sync_dir = ensure_sync_dir()
     entries = manifest.get_all()
     status = {"to_push": [], "to_pull": [], "synced": []}
 
-    local_files = {}
-    if sync_dir.exists():
-        local_files = {f.name: f for f in sync_dir.iterdir() if f.is_file()}
+    local_files = {f.name: f for f in sync_dir.iterdir() if f.is_file()}
 
     for name, f in local_files.items():
         local_hash = manifest.file_sha256(f)
@@ -53,17 +59,19 @@ def sync_status() -> dict:
 
 
 def push(verbose: bool = True) -> int:
-    sync_dir = _sync_dir()
-    if not sync_dir.exists():
+    sync_dir = ensure_sync_dir()
+    files = [p for p in sync_dir.iterdir() if p.is_file()]
+    if not files:
         if verbose:
-            print(f"Sync folder does not exist: {sync_dir}")
+            print(f"  Your sync folder is empty:\n    {sync_dir}\n"
+                  f"  Drop files in there, then run `sync push` again.")
         return 0
 
     do_encrypt = config.load_config().get("encrypt", True)
     entries = manifest.get_all()
     pushed = 0
 
-    for f in (p for p in sync_dir.iterdir() if p.is_file()):
+    for f in files:
         local_hash = manifest.file_sha256(f)
         entry = entries.get(f.name)
         if entry and entry.get("local_hash") == local_hash:
@@ -87,8 +95,7 @@ def push(verbose: bool = True) -> int:
 
 
 def pull(verbose: bool = True) -> int:
-    sync_dir = _sync_dir()
-    sync_dir.mkdir(parents=True, exist_ok=True)
+    sync_dir = ensure_sync_dir()
 
     try:
         remote = storage.list_prefix(REMOTE_PREFIX)

{obsideo_cli-0.2.4 → obsideo_cli-0.2.6}/obsideo_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: obsideo-cli
-Version: 0.2.4
+Version: 0.2.6
 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

{obsideo_cli-0.2.4 → obsideo_cli-0.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "obsideo-cli"
-version = "0.2.4"
+version = "0.2.6"
 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"

{obsideo_cli-0.2.4 → obsideo_cli-0.2.6}/tests/test_cli.py

@@ -213,8 +213,9 @@ def test_update_check_prompts_and_respects_no(monkeypatch, capsys):
     assert ran == []  # declined -> no pip invocation
 
 
-def test_update_check_runs_pip_on_yes(monkeypatch, capsys):
+def test_update_check_runs_pip_on_yes_posix(monkeypatch, capsys):
     monkeypatch.setattr(cli.sys.stdout, "isatty", lambda: True, raising=False)
+    monkeypatch.setattr(cli.sys, "platform", "linux")  # in-process upgrade path
     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")
@@ -228,3 +229,56 @@ def test_update_check_runs_pip_on_yes(monkeypatch, capsys):
         cli.check_for_update()
     assert e.value.code == 0
     assert calls and calls[0][1:] == ["-m", "pip", "install", "-U", "--no-cache-dir", "obsideo-cli"]
+
+
+def test_update_check_windows_prints_command_not_pip(monkeypatch, capsys):
+    # On Windows the running .exe is locked; "yes" must NOT run pip in-process,
+    # it prints the command instead (no WinError 32, no doomed self-replace).
+    monkeypatch.setattr(cli.sys.stdout, "isatty", lambda: True, raising=False)
+    monkeypatch.setattr(cli.sys, "platform", "win32")
+    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")
+    ran = []
+    monkeypatch.setattr(cli.subprocess, "run", lambda *a, **k: ran.append(a))
+    cli.check_for_update()  # returns, does not SystemExit
+    err = capsys.readouterr().err
+    assert ran == []  # never attempts the locked self-replace
+    assert "pip install -U --no-cache-dir obsideo-cli" in err
+
+
+# ── sync auto-setup + info commands (0.2.6) ───────────────────────────────────
+
+def test_ensure_sync_dir_creates(tmp_path, monkeypatch):
+    from obsideo import sync
+    target = tmp_path / "mysync"
+    monkeypatch.setattr(sync, "_sync_dir", lambda: target)
+    assert not target.exists()
+    sd = sync.ensure_sync_dir()
+    assert sd == target and target.is_dir()  # auto-created, no manual mkdir
+
+
+def test_push_empty_folder_is_friendly_noop(tmp_path, monkeypatch, capsys):
+    from obsideo import sync
+    monkeypatch.setattr(sync, "_sync_dir", lambda: tmp_path / "s")
+    n = sync.push(verbose=True)
+    assert n == 0
+    out = capsys.readouterr().out.lower()
+    assert "empty" in out and "sync push" in out  # guides instead of erroring
+
+
+def test_about_and_faq_print(capsys):
+    sh = cli.ObsideoShell()
+    sh.do_about("")
+    sh.do_faq("")
+    out = capsys.readouterr().out
+    assert "OBSIDEO DRIVE" in out and "FAQ" in out and "obsideo-sync" in out
+
+
+def test_messages_handles_unreachable(monkeypatch, capsys):
+    def boom(*a, **k):
+        raise OSError("network down")
+    monkeypatch.setattr(cli.urllib.request, "urlopen", boom)
+    cli.ObsideoShell().do_messages("")
+    assert "couldn't reach" in capsys.readouterr().out.lower()