vm-tool 1.0.44__tar.gz → 1.0.45__tar.gz

{vm_tool-1.0.44 → vm_tool-1.0.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vm_tool
-Version: 1.0.44
+Version: 1.0.45
 Summary: A Comprehensive Tool for Setting Up Virtual Machines.
 Home-page: https://github.com/thesunnysinha/vm_tool
 Author: Sunny Sinha

{vm_tool-1.0.44 → vm_tool-1.0.45}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vm_tool"
-version = "1.0.44"
+version = "1.0.45"
 description = "A Comprehensive Tool for Setting Up Virtual Machines."
 readme = "README.md"
 authors = [
@@ -76,7 +76,7 @@ include = '\.pyi?$'
 profile = "black"
 multi_line_output = 3
 [tool.bumpversion]
-current_version = "1.0.44"
+current_version = "1.0.45"
 commit = true
 tag = true
 

{vm_tool-1.0.44 → vm_tool-1.0.45}/setup.py

@@ -12,7 +12,7 @@ else:
 
 setup(
     name="vm_tool",
-    version="1.0.44",  # This will be updated by bump2version
+    version="1.0.45",  # This will be updated by bump2version
     packages=find_packages(),
     description="A Comprehensive Tool for Setting Up Virtual Machines.",
     long_description=long_description,

{vm_tool-1.0.44 → vm_tool-1.0.45}/vm_tool/cli.py

@@ -264,11 +264,21 @@ def main():
         action="store_true",
         help="Preview deployment without executing (shows what would be deployed)",
     )
+    docker_parser.add_argument(
+        "--repo-name",
+        type=str,
+        help="Repository name (used to default project-dir to ~/apps/NAME)",
+    )
     docker_parser.add_argument(
         "--project-dir",
         type=str,
-        default="~/app",
-        help="Target directory on the server for deployment (default: ~/app)",
+        help="Target directory on the server (default: ~/apps/<repo-name>)",
+    )
+    docker_parser.add_argument(
+        "--health-timeout",
+        type=int,
+        default=300,
+        help="Timeout in seconds for health checks (default: 300)",
     )
 
     # Completion command
@@ -299,6 +309,32 @@ def main():
         help="CI/CD Platform",
     )
 
+    # Release Prep command
+    release_parser = subparsers.add_parser(
+        "prepare-release", help="Prepare Docker Compose file for release"
+    )
+    release_parser.add_argument(
+        "--base-file", required=True, help="Base docker-compose file"
+    )
+    release_parser.add_argument(
+        "--prod-file", required=True, help="Production overlay file"
+    )
+    release_parser.add_argument("--output", required=True, help="Output file path")
+    release_parser.add_argument(
+        "--strip-volumes", help="Comma-separated list of services to strip volumes from"
+    )
+    release_parser.add_argument(
+        "--fix-paths", action="store_true", help="Fix CI absolute paths to relative"
+    )
+
+    # Setup CI command
+    setup_ci_parser = subparsers.add_parser(
+        "setup-ci", help="Configure CI environment (SSH, Inventory)"
+    )
+    setup_ci_parser.add_argument(
+        "--provider", default="github", choices=["github"], help="CI Provider"
+    )
+
     # Secrets command
     secrets_parser = subparsers.add_parser("secrets", help="Manage secrets")
     secrets_subparsers = secrets_parser.add_subparsers(
@@ -612,6 +648,14 @@ def main():
                 "compose_file", "docker-compose.yml"
             )
 
+            # Project Directory Logic
+            project_dir = args.project_dir
+            if not project_dir:
+                if args.repo_name:
+                    project_dir = f"~/apps/{args.repo_name}"
+                else:
+                    project_dir = "~/app"
+            
             # Dry-run mode: show what would be deployed
             if args.dry_run:
                 print("\n🔍 DRY-RUN MODE - No changes will be made\n")
@@ -619,6 +663,7 @@ def main():
                 print(f"   Target Host: {host or 'from inventory'}")
                 print(f"   SSH User: {user or 'from inventory'}")
                 print(f"   Compose File: {compose_file}")
+                print(f"   Project Dir: {project_dir}")
                 print(f"   Inventory: {args.inventory}")
                 if args.env_file:
                     print(f"   Env File: {args.env_file}")
@@ -651,15 +696,15 @@ def main():
                 env_file=args.env_file,
                 deploy_command=args.deploy_command,
                 force=args.force,
-                project_dir=args.project_dir,
+                project_dir=project_dir,
             )
 
             # Run health checks if specified
             if host and (args.health_check or args.health_port or args.health_url):
                 from vm_tool.health import SmokeTestSuite
 
