clonebox 1.1.14__py3-none-any.whl → 1.1.15__py3-none-any.whl

clonebox/validator.py

@@ -34,13 +34,21 @@ class VMValidator:
         self.results = {
             "mounts": {"passed": 0, "failed": 0, "total": 0, "details": []},
             "packages": {"passed": 0, "failed": 0, "total": 0, "details": []},
-            "snap_packages": {"passed": 0, "failed": 0, "total": 0, "details": []},
+            "snap_packages": {
+                "passed": 0,
+                "failed": 0,
+                "skipped": 0,
+                "total": 0,
+                "details": [],
+            },
             "services": {"passed": 0, "failed": 0, "total": 0, "details": []},
-            "apps": {"passed": 0, "failed": 0, "total": 0, "details": []},
-            "smoke": {"passed": 0, "failed": 0, "total": 0, "details": []},
+            "apps": {"passed": 0, "failed": 0, "skipped": 0, "total": 0, "details": []},
+            "smoke": {"passed": 0, "failed": 0, "skipped": 0, "total": 0, "details": []},
             "overall": "unknown",
         }
 
+        self._setup_in_progress_cache: Optional[bool] = None
+
     def _exec_in_vm(self, command: str, timeout: int = 10) -> Optional[str]:
         """Execute command in VM using QEMU guest agent."""
         try:
@@ -105,14 +113,32 @@ class VMValidator:
         except Exception:
             return None
 
+    def _setup_in_progress(self) -> Optional[bool]:
+        if self._setup_in_progress_cache is not None:
+            return self._setup_in_progress_cache
+
+        out = self._exec_in_vm(
+            "test -f /var/lib/cloud/instance/boot-finished && echo no || echo yes",
+            timeout=10,
+        )
+        if out is None:
+            self._setup_in_progress_cache = None
+            return None
+
+        self._setup_in_progress_cache = out.strip() == "yes"
+        return self._setup_in_progress_cache
+
     def validate_mounts(self) -> Dict:
         """Validate all mount points and copied data paths."""
         self.console.print("\n[bold]💾 Validating Mounts & Data...[/]")
 
         paths = self.config.get("paths", {})
-        app_data_paths = self.config.get("app_data_paths", {})
+        # Support both v1 (app_data_paths) and v2 (copy_paths) config formats
+        copy_paths = self.config.get("copy_paths", None)
+        if not isinstance(copy_paths, dict) or not copy_paths:
+            copy_paths = self.config.get("app_data_paths", {})
 
-        if not paths and not app_data_paths:
+        if not paths and not copy_paths:
             self.console.print("[dim]No mounts or data paths configured[/]")
             return self.results["mounts"]
 
@@ -171,8 +197,8 @@ class VMValidator:
                 "status": status
             })
 
-        # Validate copied paths (app_data_paths)
-        for host_path, guest_path in app_data_paths.items():
+        # Validate copied paths (copy_paths / app_data_paths)
+        for host_path, guest_path in copy_paths.items():
             self.results["mounts"]["total"] += 1
             
             # Check if exists and has content
@@ -270,6 +296,8 @@ class VMValidator:
         snap_table.add_column("Status", justify="center")
         snap_table.add_column("Version", style="dim")
 
+        setup_in_progress = self._setup_in_progress() is True
+
         for package in snap_packages:
             self.results["snap_packages"]["total"] += 1
 
@@ -284,16 +312,29 @@ class VMValidator:
                     {"package": package, "installed": True, "version": version}
                 )
             else:
-                snap_table.add_row(package, "[red]❌ Missing[/]", "")
-                self.results["snap_packages"]["failed"] += 1
-                self.results["snap_packages"]["details"].append(
-                    {"package": package, "installed": False, "version": None}
-                )
+                if setup_in_progress:
+                    snap_table.add_row(package, "[yellow]⏳ Pending[/]", "")
+                    self.results["snap_packages"]["skipped"] += 1
+                    self.results["snap_packages"]["details"].append(
+                        {
+                            "package": package,
+                            "installed": False,
+                            "version": None,
+                            "pending": True,
+                        }
+                    )
+                else:
+                    snap_table.add_row(package, "[red]❌ Missing[/]", "")
+                    self.results["snap_packages"]["failed"] += 1
+                    self.results["snap_packages"]["details"].append(
+                        {"package": package, "installed": False, "version": None}
+                    )
 
         self.console.print(snap_table)
