procd 1.0.2__tar.gz → 1.0.4__tar.gz

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

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

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

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

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

@@ -50,10 +50,16 @@ def _resolve_services(names: list[str], conf: cfg.Config) -> list[str]:
     return result
 
 
-def _default_services(conf: cfg.Config) -> list[str]:
+def _default_services(conf: cfg.Config) -> list[str] | None:
+    """default グループのサービス一覧。未定義なら None。"""
     if "default" in conf.groups:
         return conf.groups["default"].services
-    return list(conf.services.keys())
+    return None
+
+
+def _no_default_group(conf: cfg.Config) -> None:
+    _console.print("[yellow]No 'default' group defined. Specify NAME, or define \\[group.default].[/yellow]")
+    _print_list(conf)
 
 
 # " < file"  " > file"  " >> file" を検出する（スペース区切りで誤検出を防ぐ）
@@ -178,7 +184,17 @@ def _run_step(step: str, conf: cfg.Config, extra_env: dict[str, str] | None = No
 
 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.names:
+        targets = _resolve_services(args.names, conf)
+    else:
+        targets = _default_services(conf)
+        if targets is None:
+            _no_default_group(conf)
+            return
+
+    if args.follow:
+        _up_follow(args, conf, targets)
+        return
 
     if args.detach:
         # detach: 従来通り _logger サブプロセスで JSONL に書き続ける
@@ -199,6 +215,7 @@ def cmd_up(args: argparse.Namespace) -> None:
             color = process.COLORS[i % len(process.COLORS)]
             result = process.wait_ready(name, svc, project_dir=conf.project_dir)
             if result is None:
+                process.clear_pid(name)
                 print(f"{color}[{name}]{process.RESET} Process exited immediately. Last log:", file=sys.stderr)
                 tail = process.tail_log(name)
                 if tail:
@@ -277,9 +294,93 @@ 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:
+            process.clear_pid(name)
+            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)
+    if args.all:
+        if args.names:
+            _err_console.print("[bold red]Error:[/bold red] NAME と --all は同時に指定できません")
+            sys.exit(1)
+        targets = list(conf.services.keys())
+    elif args.names:
+        targets = _resolve_services(args.names, conf)
+    else:
+        targets = _default_services(conf)
+        if targets is None:
+            _no_default_group(conf)
+            return
     for name in reversed(targets):
         if process.stop(name):
             print(f"Stopped {name}")
@@ -289,7 +390,13 @@ def cmd_down(args: argparse.Namespace) -> None:
 
 def cmd_restart(args: argparse.Namespace) -> None:
     conf = _load(args)
-    targets = _resolve_services(args.names, conf) if args.names else _default_services(conf)
+    if args.names:
+        targets = _resolve_services(args.names, conf)
+    else:
+        targets = _default_services(conf)
+        if targets is None:
+            _no_default_group(conf)
+            return
     for name in reversed(targets):
         process.stop(name)
     for i, name in enumerate(targets):
@@ -337,59 +444,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 +462,6 @@ def cmd_logs(args: argparse.Namespace) -> None:
                         time.sleep(0.05)
         except KeyboardInterrupt:
             pass
-        finally:
-            _shutdown_started()
     else:
         if not jsonl.exists():
             return
@@ -461,24 +520,42 @@ def cmd_run(args: argparse.Namespace) -> None:
 
 def cmd_list(args: argparse.Namespace) -> None:
     conf = _load(args)
+    _print_list(conf)
 
-    if conf.services:
-        _console.print("[bold]Services[/bold]")
-        for name in conf.services:
-            _console.print(f"  [cyan]{name}[/cyan]")
-        _console.print()
 
-    if conf.groups:
-        _console.print("[bold]Groups[/bold]")
-        max_len = max(len(n) for n in conf.groups)
-        for name, grp in conf.groups.items():
-            members = ", ".join(grp.services)
-            _console.print(f"  [cyan]{name:<{max_len}}[/cyan]  [dim]{members}[/dim]")
-        _console.print()
+def _print_list(conf: cfg.Config) -> None:
+    if not conf.services and not conf.groups:
+        return
+    from rich.table import Table
+    table = Table(show_header=True, header_style="bold")
+    table.add_column("NAME", style="cyan")
+    table.add_column("TYPE")
+    table.add_column("SERVICES")
+    for name in conf.services:
+        table.add_row(name, "service", "")
+    for name, grp in conf.groups.items():
+        table.add_row(name, "group", ", ".join(grp.services))
+    _console.print(table)
 
 
 def cmd_get(args: argparse.Namespace) -> None:
     conf = _load(args)