-                print("\n🏥 Running Health Checks...")
-                suite = SmokeTestSuite(host)
+                print(f"\n🏥 Running Health Checks (Timeout: {args.health_timeout}s)...")
+                suite = SmokeTestSuite(host, timeout=args.health_timeout)
 
                 if args.health_port:
                     suite.add_port_check(args.health_port)
@@ -779,7 +824,37 @@ def main():
             if deployment_type == "custom":
                 deploy_command = input("Enter custom deployment command: ").strip()
 
-            elif deployment_type == "docker":
+    elif args.command == "prepare-release":
+        from vm_tool.release import ReleaseManager
+        manager = ReleaseManager(verbose=args.verbose)
+        try:
+            manager.prepare_release(
+                base_file=args.base_file,
+                prod_file=args.prod_file,
+                output_file=args.output,
+                strip_volumes=args.strip_volumes,
+                fix_paths=args.fix_paths
+            )
+        except Exception as e:
+            print(f"❌ Release preparation failed: {e}")
+            sys.exit(1)
+
+        except Exception as e:
+            print(f"❌ Release preparation failed: {e}")
+            sys.exit(1)
+
+    elif args.command == "setup-ci":
+        from vm_tool.runner import SetupRunner
+        # No config needed for this utility
+        try:
+             # We can add a static method or simple function for this
+             SetupRunner.setup_ci_environment(provider=args.provider)
+             print("✅ CI Environment configured successfully")
+        except Exception as e:
+             print(f"❌ CI Setup failed: {e}")
+             sys.exit(1)
+
+    elif deployment_type == "docker":
                 docker_compose_file = (
                     input(
                         "Enter Docker Compose file name [docker-compose.yml]: "

{vm_tool-1.0.44 → vm_tool-1.0.45}/vm_tool/generator.py

@@ -345,7 +345,7 @@ jobs:
           
           # Replace absolute paths (from CI runner) with relative paths
           # This assumes the structure: /home/runner/work/repo/repo/ -> ./
-          sed -i 's|/home/runner/work/[^/]*/[^/]*||g' docker-compose.released.yml
+          sed -i 's|/home/runner/work/[^/]*/[^/]*|.|g' docker-compose.released.yml
           
           echo "✅ Generated combined Docker Compose file"
           cat docker-compose.released.yml
@@ -447,11 +447,9 @@ jobs:
             "--user" "${{ secrets.SSH_USERNAME }}"
           )
 
-          # Move .env if it exists and add to args
+          # Add .env if it exists
           if [ -f .env ]; then
-            mkdir -p env
-            mv .env env/.env
-            ARGS+=("--env-file" "env/.env")
+            ARGS+=("--env-file" ".env")
           fi
           
           vm_tool deploy-docker "${ARGS[@]}"

{vm_tool-1.0.44 → vm_tool-1.0.45}/vm_tool/health.py

@@ -120,9 +120,9 @@ class HealthCheck:
 class SmokeTestSuite:
     """Manages a suite of smoke tests."""
 
-    def __init__(self, host: str):
+    def __init__(self, host: str, timeout: int = 300):
         self.host = host
-        self.health_check = HealthCheck(host)
+        self.health_check = HealthCheck(host, timeout=timeout)
         self.tests: List[Dict] = []
 
     def add_port_check(self, port: int, name: str = None):

vm_tool-1.0.45/vm_tool/release.py

@@ -0,0 +1,123 @@
+import subprocess
+import yaml
+import os
+import shutil
+
+
+class ReleaseManager:
+    def __init__(self, verbose=False):
+        self.verbose = verbose
+
+    def _log(self, message):
+        if self.verbose:
+            print(f"DEBUG: {message}")
+
+    def merge_compose_files(self, files, output_file):
+        """
+        Merge multiple docker-compose files using `docker compose config`.
+        """
+        if not files:
+            raise ValueError("No input files provided")
+
+        cmd = ["docker", "compose"]
+        for f in files:
+            if not os.path.exists(f):
+                # Fallback: check if it exists relative to current dir?
+                # Or just skip/warn? For now, fail if explicit file missing.
+                # But our logic handles missing optional files upstream.
+                if self.verbose:
+                    print(f"Warning: File {f} does not exist, skipping.")
+                continue
+            cmd.extend(["-f", f])
+
+        cmd.append("config")
+
+        self._log(f"Running: {' '.join(cmd)}")
+
+        try:
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True)
+            with open(output_file, "w") as f:
+                f.write(result.stdout)
+            print(f"✅ Merged configuration written to {output_file}")
+            return True
+        except subprocess.CalledProcessError as e:
+            print(f"❌ Error merging compose files: {e.stderr}")
+            raise
+
+    def fix_paths(
+        self,
+        file_path,
+        target_pattern=r"/home/runner/work/[^/]*/[^/]*",
+        replacement=".",
+    ):
+        """
+        Replace absolute CI paths with relative paths.
+        Uses sed-like logic but in Python.
+        """
+        import re
+
+        with open(file_path, "r") as f:
+            content = f.read()
+
+        # Regex replacement
+        new_content = re.sub(target_pattern, replacement, content)
+
+        if content != new_content:
+            with open(file_path, "w") as f:
+                f.write(new_content)
+            print(f"✅ Fixed paths in {file_path}")
+        else:
+            self._log("No path replacements needed.")
+
+    def strip_service_volumes(self, file_path, service_name):
+        """
+        Load YAML, remove 'volumes' from the specified service, and write back.
+        Also remove nginx-specific hardcoded volume keys like 'nginx.conf' if present
+        in a way that pyyaml doesn't mess up.
+        Actually, let's use a pure YAML approach.
+        """
+        with open(file_path, "r") as f:
+            data = yaml.safe_load(f)
+
+        services = data.get("services", {})
+        if service_name in services:
+            service = services[service_name]
+            if "volumes" in service:
+                del service["volumes"]
+                print(f"✅ Stripped volumes from service '{service_name}'")
+
+                # Write back
+                with open(file_path, "w") as f:
+                    yaml.dump(data, f, default_flow_style=False, sort_keys=False)
+            else:
+                self._log(f"Service '{service_name}' has no volumes to strip.")
+        else:
+            self._log(f"Service '{service_name}' not found in compose file.")
+
+    def prepare_release(
+        self, base_file, prod_file, output_file, strip_volumes=None, fix_paths=True
+    ):
+        """
+        Orchestrate the release preparation.
+        """
+        files_to_merge = []
+        if os.path.exists(base_file):
+            files_to_merge.append(base_file)
+
+        # Check prod file variants
+        if os.path.exists(prod_file):
+            files_to_merge.append(prod_file)
+        elif os.path.exists(os.path.basename(prod_file)):
+            files_to_merge.append(os.path.basename(prod_file))
+
+        if not files_to_merge:
+            raise FileNotFoundError("No valid docker-compose files found to merge.")
+
+        self.merge_compose_files(files_to_merge, output_file)
+
+        if fix_paths:
+            self.fix_paths(output_file)
+
+        if strip_volumes:
+            for svc in strip_volumes.split(","):
+                self.strip_service_volumes(output_file, svc.strip())

