procd 1.0.2__tar.gz → 1.0.3__tar.gz

{procd-1.0.2 → procd-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: procd
-Version: 1.0.2
+Version: 1.0.3
 Summary: The Native Stack Runner. Orchestration Without Containers.
 Keywords: 
 Author: alpine

{procd-1.0.2 → procd-1.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "procd"
-version = "1.0.2"
+version = "1.0.3"
 description = "The Native Stack Runner. Orchestration Without Containers."
 readme = "README_PYPI.md"
 license = "MIT"

{procd-1.0.2 → procd-1.0.3}/src/procd/cli.py

@@ -180,6 +180,10 @@ def cmd_up(args: argparse.Namespace) -> None:
     conf = _load(args)
     targets = _resolve_services(args.names, conf) if args.names else _default_services(conf)
 
+    if args.follow:
+        _up_follow(args, conf, targets)
+        return
+
     if args.detach:
         # detach: 従来通り _logger サブプロセスで JSONL に書き続ける
         procs: list[tuple[str, subprocess.Popen]] = []
@@ -277,6 +281,78 @@ def cmd_up(args: argparse.Namespace) -> None:
         shutdown()
 
 
+def _up_follow(args: argparse.Namespace, conf: cfg.Config, targets: list[str]) -> None:
+    """detach 起動してから jsonl ログをフォローし、終了時にそのサービスも停止する。"""
+    jsonl = process.jsonl_path()
+    log_start_pos = jsonl.stat().st_size if jsonl.exists() else 0
+
+    started_names: list[str] = []
+    for i, name in enumerate(targets):
+        if process.is_running(name):
+            print(f"[{name}] already running (pid {process.read_pid(name)})")
+            continue
+        svc = conf.services[name]
+        color = process.COLORS[i % len(process.COLORS)]
+        print(f"{color}[{name}]{process.RESET} Starting...")
+        process.start(name, svc, detach=True, project_dir=conf.project_dir, verbose=args.verbose)
+        started_names.append(name)
+    for name in started_names:
+        svc = conf.services[name]
+        i = list(conf.services.keys()).index(name)
+        color = process.COLORS[i % len(process.COLORS)]
+        result = process.wait_ready(name, svc, project_dir=conf.project_dir)
+        if result is None:
+            print(f"{color}[{name}]{process.RESET} Process exited immediately.", file=sys.stderr)
+        elif result:
+            print(f"{color}[{name}]{process.RESET} Ready (pid {process.read_pid(name)})")
+        else:
+            print(f"{color}[{name}]{process.RESET} Timed out waiting for ready", file=sys.stderr)
+
+    def _shutdown_started() -> None:
+        if not started_names:
+            return
+        print("\nStopping services...")
+        for name in reversed(started_names):
+            if process.stop(name):
+                print(f"  Stopped {name}")
+
+    if not jsonl.exists():
+        if not started_names:
+            _err_console.print("[yellow]no logs found[/yellow]")
+            return
+        deadline = time.time() + 5
+        while not jsonl.exists() and time.time() < deadline:
+            time.sleep(0.1)
+        if not jsonl.exists():
+            process.LOG_DIR.mkdir(parents=True, exist_ok=True)
+            jsonl.touch()
+
+    def _fmt(entry: dict) -> str:
+        s = entry.get("s", "?")
+        color = process.COLORS[list(conf.services).index(s) % len(process.COLORS)] if s in conf.services else ""
+        ts = f" {entry.get('t','')[:23]} " if args.timestamp else ""
+        return f"{color}[{s}]{process.RESET}{ts} {entry.get('m','')}"
+
+    try:
+        with open(jsonl, encoding="utf-8") as f:
+            f.seek(log_start_pos)
+            while True:
+                line = f.readline()
+                if line:
+                    try:
+                        entry = json.loads(line)
+                    except json.JSONDecodeError:
+                        continue
+                    print(_fmt(entry))
+                    sys.stdout.flush()
+                else:
+                    time.sleep(0.05)
+    except KeyboardInterrupt:
+        pass
+    finally:
+        _shutdown_started()
+
+
 def cmd_down(args: argparse.Namespace) -> None:
     conf = _load(args)
     targets = _resolve_services(args.names, conf) if args.names else _default_services(conf)
@@ -337,59 +413,13 @@ def cmd_logs(args: argparse.Namespace) -> None:
         ts = f" {entry.get('t','')[:23]} " if args.timestamp else ""
         return f"{color}[{s}]{process.RESET}{ts} {entry.get('m','')}"
 
-    # --up: サービスを起動してからログをフォローし、終了時にサービスも停止する
-    started_names: list[str] = []
-    # 起動前のログ末尾位置を記録して古いログを表示しない
-    log_start_pos: int = jsonl.stat().st_size if jsonl.exists() else 0
-
-    if getattr(args, "up", None) is not None:
-        targets = _resolve_services(args.up, conf) if args.up else _default_services(conf)
-        for i, name in enumerate(targets):
-            if process.is_running(name):
-                print(f"[{name}] already running (pid {process.read_pid(name)})")
-                continue
-            svc = conf.services[name]
-            color = process.COLORS[i % len(process.COLORS)]
-            print(f"{color}[{name}]{process.RESET} Starting...")
-            process.start(name, svc, detach=True, project_dir=conf.project_dir, verbose=args.verbose)
-            started_names.append(name)
-        for name in started_names:
-            svc = conf.services[name]
-            i = list(conf.services.keys()).index(name)
-            color = process.COLORS[i % len(process.COLORS)]
-            result = process.wait_ready(name, svc, project_dir=conf.project_dir)
-            if result is None:
-                print(f"{color}[{name}]{process.RESET} Process exited immediately.", file=sys.stderr)
-            elif result:
-                print(f"{color}[{name}]{process.RESET} Ready (pid {process.read_pid(name)})")
-            else:
-                print(f"{color}[{name}]{process.RESET} Timed out waiting for ready", file=sys.stderr)
-        args.follow = True
-
-    def _shutdown_started() -> None:
-        if not started_names:
-            return
-        print("\nStopping services...")
-        for name in reversed(started_names):
-            if process.stop(name):
-                print(f"  Stopped {name}")
-
     if args.follow:
-        # --up でサービスを起動した場合はログファイルが存在するまで少し待つ
         if not jsonl.exists():
-            if not started_names:
-                _err_console.print("[yellow]no logs found — run 'procd up -d' first[/yellow]")
-                return
-            deadline = time.time() + 5
-            while not jsonl.exists() and time.time() < deadline:
-                time.sleep(0.1)
-            if not jsonl.exists():
-                process.LOG_DIR.mkdir(parents=True, exist_ok=True)
-                jsonl.touch()
+            _err_console.print("[yellow]no logs found — run 'procd up -d' first[/yellow]")
+            return
         try:
             with open(jsonl, encoding="utf-8") as f:
-                # --up で起動した場合は起動前の末尾から、通常は最新末尾からフォロー
-                f.seek(log_start_pos if started_names else 0, 0 if started_names else 2)
+                f.seek(0, 2)  # 末尾からフォロー
                 while True:
                     line = f.readline()
                     if line:
@@ -401,8 +431,6 @@ def cmd_logs(args: argparse.Namespace) -> None:
                         time.sleep(0.05)
         except KeyboardInterrupt:
             pass
-        finally:
-            _shutdown_started()
     else:
         if not jsonl.exists():
             return
@@ -589,10 +617,10 @@ def cmd_link(args: argparse.Namespace) -> None:
     conf = _load(args)
     project_dir = conf.project_dir
 
-    if args.logs_up is not None:
-        names = " ".join(args.logs_up)
-        procd_sub = f"logs --up{' ' + names if names else ''}"
-        shortcut_name = f"procd logs --up{' ' + names if names else ''}"
+    if args.up_follow is not None:
+        names = " ".join(args.up_follow)
+        procd_sub = f"up --follow{' ' + names if names else ''}"
+        shortcut_name = f"procd up --follow{' ' + names if names else ''}"
     elif args.up is not None:
         names = " ".join(args.up)
         procd_sub = f"up{' ' + names if names else ''}"
@@ -632,7 +660,11 @@ def build_parser() -> argparse.ArgumentParser:
     # up
     p = sub.add_parser("up", help="サービスを起動する")
     p.add_argument("names", nargs="*", metavar="NAME")
-    p.add_argument("-d", "--detach", action="store_true", help="バックグラウンド起動")
+    group = p.add_mutually_exclusive_group()
+    group.add_argument("-d", "--detach", action="store_true", help="バックグラウンド起動")
+    group.add_argument("-f", "--follow", action="store_true",
+                       help="バックグラウンド起動してログをフォローし、終了時にサービスも停止する")
+    p.add_argument("-t", "--timestamp", action="store_true", help="--follow 時にタイムスタンプを表示する")
     p.set_defaults(func=cmd_up)
 
     # down
@@ -655,8 +687,6 @@ def build_parser() -> argparse.ArgumentParser:
     p.add_argument("-f", "--follow", action="store_true", help="tail -f スタイルで追跡")
     p.add_argument("-n", "--lines", type=int, default=200, metavar="N", help="表示する行数（デフォルト: 200）")
     p.add_argument("-t", "--timestamp", action="store_true", help="タイムスタンプを表示する")
-    p.add_argument("--up", nargs="*", metavar="NAME",
-                   help="サービスを起動してからログをフォローし、終了時にサービスも停止する")
     p.set_defaults(func=cmd_logs)
 
     # run
@@ -684,8 +714,8 @@ def build_parser() -> argparse.ArgumentParser:
     group = p.add_mutually_exclusive_group(required=True)
     group.add_argument("--up", nargs="*", metavar="NAME",
                        help="procd up のショートカット（NAME 省略で default グループ）")
-    group.add_argument("--logs-up", nargs="*", metavar="NAME", dest="logs_up",
-                       help="procd logs --up のショートカット（NAME 省略で default グループ）")
+    group.add_argument("--up-follow", nargs="*", metavar="NAME", dest="up_follow",
+                       help="procd up --follow のショートカット（NAME 省略で default グループ）")
     group.add_argument("--run", metavar="NAME",
                        help="procd run <NAME> のショートカット")
     p.add_argument("--icon", metavar="FILE", help="アイコンファイル (.ico / .icns)")