-        self.console.print(
-            f"[dim]{self.results['snap_packages']['passed']}/{self.results['snap_packages']['total']} snap packages installed[/]"
-        )
+        msg = f"{self.results['snap_packages']['passed']}/{self.results['snap_packages']['total']} snap packages installed"
+        if self.results["snap_packages"].get("skipped", 0) > 0:
+            msg += f" ({self.results['snap_packages']['skipped']} pending)"
+        self.console.print(f"[dim]{msg}[/]")
 
         return self.results["snap_packages"]
 
@@ -410,7 +451,10 @@ class VMValidator:
     def validate_apps(self) -> Dict:
         packages = self.config.get("packages", [])
         snap_packages = self.config.get("snap_packages", [])
-        app_data_paths = self.config.get("app_data_paths", {})
+        # Support both v1 (app_data_paths) and v2 (copy_paths) config formats
+        copy_paths = self.config.get("copy_paths", None)
+        if not isinstance(copy_paths, dict) or not copy_paths:
+            copy_paths = self.config.get("app_data_paths", {})
         vm_user = self.config.get("vm", {}).get("username", "ubuntu")
 
         snap_app_specs = {
@@ -469,7 +513,7 @@ class VMValidator:
             if snap_pkg in snap_app_specs:
                 expected.append(snap_pkg)
 
-        for _, guest_path in app_data_paths.items():
+        for _, guest_path in copy_paths.items():
             if guest_path == "/home/ubuntu/.config/google-chrome":
                 expected.append("google-chrome")
                 break
@@ -588,6 +632,9 @@ class VMValidator:
             running: Optional[bool] = None
             pid: Optional[str] = None
             note = ""
+            pending = False
+
+            setup_in_progress = self._setup_in_progress() is True
 
             if app == "firefox":
                 installed = (
@@ -651,6 +698,10 @@ class VMValidator:
             if self.require_running_apps and installed and profile_ok and running is None:
                 note = note or "running unknown"
 
+            if setup_in_progress and not installed:
+                pending = True
+                note = note or "setup in progress"
+
             running_icon = (
                 "[dim]—[/]"
                 if not installed
@@ -663,20 +714,18 @@ class VMValidator:
 
             pid_value = "—" if not installed else ("?" if pid is None else (pid or "—"))
 
-            table.add_row(
-                app,
-                "[green]✅[/]" if installed else "[red]❌[/]",
-                "[green]✅[/]" if profile_ok else "[red]❌[/]",
-                running_icon,
-                pid_value,
-                note,
-            )
+            installed_icon = "[green]✅[/]" if installed else ("[yellow]⏳[/]" if pending else "[red]❌[/]")
+            profile_icon = "[green]✅[/]" if profile_ok else ("[yellow]⏳[/]" if pending else "[red]❌[/]")
+
+            table.add_row(app, installed_icon, profile_icon, running_icon, pid_value, note)
 
             should_pass = installed and profile_ok
             if self.require_running_apps and installed and profile_ok:
                 should_pass = running is True
 
-            if should_pass:
+            if pending:
+                self.results["apps"]["skipped"] += 1
+            elif should_pass:
                 self.results["apps"]["passed"] += 1
             else:
                 self.results["apps"]["failed"] += 1
@@ -689,6 +738,7 @@ class VMValidator:
                     "running": running,
                     "pid": pid,
                     "note": note,
+                    "pending": pending,
                 }
             )
 
@@ -703,7 +753,10 @@ class VMValidator:
     def validate_smoke_tests(self) -> Dict:
         packages = self.config.get("packages", [])
         snap_packages = self.config.get("snap_packages", [])
-        app_data_paths = self.config.get("app_data_paths", {})
+        # Support both v1 (app_data_paths) and v2 (copy_paths) config formats
+        copy_paths = self.config.get("copy_paths", None)
+        if not isinstance(copy_paths, dict) or not copy_paths:
+            copy_paths = self.config.get("app_data_paths", {})
         vm_user = self.config.get("vm", {}).get("username", "ubuntu")
 
         expected = []
@@ -715,7 +768,7 @@ class VMValidator:
             if snap_pkg in {"pycharm-community", "chromium", "firefox", "code"}:
                 expected.append(snap_pkg)
 
-        for _, guest_path in app_data_paths.items():
+        for _, guest_path in copy_paths.items():
             if guest_path == "/home/ubuntu/.config/google-chrome":
                 expected.append("google-chrome")
                 break
@@ -790,7 +843,7 @@ class VMValidator:
 
             if app == "firefox":
                 out = self._exec_in_vm(
-                    f"{user_env} timeout 20 firefox --headless --screenshot /tmp/clonebox-firefox.png about:blank >/dev/null 2>&1 && rm -f /tmp/clonebox-firefox.png && echo yes || echo no",
+                    f"{user_env} timeout 20 firefox --headless --version >/dev/null 2>&1 && echo yes || echo no",
                     timeout=30,
                 )
                 return None if out is None else out.strip() == "yes"
@@ -820,40 +873,51 @@ class VMValidator:
         table.add_column("Launch", justify="center")
         table.add_column("Note", style="dim")
 
+        setup_in_progress = self._setup_in_progress() is True
         for app in expected:
             self.results["smoke"]["total"] += 1
             installed = _installed(app)
             launched: Optional[bool] = None
             note = ""
+            pending = False
 
             if installed is True:
                 launched = _run_test(app)
                 if launched is None:
                     note = "test failed to execute"
+                elif launched is False and setup_in_progress:
+                    pending = True
+                    note = note or "setup in progress"
             elif installed is False:
-                note = "not installed"
+                if setup_in_progress:
+                    pending = True
+                    note = "setup in progress"
+                else:
+                    note = "not installed"
             else:
                 note = "install status unknown"
 
             installed_icon = (
                 "[green]✅[/]"
                 if installed is True
-                else "[red]❌[/]" if installed is False else "[dim]?[/]"
+                else ("[yellow]⏳[/]" if pending else "[red]❌[/]")
+                if installed is False
+                else "[dim]?[/]"
             )
             launch_icon = (
                 "[green]✅[/]"
                 if launched is True
-                else (
-                    "[red]❌[/]"
-                    if launched is False
-                    else ("[dim]—[/]" if installed is not True else "[dim]?[/]")
-                )
+                else ("[yellow]⏳[/]" if pending else "[red]❌[/]")
+                if launched is False
+                else ("[dim]—[/]" if installed is not True else "[dim]?[/]")
             )
 
             table.add_row(app, installed_icon, launch_icon, note)
 
             passed = installed is True and launched is True
-            if passed:
+            if pending:
+                self.results["smoke"]["skipped"] += 1
+            elif passed:
                 self.results["smoke"]["passed"] += 1
             else:
                 self.results["smoke"]["failed"] += 1
@@ -864,6 +928,7 @@ class VMValidator:
                     "installed": installed,
                     "launched": launched,
                     "note": note,
+                    "pending": pending,
                 }
             )
 