+    if not args.names:
+        if not conf.downloads:
+            _console.print("[yellow]No downloads defined in procd.toml.[/yellow]")
+            return
+        from rich.table import Table
+        table = Table(show_header=True, header_style="bold")
+        table.add_column("NAME", style="cyan")
+        table.add_column("STATUS")
+        for name in conf.downloads:
+            if dl_mod.is_installed(name, conf):
+                status = "[green]installed[/green]"
+            else:
+                status = "[red]not installed[/red]"
+            table.add_row(name, status)
+        _console.print(table)
+        return
     unknown = [n for n in args.names if n not in conf.downloads]
     if unknown:
         for n in unknown:
@@ -490,6 +567,55 @@ def cmd_get(args: argparse.Namespace) -> None:
         dl_mod.do_get_parallel(args.names, conf, force=args.force)
 
 
+def _print_clean_preview(conf: cfg.Config) -> None:
+    stale = process.stale_pid_names()
+    if stale:
+        _console.print("[bold]Stale PID files[/bold] ([dim]--pids で削除[/dim])")
+        for name in stale:
+            _console.print(f"  [cyan]{name}[/cyan]")
+    else:
+        _console.print("[dim]No stale PID files.[/dim]")
+    _console.print()
+    installed = [n for n in conf.downloads if dl_mod.is_installed(n, conf)]
+    if installed:
+        _console.print("[bold]Downloaded[/bold] ([dim]--downloads で削除[/dim])")
+        for name in installed:
+            _console.print(f"  [cyan]{name}[/cyan]")
+    else:
+        _console.print("[dim]No downloaded files.[/dim]")
+
+
+def cmd_clean(args: argparse.Namespace) -> None:
+    conf = _load(args)
+    do_pids = args.all or args.pids
+    do_downloads = args.all or args.downloads is not None
+
+    if not do_pids and not do_downloads:
+        _print_clean_preview(conf)
+        return
+
+    if do_pids:
+        stale = process.stale_pid_names()
+        if not stale:
+            print("No stale PID files.")
+        for name in stale:
+            process.clear_pid(name)
+            print(f"Removed stale pid file: {name}")
+
+    if do_downloads:
+        names = args.downloads if (not args.all and args.downloads) else list(conf.downloads.keys())
+        unknown = [n for n in names if n not in conf.downloads]
+        if unknown:
+            for n in unknown:
+                _err_console.print(f"[bold red]Error:[/bold red] unknown opt: {n}")
+            sys.exit(1)
+        for name in names:
+            if dl_mod.remove(name, conf):
+                print(f"Removed download: {name}")
+            else:
+                print(f"{name} was not downloaded")
+
+
 _INIT_TEMPLATE = '''\
 # ============================================================
 # Procd ローカルサービス定義
@@ -589,10 +715,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,12 +758,17 @@ 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
     p = sub.add_parser("down", help="サービスを停止する")
     p.add_argument("names", nargs="*", metavar="NAME")
+    p.add_argument("-a", "--all", action="store_true", help="default グループの定義に関わらず全サービスを停止する")
     p.set_defaults(func=cmd_down)
 
     # restart
@@ -655,8 +786,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
@@ -675,17 +804,26 @@ def build_parser() -> argparse.ArgumentParser:
 
     # get
     p = sub.add_parser("get", help="[opt.*] をダウンロード・展開する")
-    p.add_argument("names", nargs="+", metavar="NAME")
+    p.add_argument("names", nargs="*", metavar="NAME",
+                   help="ダウンロードする opt 名（省略時は一覧を表示する）")
     p.add_argument("--force", action="store_true", help="既存でも強制的に再ダウンロードする")
     p.set_defaults(func=cmd_get)
 
+    # clean
+    p = sub.add_parser("clean", help="stale な pid ファイルやダウンロード済みファイルを削除する")
+    p.add_argument("--pids", action="store_true", help="動いていないプロセスの pid ファイルを削除する")
+    p.add_argument("--downloads", nargs="*", metavar="NAME",
+                   help="ダウンロード済みファイルを削除する（NAME 省略で全件）")
+    p.add_argument("--all", action="store_true", help="--pids と --downloads の両方を実行する")
+    p.set_defaults(func=cmd_clean)
+
     # link
     p = sub.add_parser("link", help="デスクトップショートカットを作成する")
     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)")

{procd-1.0.2 → procd-1.0.4}/src/procd/download.py

@@ -5,6 +5,7 @@ cli.cmd_get と builtin._do_get の両方から呼ばれる。
 from __future__ import annotations
 
 import hashlib
+import shutil
 import stat
 import sys
 import tarfile
@@ -43,6 +44,25 @@ def _already_exists(dl: "DownloadConfig", dest: Path, url_lower: str) -> bool:
     return (dest / Path(dl.url.split("?")[0]).name).exists()
 
 
+def is_installed(name: str, conf: "Config") -> bool:
+    """opt.<name> が展開済み（ダウンロード済み）かどうかを返す。"""
+    dl = conf.downloads[name]
+    dest = Path(dl.dest)
+    if not dest.exists():
+        return False
+    url_lower = dl.url.lower().split("?")[0]
+    return _already_exists(dl, dest, url_lower)
+
+
+def remove(name: str, conf: "Config") -> bool:
+    """opt.<name> の展開先ディレクトリを削除する。存在しなければ False。"""
+    dest = Path(conf.downloads[name].dest)
+    if not dest.exists():
+        return False
+    shutil.rmtree(dest)
+    return True
+
+
 def _finalize(name: str, dl: "DownloadConfig", tmp: Path, dest: Path, url_lower: str) -> None:
     """verify → extract/rename → 後処理。do_get / do_get_parallel の共通後半処理。"""
     _verify_checksum(tmp, dl.checksum, name)

{procd-1.0.2 → procd-1.0.4}/src/procd/process.py

@@ -60,30 +60,63 @@ def _append_jsonl(name: str, message: str) -> None:
 
 def write_pid(name: str, pid: int) -> None:
     RUN_DIR.mkdir(parents=True, exist_ok=True)
-    pid_path(name).write_text(str(pid))
+    try:
+        create_time = psutil.Process(pid).create_time()
+    except psutil.NoSuchProcess:
+        create_time = 0.0
+    pid_path(name).write_text(f"{pid}:{create_time}")
 
 
-def read_pid(name: str) -> int | None:
+def _read_pid_file(name: str) -> tuple[int, float | None] | None:
+    """pid ファイルを (pid, create_time) で読む。旧形式（PID のみ）なら create_time は None。"""
     p = pid_path(name)
     if not p.exists():
         return None
+    text = p.read_text().strip()
     try:
-        return int(p.read_text().strip())
+        if ":" in text:
+            pid_str, ct_str = text.split(":", 1)
+            return int(pid_str), float(ct_str)
+        return int(text), None
     except ValueError:
         return None
 
 
+def read_pid(name: str) -> int | None:
+    parsed = _read_pid_file(name)
+    return parsed[0] if parsed else None
+
+
 def clear_pid(name: str) -> None:
     p = pid_path(name)
     if p.exists():
         p.unlink()
 
 
+def stale_pid_names() -> list[str]:
+    """var/run/*.pid のうち、対応するプロセスが実際には動いていない名前一覧。"""
+    if not RUN_DIR.exists():
+        return []
+    return [p.stem for p in sorted(RUN_DIR.glob("*.pid")) if not is_running(p.stem)]
+
+
+def _is_same_process(pid: int, create_time: float | None) -> bool:
+    """PID が存在し、記録した起動時刻と一致するか（PID 再利用検出）。"""
+    if not psutil.pid_exists(pid):
+        return False
+    if create_time is None:
+        return True  # 旧形式の pid ファイル: create_time 比較をスキップ
+    try:
+        return abs(psutil.Process(pid).create_time() - create_time) < 1
+    except psutil.NoSuchProcess:
+        return False
+
+
 def is_running(name: str) -> bool:
-    pid = read_pid(name)
-    if pid is None:
+    parsed = _read_pid_file(name)
+    if parsed is None:
         return False
-    return psutil.pid_exists(pid)
+    return _is_same_process(*parsed)
 
 
 # ---------- プロセス起動・停止 ----------
@@ -205,11 +238,12 @@ def _kill_tree(pid: int) -> None:
 
 
 def stop(name: str) -> bool:
-    """PID ファイルを元にプロセスを停止する。既に停止済みなら False を返す。"""
-    pid = read_pid(name)
-    if pid is None:
+    """PID ファイルを元にプロセスを停止する。既に停止済み、または PID が別プロセスに再利用されている場合は False を返す。"""
+    parsed = _read_pid_file(name)
+    if parsed is None:
         return False
-    if not psutil.pid_exists(pid):
+    pid, create_time = parsed
+    if not _is_same_process(pid, create_time):
         clear_pid(name)
         return False
     _kill_tree(pid)
@@ -246,9 +280,8 @@ def wait_ready(name: str, svc: "ServiceConfig", timeout: int = 30, project_dir:
         port = int(port_str)
         deadline = time.time() + timeout
         while time.time() < deadline:
-            pid = read_pid(name)
-            if pid is not None and not psutil.pid_exists(pid):
-                return None  # 起動直後にクラッシュ
+            if not is_running(name):
+                return None  # 起動直後にクラッシュ（または PID が別プロセスに再利用された）
             try:
                 with socket.create_connection((host, port), timeout=1):
                     return True