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

clonebox/cli.py

@@ -592,6 +592,16 @@ def generate_clonebox_yaml(
             paths_mapping[host_path] = f"/mnt/workdir{idx}"
             idx += 1
 
+    # Add default user folders (Downloads, Documents)
+    home_dir = Path.home()
+    default_folders = [
+        (home_dir / "Downloads", "/home/ubuntu/Downloads"),
+        (home_dir / "Documents", "/home/ubuntu/Documents"),
+    ]
+    for host_folder, guest_folder in default_folders:
+        if host_folder.exists() and str(host_folder) not in paths_mapping:
+            paths_mapping[str(host_folder)] = guest_folder
+
     # Determine VM name
     if not vm_name:
         if target_path:
@@ -604,10 +614,10 @@ def generate_clonebox_yaml(
     vcpus = max(2, sys_info["cpu_count"] // 2)
 
     # Auto-detect packages from running applications and services
-    suggested_app_packages = detector.suggest_packages_for_apps(snapshot.applications)
-    suggested_service_packages = detector.suggest_packages_for_services(snapshot.running_services)
+    app_packages = detector.suggest_packages_for_apps(snapshot.applications)
+    service_packages = detector.suggest_packages_for_services(snapshot.running_services)
     
-    # Combine with base packages
+    # Combine with base packages (apt only)
     base_packages = [
         "build-essential",
         "git",
@@ -615,10 +625,15 @@ def generate_clonebox_yaml(
         "vim",
     ]
     
-    # Merge all packages and deduplicate
-    all_packages = base_packages + suggested_app_packages + suggested_service_packages
+    # Merge apt packages and deduplicate
+    all_apt_packages = base_packages + app_packages["apt"] + service_packages["apt"]
+    if deduplicate:
+        all_apt_packages = deduplicate_list(all_apt_packages)
+    
+    # Merge snap packages and deduplicate
+    all_snap_packages = app_packages["snap"] + service_packages["snap"]
     if deduplicate:
-        all_packages = deduplicate_list(all_packages)
+        all_snap_packages = deduplicate_list(all_snap_packages)
 
     # Build config
     config = {
@@ -635,7 +650,9 @@ def generate_clonebox_yaml(
             "password": "${VM_PASSWORD}",
         },
         "services": services,
-        "packages": all_packages,
+        "packages": all_apt_packages,
+        "snap_packages": all_snap_packages,
+        "post_commands": [],  # User can add custom commands to run after setup
         "paths": paths_mapping,
         "detected": {
             "running_apps": [
@@ -772,7 +789,9 @@ def create_vm_from_config(
         base_image=config["vm"].get("base_image"),
         paths=config.get("paths", {}),
         packages=config.get("packages", []),
+        snap_packages=config.get("snap_packages", []),
         services=config.get("services", []),
+        post_commands=config.get("post_commands", []),
         user_session=user_session,
         network_mode=config["vm"].get("network_mode", "auto"),
         username=config["vm"].get("username", "ubuntu"),

clonebox/cloner.py

@@ -31,7 +31,9 @@ class VMConfig:
     base_image: Optional[str] = None
     paths: dict = field(default_factory=dict)
     packages: list = field(default_factory=list)
+    snap_packages: list = field(default_factory=list)  # Snap packages to install
     services: list = field(default_factory=list)
+    post_commands: list = field(default_factory=list)  # Commands to run after setup
     user_session: bool = False  # Use qemu:///session instead of qemu:///system
     network_mode: str = "auto"  # auto|default|user
     username: str = "ubuntu"  # VM default username
@@ -508,7 +510,7 @@ class SelectiveVMCloner:
             "\n".join(f"  - {pkg}" for pkg in all_packages) if all_packages else ""
         )
         
-        # Build runcmd - services and mounts
+        # Build runcmd - services, mounts, snaps, post_commands
         runcmd_lines = []
         
         # Add service enablement
@@ -519,6 +521,12 @@ class SelectiveVMCloner:
         for cmd in mount_commands:
             runcmd_lines.append(cmd)
         
+        # Install snap packages
+        if config.snap_packages:
+            runcmd_lines.append("  - echo 'Installing snap packages...'")
+            for snap_pkg in config.snap_packages:
+                runcmd_lines.append(f"  - snap install {snap_pkg} --classic || snap install {snap_pkg} || true")
+        
         # Add GUI setup if enabled - runs AFTER package installation completes
         if config.gui:
             runcmd_lines.extend([
@@ -526,7 +534,18 @@ class SelectiveVMCloner:
                 "  - systemctl enable gdm3 || systemctl enable gdm || true",
             ])
         
+        # Run user-defined post commands
+        if config.post_commands:
+            runcmd_lines.append("  - echo 'Running post-setup commands...'")
+            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")
         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/detector.py

@@ -144,59 +144,209 @@ class SystemDetector:
         "esbuild",
         "tmux",
         "screen",
+        # IDEs and desktop apps
+        "pycharm",
+        "idea",
+        "webstorm",
+        "phpstorm",
+        "goland",
+        "clion",
+        "rider",
+        "datagrip",
+        "sublime",
+        "atom",
+        "slack",
+        "discord",
+        "telegram",
+        "spotify",
+        "vlc",
+        "gimp",
+        "inkscape",
+        "blender",
+        "obs",
+        "postman",
+        "insomnia",
+        "dbeaver",
     ]
 
-    # Map process/service names to Ubuntu packages
+    # Map process/service names to Ubuntu packages or snap packages
+    # Format: "process_name": ("package_name", "install_type") where install_type is "apt" or "snap"
     APP_TO_PACKAGE_MAP = {
-        "python": "python3",
-        "python3": "python3",
-        "pip": "python3-pip",
-        "node": "nodejs",
-        "npm": "npm",
-        "yarn": "yarnpkg",
-        "docker": "docker.io",
-        "dockerd": "docker.io",
-        "docker-compose": "docker-compose",
-        "podman": "podman",
-        "nginx": "nginx",
-        "apache2": "apache2",
-        "httpd": "apache2",
-        "postgres": "postgresql",
-        "postgresql": "postgresql",
-        "mysql": "mysql-server",
-        "mysqld": "mysql-server",
-        "mongod": "mongodb",
-        "mongodb": "mongodb",
-        "redis-server": "redis-server",
-        "redis": "redis-server",
-        "vim": "vim",
-        "nvim": "neovim",
-        "emacs": "emacs",
-        "firefox": "firefox",
-        "chromium": "chromium-browser",
-        "jupyter": "jupyter-notebook",
-        "jupyter-lab": "jupyterlab",
-        "gunicorn": "gunicorn",
-        "uvicorn": "uvicorn",
-        "tmux": "tmux",
-        "screen": "screen",
-        "git": "git",
-        "curl": "curl",
-        "wget": "wget",
-        "ssh": "openssh-client",
-        "sshd": "openssh-server",
-        "go": "golang",
-        "cargo": "cargo",
-        "rustc": "rustc",
-        "java": "default-jdk",
-        "gradle": "gradle",
-        "mvn": "maven",
+        "python": ("python3", "apt"),
+        "python3": ("python3", "apt"),
+        "pip": ("python3-pip", "apt"),
+        "node": ("nodejs", "apt"),
+        "npm": ("npm", "apt"),
+        "yarn": ("yarnpkg", "apt"),
+        "docker": ("docker.io", "apt"),
+        "dockerd": ("docker.io", "apt"),
+        "docker-compose": ("docker-compose", "apt"),
+        "podman": ("podman", "apt"),
+        "nginx": ("nginx", "apt"),
+        "apache2": ("apache2", "apt"),
+        "httpd": ("apache2", "apt"),
+        "postgres": ("postgresql", "apt"),
+        "postgresql": ("postgresql", "apt"),
+        "mysql": ("mysql-server", "apt"),
+        "mysqld": ("mysql-server", "apt"),
+        "mongod": ("mongodb", "apt"),
+        "mongodb": ("mongodb", "apt"),
+        "redis-server": ("redis-server", "apt"),
+        "redis": ("redis-server", "apt"),
+        "vim": ("vim", "apt"),
+        "nvim": ("neovim", "apt"),
+        "emacs": ("emacs", "apt"),
+        "firefox": ("firefox", "apt"),
+        "chromium": ("chromium-browser", "apt"),
+        "jupyter": ("jupyter-notebook", "apt"),
+        "jupyter-lab": ("jupyterlab", "apt"),
+        "gunicorn": ("gunicorn", "apt"),
+        "uvicorn": ("uvicorn", "apt"),
+        "tmux": ("tmux", "apt"),
+        "screen": ("screen", "apt"),
+        "git": ("git", "apt"),
+        "curl": ("curl", "apt"),
+        "wget": ("wget", "apt"),
+        "ssh": ("openssh-client", "apt"),
+        "sshd": ("openssh-server", "apt"),
+        "go": ("golang", "apt"),
+        "cargo": ("cargo", "apt"),
+        "rustc": ("rustc", "apt"),
+        "java": ("default-jdk", "apt"),
+        "gradle": ("gradle", "apt"),
+        "mvn": ("maven", "apt"),
+        # Popular desktop apps (snap packages)
+        "chrome": ("chromium", "snap"),
+        "google-chrome": ("chromium", "snap"),
+        "pycharm": ("pycharm-community", "snap"),
+        "idea": ("intellij-idea-community", "snap"),
+        "code": ("code", "snap"),
+        "vscode": ("code", "snap"),
+        "slack": ("slack", "snap"),
+        "discord": ("discord", "snap"),
+        "spotify": ("spotify", "snap"),
+        "vlc": ("vlc", "apt"),
+        "gimp": ("gimp", "apt"),
+        "inkscape": ("inkscape", "apt"),
+        "blender": ("blender", "apt"),
+        "obs": ("obs-studio", "apt"),
+        "telegram": ("telegram-desktop", "snap"),
+        "postman": ("postman", "snap"),
+        "insomnia": ("insomnia", "snap"),
+        "dbeaver": ("dbeaver-ce", "snap"),
+        "sublime": ("sublime-text", "snap"),
+        "atom": ("atom", "snap"),
+    }
+
+    # Map applications to their config/data directories for complete cloning
+    # These directories contain user settings, extensions, profiles, credentials
+    APP_DATA_DIRS = {
+        # Browsers - profiles, extensions, bookmarks, passwords
+        "chrome": [".config/google-chrome", ".config/chromium"],
+        "chromium": [".config/chromium"],
+        "firefox": [".mozilla/firefox", ".cache/mozilla/firefox"],
+        
+        # IDEs and editors - settings, extensions, projects history
+        "code": [".config/Code", ".vscode", ".vscode-server"],
+        "vscode": [".config/Code", ".vscode", ".vscode-server"],
+        "pycharm": [".config/JetBrains", ".local/share/JetBrains", ".cache/JetBrains"],
+        "idea": [".config/JetBrains", ".local/share/JetBrains"],
+        "webstorm": [".config/JetBrains", ".local/share/JetBrains"],
+        "goland": [".config/JetBrains", ".local/share/JetBrains"],
+        "sublime": [".config/sublime-text", ".config/sublime-text-3"],
+        "atom": [".atom"],
+        "vim": [".vim", ".vimrc", ".config/nvim"],
+        "nvim": [".config/nvim", ".local/share/nvim"],
+        "emacs": [".emacs.d", ".emacs"],
+        "cursor": [".config/Cursor", ".cursor"],
+        
+        # Development tools
+        "docker": [".docker"],
+        "git": [".gitconfig", ".git-credentials", ".config/git"],
+        "npm": [".npm", ".npmrc"],
+        "yarn": [".yarn", ".yarnrc"],
+        "pip": [".pip", ".config/pip"],
+        "cargo": [".cargo"],
+        "rustup": [".rustup"],
+        "go": [".go", "go"],
+        "gradle": [".gradle"],
+        "maven": [".m2"],
+        
+        # Python environments
+        "python": [".pyenv", ".virtualenvs", ".local/share/virtualenvs"],
+        "python3": [".pyenv", ".virtualenvs", ".local/share/virtualenvs"],
+        "conda": [".conda", "anaconda3", "miniconda3"],
+        
+        # Node.js
+        "node": [".nvm", ".node", ".npm"],
+        
+        # Databases
+        "postgres": [".pgpass", ".psqlrc", ".psql_history"],
+        "mysql": [".my.cnf", ".mysql_history"],
+        "mongodb": [".mongorc.js", ".dbshell"],
+        "redis": [".rediscli_history"],
+        
+        # Communication apps
+        "slack": [".config/Slack"],
+        "discord": [".config/discord"],
+        "telegram": [".local/share/TelegramDesktop"],
+        "teams": [".config/Microsoft/Microsoft Teams"],
+        
+        # Other tools
+        "postman": [".config/Postman"],
+        "insomnia": [".config/Insomnia"],
+        "dbeaver": [".local/share/DBeaverData"],
+        "ssh": [".ssh"],
+        "gpg": [".gnupg"],
+        "aws": [".aws"],
+        "gcloud": [".config/gcloud"],
+        "kubectl": [".kube"],
+        "terraform": [".terraform.d"],
+        "ansible": [".ansible"],
+        
+        # General app data
+        "spotify": [".config/spotify"],
+        "vlc": [".config/vlc"],
+        "gimp": [".config/GIMP", ".gimp-2.10"],
+        "obs": [".config/obs-studio"],
     }
 
     def __init__(self):
         self.user = pwd.getpwuid(os.getuid()).pw_name
         self.home = Path.home()
 
+    def detect_app_data_dirs(self, applications: list) -> list:
+        """Detect config/data directories for running applications.
+        
+        Returns list of paths that contain user data needed by running apps.
+        """
+        app_data_paths = []
+        seen_paths = set()
+        
+        for app in applications:
+            app_name = app.name.lower()
+            
+            # Check each known app pattern
+            for pattern, dirs in self.APP_DATA_DIRS.items():
+                if pattern in app_name:
+                    for dir_name in dirs:
+                        full_path = self.home / dir_name
+                        if full_path.exists() and str(full_path) not in seen_paths:
+                            seen_paths.add(str(full_path))
+                            # Calculate size
+                            try:
+                                size = self._get_dir_size(full_path, max_depth=2)
+                            except:
+                                size = 0
+                            app_data_paths.append({
+                                "path": str(full_path),
+                                "app": app.name,
+                                "type": "app_data",
+                                "size_mb": round(size / 1024 / 1024, 1)
+                            })
+        
+        return app_data_paths
+
     def detect_all(self) -> SystemSnapshot:
         """Detect all services, applications and paths."""
         return SystemSnapshot(
@@ -437,29 +587,53 @@ class SystemDetector:
             pass
         return containers
 
-    def suggest_packages_for_apps(self, applications: list) -> list:
-        """Suggest Ubuntu packages based on detected applications."""
-        packages = set()
+    def suggest_packages_for_apps(self, applications: list) -> dict:
+        """Suggest packages based on detected applications.
+        
+        Returns:
+            dict with 'apt' and 'snap' keys containing lists of packages
+        """
+        apt_packages = set()
+        snap_packages = set()
+        
         for app in applications:
             app_name = app.name.lower()
-            # Check if app name matches any known mapping
-            for key, package in self.APP_TO_PACKAGE_MAP.items():
+            for key, (package, install_type) in self.APP_TO_PACKAGE_MAP.items():
                 if key in app_name:
-                    packages.add(package)
+                    if install_type == "snap":
+                        snap_packages.add(package)
+                    else:
+                        apt_packages.add(package)
                     break
-        return sorted(list(packages))
+        
+        return {
+            "apt": sorted(list(apt_packages)),
+            "snap": sorted(list(snap_packages))
+        }
 
-    def suggest_packages_for_services(self, services: list) -> list:
-        """Suggest Ubuntu packages based on detected services."""
-        packages = set()
+    def suggest_packages_for_services(self, services: list) -> dict:
+        """Suggest packages based on detected services.
+        
+        Returns:
+            dict with 'apt' and 'snap' keys containing lists of packages
+        """
+        apt_packages = set()
+        snap_packages = set()
+        
         for service in services:
             service_name = service.name.lower()
-            # Check if service name matches any known mapping
-            for key, package in self.APP_TO_PACKAGE_MAP.items():
+            for key, (package, install_type) in self.APP_TO_PACKAGE_MAP.items():
                 if key in service_name:
-                    packages.add(package)
+                    if install_type == "snap":
+                        snap_packages.add(package)
+                    else:
+                        apt_packages.add(package)
                     break
-        return sorted(list(packages))
+        
+        return {
+            "apt": sorted(list(apt_packages)),
+            "snap": sorted(list(snap_packages))
+        }
 
     def get_system_info(self) -> dict:
         """Get basic system information."""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clonebox
-Version: 0.1.6
+Version: 0.1.7
 Summary: Clone your workstation environment to an isolated VM with selective apps, paths and services
 Author: CloneBox Team
 License: Apache-2.0
@@ -38,6 +38,7 @@ Requires-Dist: ruff>=0.1.0; extra == "dev"
 Dynamic: license-file
 
 # CloneBox 📦
+![img.png](img.png)
 
 ```commandline
 ╔═══════════════════════════════════════════════════════╗

clonebox-0.1.7.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=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,,

clonebox-0.1.6.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=mlGDWvBvi4UJjOpjG7rqJYzzxpmIzwhbv16CMYRFb7c,40583
-clonebox/cloner.py,sha256=MpHkm964NUdr0zEPu7G5ggRQPif-j3shlwM5jv8KWSU,25236
-clonebox/detector.py,sha256=rxqP7GxjBN1SjNo2L0m_URqX_FVBljqMr01g5nyESkc,14890
-clonebox-0.1.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-clonebox-0.1.6.dist-info/METADATA,sha256=loeSNwXQo71C4Hiar2U-aSG1Mqqvx9y261VOH7h0uso,15562
-clonebox-0.1.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clonebox-0.1.6.dist-info/entry_points.txt,sha256=FES95Vi3btfViLEEoHdb8nikNxTqzaooi9ehZw9ZfWI,47
-clonebox-0.1.6.dist-info/top_level.txt,sha256=LdMo2cvCrEcRGH2M8JgQNVsCoszLV0xug6kx1JnaRjo,9
-clonebox-0.1.6.dist-info/RECORD,,