@@ -994,6 +1059,10 @@ class VMValidator:
 
         # Get skipped services count
         skipped_services = self.results["services"].get("skipped", 0)
+        skipped_snaps = self.results["snap_packages"].get("skipped", 0)
+        skipped_apps = self.results["apps"].get("skipped", 0)
+        skipped_smoke = self.results["smoke"].get("skipped", 0) if self.smoke_test else 0
+        total_skipped = skipped_services + skipped_snaps + skipped_apps + skipped_smoke
 
         # Print summary
         self.console.print("\n[bold]📊 Validation Summary[/]")
@@ -1022,7 +1091,7 @@ class VMValidator:
             "Snap Packages",
             str(self.results["snap_packages"]["passed"]),
             str(self.results["snap_packages"]["failed"]),
-            "—",
+            str(skipped_snaps) if skipped_snaps else "—",
             str(self.results["snap_packages"]["total"]),
         )
         summary_table.add_row(
@@ -1036,21 +1105,24 @@ class VMValidator:
             "Apps",
             str(self.results["apps"]["passed"]),
             str(self.results["apps"]["failed"]),
-            "—",
+            str(skipped_apps) if skipped_apps else "—",
             str(self.results["apps"]["total"]),
         )
         summary_table.add_row(
             "[bold]TOTAL",
             f"[bold green]{total_passed}",
             f"[bold red]{total_failed}",
-            f"[dim]{skipped_services}[/]",
+            f"[dim]{total_skipped}[/]" if total_skipped else "[dim]0[/]",
             f"[bold]{total_checks}",
         )
 
         self.console.print(summary_table)
 
         # Determine overall status
