clonebox 0.1.7__py3-none-any.whl → 0.1.8__py3-none-any.whl

clonebox/cli.py

@@ -602,6 +602,18 @@ def generate_clonebox_yaml(
         if host_folder.exists() and str(host_folder) not in paths_mapping:
             paths_mapping[str(host_folder)] = guest_folder
 
+    # Detect and add app-specific data directories for running applications
+    # This includes browser profiles, IDE settings, credentials, extensions, etc.
+    app_data_dirs = detector.detect_app_data_dirs(snapshot.applications)
+    app_data_mapping = {}
+    for app_data in app_data_dirs:
+        host_path = app_data["path"]
+        if host_path not in paths_mapping:
+            # Map to same relative path in VM user home
+            rel_path = host_path.replace(str(home_dir), "").lstrip("/")
+            guest_path = f"/home/ubuntu/{rel_path}"
+            app_data_mapping[host_path] = guest_path
+
     # Determine VM name
     if not vm_name:
         if target_path:
@@ -654,15 +666,20 @@ def generate_clonebox_yaml(
         "snap_packages": all_snap_packages,
         "post_commands": [],  # User can add custom commands to run after setup
         "paths": paths_mapping,
+        "app_data_paths": app_data_mapping,  # App-specific config/data directories
         "detected": {
             "running_apps": [
-                {"name": a.name, "cwd": a.working_dir, "memory_mb": round(a.memory_mb)}
+                {"name": a.name, "cwd": a.working_dir or "", "memory_mb": round(a.memory_mb)}
                 for a in snapshot.applications[:10]
             ],
+            "app_data_dirs": [
+                {"path": d["path"], "app": d["app"], "size_mb": d["size_mb"]}
+                for d in app_data_dirs[:15]
+            ],
             "all_paths": {
-                "projects": paths_by_type["project"],
-                "configs": paths_by_type["config"][:5],
-                "data": paths_by_type["data"][:5],
+                "projects": list(paths_by_type["project"]),
+                "configs": list(paths_by_type["config"][:5]),
+                "data": list(paths_by_type["data"][:5]),
             },
         },
     }
@@ -781,13 +798,17 @@ def create_vm_from_config(
     replace: bool = False,
 ) -> str:
     """Create VM from YAML config dict."""
+    # Merge paths and app_data_paths
+    all_paths = config.get("paths", {}).copy()
+    all_paths.update(config.get("app_data_paths", {}))
+    
     vm_config = VMConfig(
         name=config["vm"]["name"],
         ram_mb=config["vm"].get("ram_mb", 4096),
         vcpus=config["vm"].get("vcpus", 4),
         gui=config["vm"].get("gui", True),
         base_image=config["vm"].get("base_image"),
-        paths=config.get("paths", {}),
+        paths=all_paths,
         packages=config.get("packages", []),
         snap_packages=config.get("snap_packages", []),
         services=config.get("services", []),
@@ -915,16 +936,27 @@ def cmd_clone(args):
                 password = config['vm'].get('password', 'ubuntu')
                 console.print("\n[bold yellow]⏰ GUI Setup Process:[/]")
                 console.print("  [yellow]•[/] Installing desktop environment (~5-10 minutes)")
+                console.print("  [yellow]•[/] Running health checks on all components")
                 console.print("  [yellow]•[/] Automatic restart after installation")
                 console.print("  [yellow]•[/] GUI login screen will appear")
                 console.print(f"  [yellow]•[/] Login: [cyan]{username}[/] / [cyan]{'*' * len(password)}[/] (from .env)")
                 console.print("\n[dim]💡 Progress will be monitored automatically below[/]")
 
+            # Show health check info
+            console.print("\n[bold]📊 Health Check (inside VM):[/]")
+            console.print("  [cyan]cat /var/log/clonebox-health.log[/]  # View full report")
+            console.print("  [cyan]cat /var/log/clonebox-health-status[/]  # Quick status")
+            console.print("  [cyan]clonebox-health[/]  # Re-run health check")
+
             # Show mount instructions
-            if config.get("paths"):
-                console.print("\n[bold]Inside VM, mount paths with:[/]")
-                for idx, (host, guest) in enumerate(config["paths"].items()):
-                    console.print(f"  [cyan]sudo mount -t 9p -o trans=virtio mount{idx} {guest}[/]")
+            all_paths = config.get("paths", {}).copy()
+            all_paths.update(config.get("app_data_paths", {}))
+            if all_paths:
+                console.print("\n[bold]📁 Mounted paths (automatic):[/]")
+                for idx, (host, guest) in enumerate(list(all_paths.items())[:5]):
+                    console.print(f"  [dim]{host}[/] → [cyan]{guest}[/]")
+                if len(all_paths) > 5:
+                    console.print(f"  [dim]... and {len(all_paths) - 5} more paths[/]")
         except PermissionError as e:
             console.print(f"[red]❌ Permission Error:[/]\n{e}")
             console.print("\n[yellow]💡 Try running with --user flag:[/]")

clonebox/cloner.py

@@ -476,6 +476,179 @@ class SelectiveVMCloner:
 
         return ET.tostring(root, encoding="unicode")
 
+    def _generate_health_check_script(self, config: VMConfig) -> str:
+        """Generate a health check script that validates all installed components."""
+        import base64
+        
+        # Build package check commands
+        apt_checks = []
+        for pkg in config.packages:
+            apt_checks.append(f'check_apt_package "{pkg}"')
+        
+        snap_checks = []
+        for pkg in config.snap_packages:
+            snap_checks.append(f'check_snap_package "{pkg}"')
+        
+        service_checks = []
+        for svc in config.services:
+            service_checks.append(f'check_service "{svc}"')
+        
+        mount_checks = []
+        for idx, (host_path, guest_path) in enumerate(config.paths.items()):
+            mount_checks.append(f'check_mount "{guest_path}" "mount{idx}"')
+        
+        apt_checks_str = "\n".join(apt_checks) if apt_checks else "echo 'No apt packages to check'"
+        snap_checks_str = "\n".join(snap_checks) if snap_checks else "echo 'No snap packages to check'"
+        service_checks_str = "\n".join(service_checks) if service_checks else "echo 'No services to check'"
+        mount_checks_str = "\n".join(mount_checks) if mount_checks else "echo 'No mounts to check'"
+        
+        script = f'''#!/bin/bash
+# CloneBox Health Check Script
+# Generated automatically - validates all installed components
+
+REPORT_FILE="/var/log/clonebox-health.log"
+PASSED=0
+FAILED=0
+WARNINGS=0
+
+# Colors for output
+RED='\\033[0;31m'
+GREEN='\\033[0;32m'
+YELLOW='\\033[1;33m'
+NC='\\033[0m'
+
+log() {{
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" | tee -a "$REPORT_FILE"
+}}
+
+check_apt_package() {{
+    local pkg="$1"
+    if dpkg -l "$pkg" 2>/dev/null | grep -q "^ii"; then
+        log "[PASS] APT package '$pkg' is installed"
+        ((PASSED++))
+        return 0
+    else
+        log "[FAIL] APT package '$pkg' is NOT installed"
+        ((FAILED++))
+        return 1
+    fi
+}}
+
+check_snap_package() {{
+    local pkg="$1"
+    if snap list "$pkg" &>/dev/null; then
+        log "[PASS] Snap package '$pkg' is installed"
+        ((PASSED++))
+        return 0
+    else
+        log "[FAIL] Snap package '$pkg' is NOT installed"
+        ((FAILED++))
+        return 1
+    fi
+}}
+
+check_service() {{
+    local svc="$1"
+    if systemctl is-enabled "$svc" &>/dev/null; then
+        if systemctl is-active "$svc" &>/dev/null; then
+            log "[PASS] Service '$svc' is enabled and running"
+            ((PASSED++))
+            return 0
+        else
+            log "[WARN] Service '$svc' is enabled but not running"
+            ((WARNINGS++))
+            return 1
+        fi
+    else
+        log "[INFO] Service '$svc' is not enabled (may be optional)"
+        return 0
+    fi
+}}
+
+check_mount() {{
+    local path="$1"
+    local tag="$2"
+    if mountpoint -q "$path" 2>/dev/null; then
+        log "[PASS] Mount '$path' ($tag) is active"
+        ((PASSED++))
+        return 0
+    elif [ -d "$path" ]; then
+        log "[WARN] Directory '$path' exists but not mounted"
+        ((WARNINGS++))
+        return 1
+    else
+        log "[INFO] Mount point '$path' does not exist yet"
+        return 0
+    fi
+}}
+
+check_gui() {{
+    if systemctl get-default | grep -q graphical; then
+        log "[PASS] System configured for graphical target"
+        ((PASSED++))
+        if systemctl is-active gdm3 &>/dev/null || systemctl is-active gdm &>/dev/null; then
+            log "[PASS] Display manager (GDM) is running"
+            ((PASSED++))
+        else
+            log "[WARN] Display manager not yet running (may start after reboot)"
+            ((WARNINGS++))
+        fi
+    else
+        log "[INFO] System not configured for GUI"
+    fi
+}}
+
+# Start health check
+log "=========================================="
+log "CloneBox Health Check Report"
+log "VM Name: {config.name}"
+log "Date: $(date)"
+log "=========================================="
+
+log ""
+log "--- APT Packages ---"
+{apt_checks_str}
+
+log ""
+log "--- Snap Packages ---"
+{snap_checks_str}
+
+log ""
+log "--- Services ---"
+{service_checks_str}
+
+log ""
+log "--- Mounts ---"
+{mount_checks_str}
+
+log ""
+log "--- GUI Status ---"
+check_gui
+
+log ""
+log "=========================================="
+log "Health Check Summary"
+log "=========================================="
+log "Passed:   $PASSED"
+log "Failed:   $FAILED"
+log "Warnings: $WARNINGS"
+
+if [ $FAILED -eq 0 ]; then
+    log ""
+    log "[SUCCESS] All critical checks passed!"
+    echo "HEALTH_STATUS=OK" > /var/log/clonebox-health-status
+    exit 0
+else
+    log ""
+    log "[ERROR] Some checks failed. Review log for details."
+    echo "HEALTH_STATUS=FAILED" > /var/log/clonebox-health-status
+    exit 1
+fi
+'''
+        # Encode script to base64 for safe embedding in cloud-init
+        encoded = base64.b64encode(script.encode()).decode()
+        return encoded
+
     def _create_cloudinit_iso(self, vm_dir: Path, config: VMConfig) -> Path:
         """Create cloud-init ISO with user-data and meta-data."""
 
@@ -540,12 +713,12 @@ class SelectiveVMCloner:
             for cmd in config.post_commands:
                 runcmd_lines.append(f"  - {cmd}")
         
-        # Validation - check installed packages and log results
-        runcmd_lines.append("  - echo '=== CloneBox Setup Validation ===' >> /var/log/clonebox-setup.log")
-        runcmd_lines.append("  - dpkg -l | grep -E 'ii' | wc -l >> /var/log/clonebox-setup.log")
-        runcmd_lines.append("  - snap list >> /var/log/clonebox-setup.log 2>/dev/null || true")
+        # Generate health check script
+        health_script = self._generate_health_check_script(config)
+        runcmd_lines.append(f"  - echo '{health_script}' | base64 -d > /usr/local/bin/clonebox-health")
+        runcmd_lines.append("  - chmod +x /usr/local/bin/clonebox-health")
+        runcmd_lines.append("  - /usr/local/bin/clonebox-health >> /var/log/clonebox-health.log 2>&1")
         runcmd_lines.append("  - echo 'CloneBox VM ready!' > /var/log/clonebox-ready")
-        runcmd_lines.append("  - echo 'Setup completed at:' $(date) >> /var/log/clonebox-setup.log")
         
         # Add reboot command at the end if GUI is enabled
         if config.gui:

{clonebox-0.1.7.dist-info → clonebox-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 0.1.7
+Version: 0.1.8
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0

clonebox-0.1.8.dist-info/RECORD

@@ -0,0 +1,11 @@
+clonebox/__init__.py,sha256=IOk7G0DiSQ33EGbFC0xbnnFB9aou_6yuyFxvycQEvA0,407
+clonebox/__main__.py,sha256=Fcoyzwwyz5-eC_sBlQk5a5RbKx8uodQz5sKJ190U0NU,135
+clonebox/cli.py,sha256=Kp-1C9Be39ZK9fVe-4bQLyb25W2otXk8597MvOOee7M,43133
+clonebox/cloner.py,sha256=CMy0NWxOiUMULaQuDHY0_LDUaELW0_h4ewj_dZ_5WHw,31171
+clonebox/detector.py,sha256=4fu04Ty6KC82WkcJZ5UL5TqXpWYE7Kb7R0uJ-9dtbCk,21635
+clonebox-0.1.8.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+clonebox-0.1.8.dist-info/METADATA,sha256=6a8ry0WjVyY21D3r1teMvSEL7zwVaoweH9GRtFxnZJY,15582
+clonebox-0.1.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+clonebox-0.1.8.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
+clonebox-0.1.8.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
+clonebox-0.1.8.dist-info/RECORD,,

clonebox-0.1.7.dist-info/RECORD

@@ -1,11 +0,0 @@
-clonebox/__init__.py,sha256=IOk7G0DiSQ33EGbFC0xbnnFB9aou_6yuyFxvycQEvA0,407
-clonebox/__main__.py,sha256=Fcoyzwwyz5-eC_sBlQk5a5RbKx8uodQz5sKJ190U0NU,135
-clonebox/cli.py,sha256=ngC6Pwbfr1brFkf_0ODlFzDikojTOkA3Yw-3iY4vrmY,41441
-clonebox/cloner.py,sha256=eDIxORCtnqG9mFKJl4OmW9F6tkEJp7dENYX-2x1Favg,26453
-clonebox/detector.py,sha256=4fu04Ty6KC82WkcJZ5UL5TqXpWYE7Kb7R0uJ-9dtbCk,21635
-clonebox-0.1.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clonebox-0.1.7.dist-info/METADATA,sha256=wsaV7GyZ6zfLCxLuNoSopr4XUHdyTlrgxxJMiHuFnKU,15582
-clonebox-0.1.7.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clonebox-0.1.7.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
-clonebox-0.1.7.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
-clonebox-0.1.7.dist-info/RECORD,,