doploy-cli 0.2.2__tar.gz → 0.2.5__tar.gz

{doploy_cli-0.2.2 → doploy_cli-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doploy-cli
-Version: 0.2.2
+Version: 0.2.5
 Summary: doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal
 License: MIT
 Project-URL: Homepage, https://doploy.io

{doploy_cli-0.2.2 → doploy_cli-0.2.5}/doploy_cli/main.py

@@ -20,8 +20,14 @@ import webbrowser
 import stat
 import sys
 import time
+from contextlib import contextmanager
 from pathlib import Path
 
+try:
+    import fcntl
+except ImportError:  # Windows: no cross-process lock, refresh as before
+    fcntl = None
+
 from typing import Optional
 
 import httpx
@@ -39,9 +45,34 @@ def _load_config() -> dict:
 
 
 def _save_config(cfg: dict) -> None:
+    # Write-then-rename so a concurrent reader never sees a half-written file
+    # (it would parse as {} and report "not logged in").
+    CONFIG_PATH.parent.mkdir(parents=True, exist_ok=True)
+    tmp = CONFIG_PATH.with_name(f'{CONFIG_PATH.name}.{os.getpid()}.tmp')
+    tmp.unlink(missing_ok=True)  # leftover from a crashed run
+    # Created 0600 (token inside) and O_EXCL: never readable by other users,
+    # never follows a planted symlink.
+    fd = os.open(tmp, os.O_WRONLY | os.O_CREAT | os.O_EXCL, stat.S_IRUSR | stat.S_IWUSR)
+    with os.fdopen(fd, 'w') as fh:
+        fh.write(json.dumps(cfg, indent=2) + '\n')
+    os.replace(tmp, CONFIG_PATH)
+
+
+@contextmanager
+def _refresh_lock():
+    """Serialize token refresh across doploy processes. The server rotates the
+    refresh token on every use and revokes the whole grant if an already-used
+    one is presented again, so two processes refreshing at once log you out."""
+    if fcntl is None:
+        yield
+        return
     CONFIG_PATH.parent.mkdir(parents=True, exist_ok=True)
-    CONFIG_PATH.write_text(json.dumps(cfg, indent=2) + '\n')
-    CONFIG_PATH.chmod(stat.S_IRUSR | stat.S_IWUSR)  # 0600: token inside
+    with open(CONFIG_PATH.with_name(CONFIG_PATH.name + '.lock'), 'w') as fh:
+        fcntl.flock(fh, fcntl.LOCK_EX)
+        try:
+            yield
+        finally:
+            fcntl.flock(fh, fcntl.LOCK_UN)
 
 
 class Client:
@@ -56,21 +87,30 @@ class Client:
     def _refresh_access_token(self) -> bool:
         if not self.refresh or not self.refresh.get('refresh_token'):
             return False
-        r = _oauth_token_request(self.base, {
-            'grant_type': 'refresh_token',
-            'refresh_token': self.refresh['refresh_token'],
-            'client_id': self.refresh['client_id'],
-        })
-        if r is None:
-            return False
-        self.token = r['access_token']
-        self.refresh['refresh_token'] = r['refresh_token']
-        self.refresh['expires_at'] = time.time() + int(r.get('expires_in') or 3600)
-        cfg = _load_config()
-        cfg.update(access_token=self.token, refresh_token=self.refresh['refresh_token'],
-                   expires_at=self.refresh['expires_at'])
-        _save_config(cfg)
-        return True
+        with _refresh_lock():
+            # Another process may have refreshed while we waited for the lock:
+            # use its tokens instead of replaying our now-rotated refresh token.
+            cfg = _load_config()
+            if cfg.get('refresh_token') and cfg['refresh_token'] != self.refresh['refresh_token']:
+                self.token = cfg.get('access_token') or ''
+                self.refresh['refresh_token'] = cfg['refresh_token']
+                self.refresh['expires_at'] = cfg.get('expires_at', 0)
+                return True
+            r = _oauth_token_request(self.base, {
+                'grant_type': 'refresh_token',
+                'refresh_token': self.refresh['refresh_token'],
+                'client_id': self.refresh['client_id'],
+            })
+            if r is None:
+                return False
+            self.token = r['access_token']
+            self.refresh['refresh_token'] = r['refresh_token']
+            self.refresh['expires_at'] = time.time() + int(r.get('expires_in') or 3600)
+            cfg = _load_config()
+            cfg.update(access_token=self.token, refresh_token=self.refresh['refresh_token'],
+                       expires_at=self.refresh['expires_at'])
+            _save_config(cfg)
+            return True
 
     def request(self, method: str, path: str, **kw):
         if self.refresh and self.refresh.get('expires_at', 0) < time.time() + 30:
@@ -299,14 +339,20 @@ def cmd_tests(args):
     c = data['counts']
     print(f"build {data['build_id']} [{data['build_status']}] — "
           f"{c['error']} errors, {c['fail']} failures, {c['warning']} warnings")
+    loader_rows = 0
     for r in data['results']:
         if r['error_type'] not in ('ERROR', 'FAIL') and not args.warnings:
             continue
-        where = (f"{r['module']}.{r['test']}" if r.get('test') and r['test'] != 'Unknown'
-                 else '(module loading)')
+        is_test = bool(r.get('test')) and r['test'] != 'Unknown'
+        if not is_test and not args.details:
+            loader_rows += 1  # module-loading summaries: only interesting with --details
+            continue
+        where = f"{r['module']}.{r['test']}" if is_test else '(module loading)'
         print(f"\n[{r['error_type']}] {where}")
         if args.details:
             print(r['details'])
+    if loader_rows:
+        print(f"\n(+{loader_rows} module-loading message(s); use --details to see them)")
 
 
 def cmd_rebuild(args):
@@ -360,8 +406,15 @@ def cmd_logs(args):
         print(ln)
     if not args.follow:
         if args.filter:
-            print(f"... ({len(shown)} matching line(s) in the last {data.get('total_lines', '?')}; "
-                  f"raise --lines to search further back)", file=sys.stderr)
+            searched = data.get('searched_lines')
+            total = data.get('total_lines')
+            if searched and total and total > searched:
+                scope = f"the last {searched} of {total} lines"
+            elif searched or total:
+                scope = f"all {total or searched} lines"
+            else:
+                scope = 'the recent log'
+            print(f"... ({len(shown)} matching line(s) in {scope})", file=sys.stderr)
         elif data.get('truncated'):
             print(f"... (showing last {len(shown)} lines; use --lines to see more)", file=sys.stderr)
         return
@@ -560,7 +613,7 @@ def main(argv=None):
                     help='required when targeting production')
     sp.set_defaults(func=cmd_restart)
 
-    sp = sub.add_parser('logs', help='tail build logs (build, test or odoo source)')
+    sp = sub.add_parser('logs', help='tail build logs (build, test, or odoo source)')
     sp.add_argument('build_id', type=int)
     sp.add_argument('--source', choices=['build', 'test', 'odoo'], default='build')
     sp.add_argument('--lines', type=int, default=200, help='tail length (max 2000)')

{doploy_cli-0.2.2 → doploy_cli-0.2.5}/doploy_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doploy-cli
-Version: 0.2.2
+Version: 0.2.5
 Summary: doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal
 License: MIT
 Project-URL: Homepage, https://doploy.io

{doploy_cli-0.2.2 → doploy_cli-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "doploy-cli"
-version = "0.2.2"
+version = "0.2.5"
 description = "doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal"
 readme = "README.md"
 license = { text = "MIT" }