-        if total_failed == 0 and total_checks > 0:
+        if total_failed == 0 and total_checks > 0 and total_skipped > 0:
+            self.results["overall"] = "pending"
+            self.console.print("\n[bold yellow]⏳ Setup in progress - some checks are pending[/]")
+        elif total_failed == 0 and total_checks > 0:
             self.results["overall"] = "pass"
             self.console.print("\n[bold green]✅ All validations passed![/]")
         elif total_failed > 0:

{clonebox-1.1.14.dist-info → clonebox-1.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 1.1.14
+Version: 1.1.15
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0
@@ -49,6 +49,10 @@ Requires-Dist: fastapi>=0.100.0; extra == "test"
 Provides-Extra: dashboard
 Requires-Dist: fastapi>=0.100.0; extra == "dashboard"
 Requires-Dist: uvicorn>=0.22.0; extra == "dashboard"
+Provides-Extra: secrets
+Requires-Dist: hvac>=2.0.0; extra == "secrets"
+Provides-Extra: full
+Requires-Dist: hvac>=2.0.0; extra == "full"
 Dynamic: license-file
 
 # CloneBox 📦

{clonebox-1.1.14.dist-info → clonebox-1.1.15.dist-info}/RECORD

@@ -1,8 +1,8 @@
 clonebox/__init__.py,sha256=CyfHVVq6KqBr4CNERBpXk_O6Q5B35q03YpdQbokVvvI,408
 clonebox/__main__.py,sha256=Fcoyzwwyz5-eC_sBlQk5a5RbKx8uodQz5sKJ190U0NU,135
-clonebox/audit.py,sha256=67V2ap4QYVXH41b2GmNeRw0-0BilPPTgbDJ0eA5xv2A,14119
-clonebox/cli.py,sha256=7QCjprKNRguPVHhxXzd2ej-t61W8kOcxlSMSNxYoXag,153643
-clonebox/cloner.py,sha256=Hf4ugJ0lZ52etrnY2RoopwbMaQsPctZp5d1i3_qQKsU,97470
+clonebox/audit.py,sha256=1W9vaIjB0A--_p7CgE3cIP5RNckJG1RxJrL-tOb-QmU,14298
+clonebox/cli.py,sha256=45-0HJ_T8O5Ggrd42VZTU1LoTOgIidRPqST7jzP23YM,174764
+clonebox/cloner.py,sha256=gQeaY_Cu6cKLKh_L0z8yuhB877WWunyKBy3vOzD-IMI,99640
 clonebox/container.py,sha256=tiYK1ZB-DhdD6A2FuMA0h_sRNkUI7KfYcJ0tFOcdyeM,6105
 clonebox/dashboard.py,sha256=dMY6odvPq3j6FronhRRsX7aY3qdCwznB-aCWKEmHDNw,5768
 clonebox/detector.py,sha256=vS65cvFNPmUBCX1Y_TMTnSRljw6r1Ae9dlVtACs5XFc,23075
@@ -15,11 +15,12 @@ clonebox/monitor.py,sha256=zlIarNf8w_i34XI8hZGxxrg5PVZK_Yxm6FQnkhLavRI,9181
 clonebox/orchestrator.py,sha256=LvoDZIX47g2pdvMYfCW3NJ5sAiRYKKa45KGlujnJZuI,19871
 clonebox/p2p.py,sha256=6o0JnscKqF9-BftQhW5fF1W6YY1wXshY9LEklNcHGJc,5913
 clonebox/profiles.py,sha256=UP37fX_rhrG_O9ehNFJBUcULPmUtN1A8KsJ6cM44oK0,1986
+clonebox/remote.py,sha256=3qd6q3yEDkbO_btOsytkqub2v9lkmsVu_92KcdmHw6U,15336
 clonebox/resource_monitor.py,sha256=lDR9KyPbVtImeeOkOBPPVP-5yCgoL5hsVFPZ_UqsY0w,5286
 clonebox/resources.py,sha256=IkuM4OdSDV4qhyc0eIynwbAHBTv0aVSxxW-gghsnCAs,6815
 clonebox/rollback.py,sha256=hpwO-8Ehe1pW0wHuZvJkC_qxZ6yEo9otCJRhGIUArCo,5711
-clonebox/secrets.py,sha256=QtGMIjhTKq14qQRGy-pX0TU3vKLiZt7CMloAlF2GmzQ,10515
-clonebox/validator.py,sha256=qKbT5dXka1Pts9GYqSt3ZEqF83gqdR0gFtFwOODWKvg,40918
+clonebox/secrets.py,sha256=l1jwJcEPB1qMoGNLPjyrkKKr1khh9VmftFJI9BWhgK0,10628
+clonebox/validator.py,sha256=_glRPL6VlTCnIpPTtFa8_cVApcl1h0jU_uyHCfKraUM,44501
 clonebox/backends/libvirt_backend.py,sha256=sIHFIvFO1hIOXEFR_foSkOGBgIzaJVQs-njOU8GdafA,7170
 clonebox/backends/qemu_disk.py,sha256=YsGjYX5sbEf35Y4yjTpNkZat73a4RGBxY-KTVzJhqIs,1687
 clonebox/backends/subprocess_runner.py,sha256=c-IyaMxM1cmUu64h654oAvulm83K5Mu-VQxXJ_0BOds,1506
@@ -33,15 +34,15 @@ clonebox/interfaces/network.py,sha256=YPIquxEB7sZHczbpuopcZpffTjWYI6cKmAu3wAEFll
 clonebox/interfaces/process.py,sha256=njvAIZw_TCjw01KpyVQKIDoRvhTwl0FfVGbQ6mxTROk,1024
 clonebox/plugins/__init__.py,sha256=3cxlz159nokZCOL2c017WqTwt5z00yyn-o-SemP1g6c,416
 clonebox/plugins/base.py,sha256=A2H-2vrYUczNZCDioQ8cAtvaSob4YpXutx7FWMjksC4,10133
-clonebox/plugins/manager.py,sha256=gotjHloAiiADLJjATOvdBxrasU3Rc8h2fW0MwVGIhCI,14105
+clonebox/plugins/manager.py,sha256=W2ithedEEOh9iWSq3_M5_g2SQWl85aI5qrvrjOKv02I,16842
 clonebox/snapshots/__init__.py,sha256=ndlrIavPAiA8z4Ep3-D_EPhOcjNKYFnP3rIpEKaGdb8,273
 clonebox/snapshots/manager.py,sha256=hGzM8V6ZJPXjTqj47c4Kr8idlE-c1Q3gPUvuw1HvS1A,11393
 clonebox/snapshots/models.py,sha256=sRnn3OZE8JG9FZJlRuA3ihO-JXoPCQ3nD3SQytflAao,6206
 clonebox/templates/profiles/ml-dev.yaml,sha256=w07MToGh31xtxpjbeXTBk9BkpAN8A3gv8HeA3ESKG9M,461
 clonebox/templates/profiles/web-stack.yaml,sha256=EBnnGMzML5vAjXmIUbCpbTCwmRaNJiuWd3EcL43DOK8,485
-clonebox-1.1.14.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clonebox-1.1.14.dist-info/METADATA,sha256=MCTVRt4sr9hDpl7N0x_DwR0067cNXqL-Ti1huPFVU60,48916
-clonebox-1.1.14.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clonebox-1.1.14.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
-clonebox-1.1.14.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
-clonebox-1.1.14.dist-info/RECORD,,
+clonebox-1.1.15.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+clonebox-1.1.15.dist-info/METADATA,sha256=4gxhtiBARsY1QcnwjPU705upAAXQPvTXNiXHzkZaGpI,49052
+clonebox-1.1.15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+clonebox-1.1.15.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
+clonebox-1.1.15.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
+clonebox-1.1.15.dist-info/RECORD,,