{vm_tool-1.0.44 → vm_tool-1.0.45}/vm_tool/runner.py

@@ -215,25 +215,36 @@ class SetupRunner:
                 # Check volumes (bind mounts)
                 volumes = service.get("volumes", [])
                 for vol in volumes:
+                    host_path = None
                     if isinstance(vol, str):
                         parts = vol.split(":")
                         if len(parts) >= 2:
                             host_path = parts[0]
-                            # Check if it's a relative path bind mount
-                            if (
-                                host_path.startswith("./")
-                                or host_path.startswith("../")
-                            ) and os.path.exists(host_path):
-                                if host_path.startswith("./"):
-                                    clean_path = host_path[2:]
-                                else:
-                                    clean_path = host_path
-
-                                if clean_path not in found_paths:
-                                    found_paths.add(clean_path)
-                                    dependencies.append(
-                                        {"src": clean_path, "dest": clean_path}
-                                    )
+                    elif isinstance(vol, dict):
+                        # Handle object-style volume definitions
+                        if vol.get("type") == "bind":
+                            host_path = vol.get("source")
+                        elif "source" in vol:  # Sometimes type is omitted
+                            host_path = vol.get("source")
+
+                    if host_path:
+                        # Check if it's a relative path bind mount
+                        # Normalize path for existence check
+                        if host_path.startswith("./"):
+                            check_path = host_path[2:]
+                        else:
+                            check_path = host_path
+
+                        if (
+                            host_path.startswith("./")
+                            or host_path.startswith("../")
+                            or not host_path.startswith("/")
+                        ) and os.path.exists(check_path):
+                            if check_path not in found_paths:
+                                found_paths.add(check_path)
+                                dependencies.append(
+                                    {"src": check_path, "dest": check_path}
+                                )
 
         except Exception as e:
             logger.warning(f"Failed to parse compose file for dependencies: {e}")
