redeploy 0.2.18__tar.gz → 0.2.20__tar.gz

{redeploy-0.2.18 → redeploy-0.2.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redeploy
-Version: 0.2.18
+Version: 0.2.20
 Summary: Infrastructure migration toolkit: detect → plan → apply
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -27,17 +27,17 @@ Requires-Dist: pfix>=0.1.60; extra == "dev"
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.18-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$5.55-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-12.6h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.20-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$5.85-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-13.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $5.5500 (37 commits)
-- 👤 **Human dev:** ~$1255 (12.6h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.8500 (39 commits)
+- 👤 **Human dev:** ~$1337 (13.4h @ $100/h, 30min dedup)
 
 Generated on 2026-04-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.18-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.20-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.18 → redeploy-0.2.20}/README.md

@@ -3,17 +3,17 @@
 
 ## AI Cost Tracking
 
-![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.18-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
-![AI Cost](https://img.shields.io/badge/AI%20Cost-$5.55-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-12.6h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
+![PyPI](https://img.shields.io/badge/pypi-costs-blue) ![Version](https://img.shields.io/badge/version-0.2.20-blue) ![Python](https://img.shields.io/badge/python-3.9+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![AI Cost](https://img.shields.io/badge/AI%20Cost-$5.85-orange) ![Human Time](https://img.shields.io/badge/Human%20Time-13.4h-blue) ![Model](https://img.shields.io/badge/Model-openrouter%2Fqwen%2Fqwen3--coder--next-lightgrey)
 
-- 🤖 **LLM usage:** $5.5500 (37 commits)
-- 👤 **Human dev:** ~$1255 (12.6h @ $100/h, 30min dedup)
+- 🤖 **LLM usage:** $5.8500 (39 commits)
+- 👤 **Human dev:** ~$1337 (13.4h @ $100/h, 30min dedup)
 
 Generated on 2026-04-21 using [openrouter/qwen/qwen3-coder-next](https://openrouter.ai/qwen/qwen3-coder-next)
 
 ---
 
-![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.18-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
+![PyPI](https://img.shields.io/badge/pypi-redeploy-blue) ![Version](https://img.shields.io/badge/version-0.2.20-blue) ![Python](https://img.shields.io/badge/python-3.10+-blue) ![License](https://img.shields.io/badge/license-Apache--2.0-green)
 
 Infrastructure migration and device deploy toolkit — VPS, Raspberry Pi kiosk, Podman Quadlet, k3s.
 

{redeploy-0.2.18 → redeploy-0.2.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "redeploy"
-version = "0.2.18"
+version = "0.2.20"
 description = "Infrastructure migration toolkit: detect → plan → apply"
 readme = "README.md"
 requires-python = ">=3.11"

{redeploy-0.2.18 → redeploy-0.2.20}/redeploy/__init__.py

@@ -7,7 +7,7 @@ Public API (stable from 0.2.0, semver guaranteed)::
 
 Everything not listed in ``__all__`` is internal and may change without notice.
 """
-__version__ = "0.2.18"
+__version__ = "0.2.20"
 
 # ── Core models ───────────────────────────────────────────────────────────────
 from .models import (  # noqa: F401

{redeploy-0.2.18 → redeploy-0.2.20}/redeploy/apply/executor.py

@@ -194,14 +194,21 @@ class Executor:
             logger.info(f"resume: skipping {len(skip_ids)} already-completed step(s): "
                         f"{', '.join(sorted(skip_ids))}")
 
+        ok = self._execute_steps_loop(skip_ids)
+        elapsed = time.monotonic() - self._t0
+
+        self._handle_completion(ok, elapsed)
+        self._write_audit(ok=ok, elapsed_s=elapsed)
+        return ok
+
+    def _execute_steps_loop(self, skip_ids: set[str]) -> bool:
+        """Execute steps, handling skips and errors. Returns True if all passed."""
         ok = True
         for i, step in enumerate(self.plan.steps, 1):
             if step.id in skip_ids:
-                step.status = StepStatus.SKIPPED
-                step.result = "resumed: previously completed"
-                if self._emitter:
-                    self._emitter.step_done(i, step)
+                self._skip_step(i, step)
                 continue
+
             try:
                 if self._emitter:
                     self._emitter.step_start(i, step)
@@ -212,20 +219,33 @@ class Executor:
                 if self._emitter:
                     self._emitter.step_done(i, step)
             except StepError as e:
-                logger.error(f"Step failed: {e}")
-                step.status = StepStatus.FAILED
-                step.error = str(e)
-                if self._state is not None:
-                    self._state.mark_failed(step.id, str(e))
-                if self._emitter:
-                    self._emitter.step_fail(i, step, str(e))
-                    self._emitter.failed(len(self._completed), len(self.plan.steps), str(e))
-                if not self.dry_run:
-                    self._rollback()
+                self._handle_step_failure(i, step, e)
                 ok = False
                 break
+        return ok
 
-        elapsed = time.monotonic() - self._t0
+    def _skip_step(self, i: int, step: MigrationStep) -> None:
+        """Handle a skipped step due to resume."""
+        step.status = StepStatus.SKIPPED
+        step.result = "resumed: previously completed"
+        if self._emitter:
+            self._emitter.step_done(i, step)
+
+    def _handle_step_failure(self, i: int, step: MigrationStep, error: StepError) -> None:
+        """Handle a step failure."""
+        logger.error(f"Step failed: {error}")
+        step.status = StepStatus.FAILED
+        step.error = str(error)
+        if self._state is not None:
+            self._state.mark_failed(step.id, str(error))
+        if self._emitter:
+            self._emitter.step_fail(i, step, str(error))
+            self._emitter.failed(len(self._completed), len(self.plan.steps), str(error))
+        if not self.dry_run:
+            self._rollback()
+
+    def _handle_completion(self, ok: bool, elapsed: float) -> None:
+        """Handle plan completion or failure."""
         if ok:
             logger.info(f"{'[DRY RUN] ' if self.dry_run else ''}All {len(self.plan.steps)} steps completed")
             if self._emitter:
@@ -237,8 +257,6 @@ class Executor:
             if self._state is not None and self._state_path is not None:
                 logger.info(f"resume: checkpoint saved → {self._state_path} "
                             f"({self._state.completed_count}/{self._state.total_steps} done)")
-        self._write_audit(ok=ok, elapsed_s=elapsed)
-        return ok
 
     def _compute_skip_set(self) -> set[str]:
         """Determine which step ids should be skipped this run.
@@ -296,6 +314,7 @@ class Executor:
             StepAction.DOCKER_BUILD:        self._run_docker_build,
             StepAction.DOCKER_HEALTH_WAIT:  self._run_docker_health_wait,
             StepAction.CONTAINER_LOG_TAIL:  self._run_container_log_tail,
+            StepAction.PODMAN_BUILD:        self._run_podman_build,
             StepAction.SSH_CMD:             self._run_ssh,
             StepAction.SCP:                 self._run_scp,
             StepAction.RSYNC:               self._run_rsync,
@@ -403,6 +422,54 @@ class Executor:
         logger.debug(f"    build completed in {elapsed + poll_interval}s")
         step.status = StepStatus.DONE
 
+    def _run_podman_build(self, step: MigrationStep) -> None:
+        """Run podman build on remote with periodic progress polling."""
+        cmd = step.command
+        if not cmd:
+            raise StepError(step, "No command specified")
+
+        timeout = step.timeout or 1800  # 30 min default for ARM64 builds
+        poll_interval = 15              # seconds between progress snapshots
+        done_event = threading.Event()
+        result_holder: list = []
+
+        def _ssh_build() -> None:
+            r = self.probe.run(cmd, timeout=timeout)
+            result_holder.append(r)
+            done_event.set()
+
+        thread = threading.Thread(target=_ssh_build, daemon=True)
+        thread.start()
+
+        elapsed = 0
+        while not done_event.wait(timeout=poll_interval):
+            elapsed += poll_interval
+            snap = self.probe.run(
+                "podman system df 2>/dev/null | grep -E 'Image|Cache' | "
+                "awk '{print $1, $3, $4}'",
+                timeout=10,
+            )
+            if snap.ok and snap.out.strip():
+                lines = " | ".join(snap.out.strip().splitlines())
+                msg = f"[{elapsed}s] podman cache: {lines}"
+                logger.debug(f"    {msg}")
+                if self._emitter:
+                    self._emitter.progress(step.id, msg)
+            else:
+                msg = f"[{elapsed}s] podman build in progress..."
+                logger.debug(f"    {msg}")
+                if self._emitter:
+                    self._emitter.progress(step.id, msg)
+
+        if not result_holder:
+            raise StepError(step, "Podman build thread did not return a result")
+        r = result_holder[0]
+        step.result = r.out[:500]
+        if not r.ok:
+            raise StepError(step, f"exit={r.exit_code}: {r.stderr[:300]}")
+        logger.debug(f"    podman build completed in {elapsed + poll_interval}s")
+        step.status = StepStatus.DONE
+
     def _run_docker_health_wait(self, step: MigrationStep) -> None:
         """Wait until all containers reach 'healthy' or 'running' status.
 
@@ -421,27 +488,14 @@ class Executor:
         while elapsed < timeout:
             r = self.probe.run(cmd, timeout=20)
             if r.ok and r.out.strip():
-                lines = r.out.strip().splitlines()
-                # Parse simple table: Name | Status
-                statuses = []
-                for line in lines:
-                    if line.startswith("NAME") or not line.strip():
-                        continue
-                    parts = line.split(None, 1)
-                    name = parts[0] if parts else "?"
-                    status = parts[1].strip() if len(parts) > 1 else "?"
-                    statuses.append((name, status))
-
+                statuses = self._parse_container_statuses(r.out)
                 status_str = ", ".join(f"{n}:{s}" for n, s in statuses)
+                
                 if status_str != last_status:
                     logger.debug(f"    [{elapsed}s] containers: {status_str}")
                     last_status = status_str
 
-                unhealthy = [
-                    n for n, s in statuses
-                    if not any(kw in s.lower() for kw in ("up", "running", "healthy"))
-                ]
-                if statuses and not unhealthy:
+                if self._all_containers_healthy(statuses):
                     step.status = StepStatus.DONE
                     step.result = f"all containers healthy after {elapsed}s: {status_str}"
                     logger.debug(f"    ✓ all containers healthy ({elapsed}s)")
@@ -457,6 +511,29 @@ class Executor:
         step.result = f"timeout {timeout}s reached, last: {last_status or 'unknown'}"
         logger.warning(f"    docker_health_wait timed out after {timeout}s — proceeding to health check")
 
+    def _parse_container_statuses(self, output: str) -> list[tuple[str, str]]:
+        """Parse docker compose ps output into (name, status) tuples."""
+        lines = output.strip().splitlines()
+        statuses = []
+        for line in lines:
+            if line.startswith("NAME") or not line.strip():
+                continue
+            parts = line.split(None, 1)
+            name = parts[0] if parts else "?"
+            status = parts[1].strip() if len(parts) > 1 else "?"
+            statuses.append((name, status))
+        return statuses
+
+    def _all_containers_healthy(self, statuses: list[tuple[str, str]]) -> bool:
+        """Check if all containers are in a healthy/running state."""
+        if not statuses:
+            return False
+        unhealthy = [
+            n for n, s in statuses
+            if not any(kw in s.lower() for kw in ("up", "running", "healthy"))
+        ]
+        return not unhealthy
+
     def _run_container_log_tail(self, step: MigrationStep) -> None:
         """Fetch and log the last N lines from each container after start."""
         cmd = step.command

{redeploy-0.2.18 → redeploy-0.2.20}/redeploy/audit.py

@@ -500,36 +500,23 @@ class Auditor:
     def _probe_one(self, exp: _Expect) -> AuditCheck:
         cat = exp.category
         if cat == "binary":
-            ok, detail = self.probe.has_binary(exp.name)
+            return self._probe_binary(exp)
         elif cat == "directory":
-            ok, detail = self.probe.has_path(exp.name, kind="dir")
+            return self._probe_directory(exp)
         elif cat == "file":
-            ok, detail = self.probe.has_path(exp.name, kind="file")
+            return self._probe_file(exp)
         elif cat == "local_file":
-            local_ok = Path(exp.name).expanduser().exists()
-            return AuditCheck(
-                category=cat, name=exp.name,
-                status="pass" if local_ok else "fail",
-                detail="present" if local_ok else "missing on controller",
-                fix_hint=exp.fix_hint, source_step=exp.source_step,
-            )
+            return self._probe_local_file(exp)
         elif cat == "port_listening":
-            ok, detail = self.probe.port_listening(int(exp.name))
+            return self._probe_port_listening(exp)
         elif cat == "container_image":
-            ok, detail = self.probe.has_image(exp.name)
-            # built-by-spec images: missing = "warn" not "fail"
-            return AuditCheck(
-                category=cat, name=exp.name,
-                status="pass" if ok else "warn",
-                detail=detail or ("present" if ok else "will be built by step"),
-                fix_hint=exp.fix_hint, source_step=exp.source_step,
-            )
+            return self._probe_container_image(exp)
         elif cat == "systemd_unit":
-            ok, detail = self.probe.has_systemd_unit(exp.name, user=False)
+            return self._probe_systemd_unit(exp, user=False)
         elif cat == "systemd_user_unit":
-            ok, detail = self.probe.has_systemd_unit(exp.name, user=True)
+            return self._probe_systemd_unit(exp, user=True)
         elif cat == "apt_package":
-            ok, detail = self.probe.apt_package(exp.name)
+            return self._probe_apt_package(exp)
         else:
             return AuditCheck(
                 category=cat, name=exp.name,
@@ -537,8 +524,74 @@ class Auditor:
                 source_step=exp.source_step,
             )
 
+    def _probe_binary(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.has_binary(exp.name)
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_directory(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.has_path(exp.name, kind="dir")
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_file(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.has_path(exp.name, kind="file")
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_local_file(self, exp: _Expect) -> AuditCheck:
+        local_ok = Path(exp.name).expanduser().exists()
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if local_ok else "fail",
+            detail="present" if local_ok else "missing on controller",
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_port_listening(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.port_listening(int(exp.name))
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_container_image(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.has_image(exp.name)
+        # built-by-spec images: missing = "warn" not "fail"
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "warn",
+            detail=detail or ("present" if ok else "will be built by step"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_systemd_unit(self, exp: _Expect, user: bool) -> AuditCheck:
+        ok, detail = self.probe.has_systemd_unit(exp.name, user=user)
+        return AuditCheck(
+            category=exp.category, name=exp.name,
+            status="pass" if ok else "fail",
+            detail=detail or ("present" if ok else "missing"),
+            fix_hint=exp.fix_hint, source_step=exp.source_step,
+        )
+
+    def _probe_apt_package(self, exp: _Expect) -> AuditCheck:
+        ok, detail = self.probe.apt_package(exp.name)
         return AuditCheck(
-            category=cat, name=exp.name,
+            category=exp.category, name=exp.name,
             status="pass" if ok else "fail",
             detail=detail or ("present" if ok else "missing"),
             fix_hint=exp.fix_hint, source_step=exp.source_step,

redeploy-0.2.20/redeploy/cli/__init__.py

@@ -0,0 +1,66 @@
+"""redeploy CLI — detect | plan | apply | migrate."""
+from __future__ import annotations
+
+import sys
+
+import click
+from loguru import logger
+
+from .. import __version__
+
+
+def _setup_logging(verbose: bool) -> None:
+    logger.remove()
+    level = "DEBUG" if verbose else "INFO"
+    logger.add(
+        sys.stderr,
+        level=level,
+        format="<green>{time:HH:mm:ss}</green> | <level>{level:<7}</level> | {message}",
+    )
+
+
+@click.group()
+@click.version_option(__version__)
+@click.option("-v", "--verbose", is_flag=True)
+@click.pass_context
+def cli(ctx, verbose):
+    """redeploy — Infrastructure migration toolkit: detect → plan → apply"""
+    _setup_logging(verbose)
+    ctx.ensure_object(dict)
+    ctx.obj["verbose"] = verbose
+
+
+# Import and register all commands
+from .commands import detect, diagnose, inspect, workflow, export, plugin
+from .commands import exec_, plan_apply, state, init, status, devices, target, probe
+from .commands import import_, diff, audit, patterns, version as version_cmd
+
+# Register commands
+cli.add_command(detect.detect)
+cli.add_command(diagnose.diagnose)
+cli.add_command(inspect.inspect)
+cli.add_command(workflow.workflow_cmd)
+cli.add_command(export.export_cmd)
+cli.add_command(plugin.plugin_cmd)
+cli.add_command(exec_.exec_cmd)
+cli.add_command(exec_.exec_multi_cmd)
+cli.add_command(plan_apply.plan)
+cli.add_command(plan_apply.apply)
+cli.add_command(plan_apply.migrate)
+cli.add_command(plan_apply.run)
+cli.add_command(state.state_cmd)
+cli.add_command(init.init)
+cli.add_command(status.status)
+cli.add_command(devices.devices)
+cli.add_command(devices.scan)
+cli.add_command(devices.device_add)
+cli.add_command(devices.device_rm)
+cli.add_command(target.target)
+cli.add_command(probe.probe)
+cli.add_command(import_.import_cmd)
+cli.add_command(diff.diff)
+cli.add_command(audit.audit)
+cli.add_command(patterns.patterns)
+cli.add_command(version_cmd.version_cmd)
+
+__all__ = ["cli"]