@@ -594,3 +605,59 @@ class SetupRunner:
             if host:
                 state.mark_failed(host, service_name, str(e))
             raise
+
+    @staticmethod
+    def setup_ci_environment(provider="github"):
+        """
+        Configures CI environment (SSH, Inventory) based on standard env vars.
+        Inputs (Env Vars): SSH_ID_RSA, SSH_HOSTNAME, SSH_USERNAME
+        Outputs: ~/.ssh/deploy_key, inventory.yml
+        """
+        ssh_key = os.environ.get("SSH_ID_RSA")
+        ssh_host = os.environ.get("SSH_HOSTNAME")
+        ssh_user = os.environ.get("SSH_USERNAME")
+
+        missing = []
+        if not ssh_key:
+            missing.append("SSH_ID_RSA")
+        if not ssh_host:
+            missing.append("SSH_HOSTNAME")
+        if not ssh_user:
+            missing.append("SSH_USERNAME")
+
+        if missing:
+            raise ValueError(
+                f"Missing required environment variables: {', '.join(missing)}"
+            )
+
+        # 1. Setup SSH Key
+        ssh_dir = os.path.expanduser("~/.ssh")
+        os.makedirs(ssh_dir, exist_ok=True)
+        key_path = os.path.join(ssh_dir, "deploy_key")
+
+        # Clean newlines if potentially mangled
+        ssh_key_clean = ssh_key.replace(r"\n", "\n")
+
+        with open(key_path, "w") as f:
+            f.write(ssh_key_clean)
+        os.chmod(key_path, 0o600)
+        logger.info(f"✅ SSH key written to {key_path}")
+
+        # 2. Create Inventory
+        inventory_content = {
+            "all": {
+                "hosts": {
+                    "production": {
+                        "ansible_host": ssh_host,
+                        "ansible_user": ssh_user,
+                        "ansible_ssh_private_key_file": key_path,
+                        # Using standard CI strict checking disabled for automation
+                        "ansible_ssh_common_args": "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ServerAliveInterval=60 -o ServerAliveCountMax=10",
+                    }
+                }
+            }
+        }
+
+        with open("inventory.yml", "w") as f:
+            yaml.dump(inventory_content, f)
+        logger.info("✅ inventory.yml created")

{vm_tool-1.0.44 → vm_tool-1.0.45}/vm_tool/vm_setup/push_code_tasks.yml

@@ -40,6 +40,18 @@
   loop: "{{ FILES_TO_COPY | default([]) }}"
   when: FILES_TO_COPY is defined and (item.dest | dirname) != ''
 
+- name: Clean up conflicting directories
+  shell: |
+     target="{{ project_dest_dir }}/{{ item.dest }}"
+     if [ -d "$target" ]; then
+       rm -rf "$target"
+       echo "removed_directory"
+     fi
+  loop: "{{ FILES_TO_COPY | default([]) }}"
+  register: dir_cleanup
+  changed_when: "'removed_directory' in dir_cleanup.stdout"
+  when: FILES_TO_COPY is defined
+
 - name: Copy dependency files
   copy:
     src: "{{ SOURCE_PATH }}/{{ item.src }}"

{vm_tool-1.0.44 → vm_tool-1.0.45}/vm_tool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vm_tool
-Version: 1.0.44
+Version: 1.0.45
 Summary: A Comprehensive Tool for Setting Up Virtual Machines.
 Home-page: https://github.com/thesunnysinha/vm_tool
 Author: Sunny Sinha

{vm_tool-1.0.44 → vm_tool-1.0.45}/vm_tool.egg-info/SOURCES.txt

@@ -87,6 +87,7 @@ vm_tool/plugins.py
 vm_tool/policy.py
 vm_tool/rbac.py
 vm_tool/recovery.py
+vm_tool/release.py
 vm_tool/reporting.py
 vm_tool/runner.py
 vm_tool/secrets.py