vm-tool 1.0.33__tar.gz → 1.0.39__tar.gz

{vm_tool-1.0.33 → vm_tool-1.0.39}/PKG-INFO

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

vm_tool-1.0.39/codePushToGithub.py

@@ -0,0 +1,203 @@
+#!/usr/bin/env python3
+"""
+Script to automate git commits and pushes with version bumping for main branch.
+Automatically manages virtual environment and dependencies.
+"""
+import subprocess
+import sys
+import os
+from pathlib import Path
+
+
+def run_command(cmd, check=True, shell=True):
+    """Run a shell command and return the result."""
+    try:
+        result = subprocess.run(
+            cmd, shell=shell, check=check, capture_output=True, text=True
+        )
+        if result.stdout:
+            print(result.stdout)
+        return result
+    except subprocess.CalledProcessError as e:
+        print(f"Error running command: {cmd}")
+        if e.stderr:
+            print(f"Error: {e.stderr}")
+        sys.exit(1)
+
+
+def get_venv_path():
+    """Get the virtual environment path."""
+    return Path(__file__).parent / "venv"
+
+
+def get_python_executable():
+    """Get the Python executable path for the virtual environment."""
+    venv_path = get_venv_path()
+    if os.name == "nt":  # Windows
+        return venv_path / "Scripts" / "python.exe"
+    else:  # Unix/Linux/Mac
+        return venv_path / "bin" / "python"
+
+
+def get_pip_executable():
+    """Get the pip executable path for the virtual environment."""
+    venv_path = get_venv_path()
+    if os.name == "nt":  # Windows
+        return venv_path / "Scripts" / "pip.exe"
+    else:  # Unix/Linux/Mac
+        return venv_path / "bin" / "pip"
+
+
+def create_venv():
+    """Create a virtual environment if it doesn't exist."""
+    venv_path = get_venv_path()
+
+    if not venv_path.exists():
+        print("📦 Creating virtual environment...")
+        run_command(f'"{sys.executable}" -m venv venv')
+        print("✅ Virtual environment created!")
+        return True
+    return False
+
+
+def install_dependencies():
+    """Install required dependencies in the virtual environment."""
+    python_exe = get_python_executable()
+
+    print("📦 Installing/updating dependencies...")
+    # Use python -m pip instead of direct pip executable (Windows compatibility)
+    run_command(f'"{python_exe}" -m pip install --upgrade pip')
+    run_command(f'"{python_exe}" -m pip install bump-my-version')
+
+    # Install project dependencies if requirements.txt exists
+    if Path("requirements.txt").exists():
+        run_command(f'"{python_exe}" -m pip install -r requirements.txt')
+
+    print("✅ Dependencies installed!")
+
+
+def setup_environment():
+    """Setup virtual environment and dependencies."""
+    venv_created = create_venv()
+
+    # Always install/update dependencies if venv was just created
+    if venv_created:
+        install_dependencies()
+    else:
+        # Check if bump-my-version is available
+        python_exe = get_python_executable()
+        result = run_command(f'"{python_exe}" -m pip show bump-my-version', check=False)
+        if result.returncode != 0:
+            print("⚠️  bump-my-version not found, installing dependencies...")
+            install_dependencies()
+
+
+def run_in_venv(cmd):
+    """Run a command using the virtual environment's Python."""
+    python_exe = get_python_executable()
+
+    # For bump-my-version, we need to use the venv's Scripts directory
+    venv_path = get_venv_path()
+    if os.name == "nt":
+        bump_exe = venv_path / "Scripts" / "bump-my-version.exe"
+    else:
+        bump_exe = venv_path / "bin" / "bump-my-version"
+
+    # Replace bump-my-version command with full path
+    if cmd.startswith("bump-my-version"):
+        cmd = cmd.replace("bump-my-version", f'"{bump_exe}"')
+        # Add verbose flag to show what's happening
+        if "--verbose" not in cmd and "-v" not in cmd:
+            cmd = cmd.replace("bump patch", "bump patch --verbose")
+
+    return run_command(cmd)
+
+
+def get_current_version():
+    """Read the current version from pyproject.toml."""
+    try:
+        with open("pyproject.toml", "r") as f:
+            for line in f:
+                if line.strip().startswith("version ="):
+                    # Extract version from line like: version = "1.0.34"
+                    version = line.split("=")[1].strip().strip('"').strip("'")
+                    return version
+    except Exception as e:
+        print(f"Warning: Could not read current version: {e}")
+    return "unknown"
+
+
+def main():
+    # Setup virtual environment
+    print("🔧 Setting up environment...")
+    setup_environment()
+    print()
+
+    # Ask for the branch name
+    branch_name = input("Enter the branch name: ").strip()
+
+    if branch_name == "main":
+        # 1. Commit User Changes FIRST
+        print("Adding changes...")
+        run_command("git add .")
+
+        commit_message = input("Enter the commit message for your changes: ").strip()
+        print("Committing changes...")
+        run_command(f'git commit -m "{commit_message}"')
+
+        # 2. Bump Version (which creates a new commit and tag)
+        current_version = get_current_version()
+        print("\n" + "=" * 60)
+        print(f"🔢 Bumping version from {current_version}...")
+        print("=" * 60)
+        run_in_venv("bump-my-version bump patch --allow-dirty")
+
+        # Get new version after bump
+        new_version = get_current_version()
+        print("\n" + "=" * 60)
+        print(f"✅ Version bumped: {current_version} → {new_version}")
+        print("=" * 60 + "\n")
+
+        # 3. Push everything
+        print("Pushing to main...")
+        run_command("git push origin main")
+
+        # Push tags to trigger PyPI publish
+        print("Pushing tags...")
+        run_command("git push origin --tags")
+
+        # Pull latest changes
+        print("Pulling latest changes...")
+        run_command("git pull origin main")
+
+        print("✅ Successfully pushed to main with version bump!")
+
+    else:
+        # Create and switch to the new branch
+        print(f"Creating and switching to branch: {branch_name}")
+        run_command(f"git checkout -b {branch_name}")
+
+        # Add all changes
+        print("Adding changes...")
+        run_command("git add .")
+
+        # Ask for commit message
+        commit_message = input("Enter the commit message: ").strip()
+
+        # Commit with the entered message
+        print("Committing changes...")
+        run_command(f'git commit -m "{commit_message}"')
+
+        # Push changes to the specified branch
+        print(f"Pushing to {branch_name}...")
+        run_command(f"git push origin {branch_name}")
+
+        # Switch back to main
+        print("Switching back to main...")
+        run_command("git checkout main")
+
+        print(f"✅ Successfully pushed to {branch_name}!")
+
+
+if __name__ == "__main__":
+    main()

{vm_tool-1.0.33 → vm_tool-1.0.39}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vm_tool"
-version = "1.0.33"
+version = "1.0.39"
 description = "A Comprehensive Tool for Setting Up Virtual Machines."
 readme = "README.md"
 authors = [
@@ -66,6 +66,7 @@ upload_to_pypi = true
 upload_to_release = true
 build_command = "python setup.py sdist bdist_wheel"
 
+
 [tool.black]
 line-length = 88
 target-version = ['py39', 'py310', 'py311', 'py312']
@@ -75,7 +76,7 @@ include = '\.pyi?$'
 profile = "black"
 multi_line_output = 3
 [tool.bumpversion]
-current_version = "1.0.33"
+current_version = "1.0.39"
 commit = true
 tag = true
 

vm_tool-1.0.39/runtime.txt

@@ -0,0 +1 @@
+python-3.9

{vm_tool-1.0.33 → vm_tool-1.0.39}/setup.py

@@ -12,7 +12,7 @@ else:
 
 setup(
     name="vm_tool",
-    version="1.0.33",  # This will be updated by bump2version
+    version="1.0.39",  # 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.33 → vm_tool-1.0.39}/vm_tool/cli.py

@@ -6,7 +6,7 @@ def main():
     parser = argparse.ArgumentParser(
         description="VM Tool: Setup, Provision, and Manage VMs"
     )
-    parser.add_argument("--version", action="version", version="1.0.33")
+    parser.add_argument("--version", action="version", version="1.0.39")
     parser.add_argument(
         "--verbose", "-v", action="store_true", help="Enable verbose output"
     )
@@ -236,6 +236,12 @@ def main():
         action="store_true",
         help="Preview deployment without executing (shows what would be deployed)",
     )
+    docker_parser.add_argument(
+        "--project-dir",
+        type=str,
+        default="~/app",
+        help="Target directory on the server for deployment (default: ~/app)",
+    )
 
     # Completion command
     completion_parser = subparsers.add_parser(
@@ -600,6 +606,7 @@ def main():
                 env_file=args.env_file,
                 deploy_command=args.deploy_command,
                 force=args.force,
+                project_dir=args.project_dir,
             )
 
             # Run health checks if specified

{vm_tool-1.0.33 → vm_tool-1.0.39}/vm_tool/runner.py

@@ -320,6 +320,7 @@ class SetupRunner:
         env_file: str = None,
         deploy_command: str = None,
         force: bool = False,
+        project_dir: str = "~/app",
     ):
         """Runs the Docker Compose deployment with idempotency."""
         from vm_tool.state import DeploymentState
@@ -373,7 +374,11 @@ class SetupRunner:
             with open(generated_inventory_path, "w") as f:
                 yaml.dump(inventory_content, f)
 
-            target_inventory = "generated_inventory.yml"
+            target_inventory = generated_inventory_path
+
+        else:
+            # If not generating dynamic inventory, ensure the provided inventory path is absolute
+            target_inventory = os.path.abspath(inventory_file)
 
         logger.info(
             f"Starting Docker deployment using {compose_file} on {target_inventory}..."
@@ -387,7 +392,7 @@ class SetupRunner:
             "GITHUB_PROJECT_URL": self.github_project_url,
             "DEPLOY_MODE": "push",
             "SOURCE_PATH": os.getcwd(),  # Current working directory where vm_tool is run
-            "project_dest_dir": "~/app",
+            "project_dest_dir": project_dir,
             "GITHUB_REPOSITORY_OWNER": os.environ.get("GITHUB_REPOSITORY_OWNER", ""),
         }
 

{vm_tool-1.0.33 → vm_tool-1.0.39}/vm_tool/vm_setup/main.yml

@@ -11,7 +11,7 @@
       when: DEPLOY_MODE | default('pull') != 'push'
 
     - name: Push Code (Zero Touch)
-      include_tasks: push_code.yml
+      include_tasks: push_code_tasks.yml
       when: DEPLOY_MODE | default('pull') == 'push'
 
     - name: Setup Project Environment File

vm_tool-1.0.39/vm_tool/vm_setup/push_code.yml

@@ -0,0 +1,5 @@
+- name: Push Code Playbook
+  hosts: all
+  gather_facts: false
+  tasks:
+    - include_tasks: push_code_tasks.yml

vm_tool-1.0.39/vm_tool/vm_setup/push_code_tasks.yml

@@ -0,0 +1,45 @@
+- name: Ensure project directory exists
+  file:
+    path: "{{ project_dest_dir }}"
+    state: directory
+    mode: '0755'
+
+- name: Copy project files to target
+  copy:
+    src: "{{ playbook_dir }}/../../" 
+    dest: "{{ project_dest_dir }}/"
+    # Note: In ansible-runner, playbook_dir is inside private_data_dir/project/vm_setup.
+    # We need to be careful about the source path.
+    # However, ansible_runner isolates execution.
+    # Better approach: Pass SOURCE_PATH as extravar.
+  when: false # Placeholder, we will use synchronize or better strategy.
+
+# Re-thinking: simple 'copy' of just the compose file is safer for now if we don't know build context.
+# But usually context is needed. 
+# Let's rely on 'synchronize' (rsync) if available, or just copy the compose file if user only provided that.
+
+# For MVP of 'deploy-docker', let's copy the DOCKER_COMPOSE_FILE_PATH and .env if exists.
+- name: Ensure Docker Compose file parent directory exists
+  file:
+    path: "{{ project_dest_dir }}/{{ DOCKER_COMPOSE_FILE_PATH | dirname }}"
+    state: directory
+    mode: '0755'
+  when: DOCKER_COMPOSE_FILE_PATH is defined and (DOCKER_COMPOSE_FILE_PATH | dirname) != ''
+
+- name: Copy Docker Compose file
+  copy:
+    src: "{{ SOURCE_PATH }}/{{ DOCKER_COMPOSE_FILE_PATH }}"
+    dest: "{{ project_dest_dir }}/{{ DOCKER_COMPOSE_FILE_PATH }}"
+
+- name: Copy Env file
+  copy:
+    src: "{{ SOURCE_PATH }}/{{ ENV_FILE_PATH | default('.env') }}"
+    dest: "{{ project_dest_dir }}/{{ ENV_FILE_PATH | default('.env') }}"
+  failed_when: false
+
+- name: Deploy application
+  shell: "{{ DEPLOY_COMMAND | default('docker-compose up -d --remove-orphans') }}"
+  args:
+    chdir: "{{ project_dest_dir }}"
+  environment:
+    GITHUB_REPOSITORY_OWNER: "{{ GITHUB_REPOSITORY_OWNER | default('') }}"

{vm_tool-1.0.33 → vm_tool-1.0.39}/vm_tool.egg-info/PKG-INFO

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

{vm_tool-1.0.33 → vm_tool-1.0.39}/vm_tool.egg-info/SOURCES.txt

@@ -6,11 +6,12 @@ LICENSE
 MANIFEST.in
 Makefile
 README.md
-codePushToGithub.sh
+codePushToGithub.py
 mkdocs.yml
 pyproject.toml
 requirements-docs.txt
 requirements.txt
+runtime.txt
 setup.py
 .devcontainer/devcontainer.json
 .github/dependabot.yml
@@ -107,6 +108,7 @@ vm_tool/vm_setup/main.yml
 vm_tool/vm_setup/monitoring.yml
 vm_tool/vm_setup/project_service.yml
 vm_tool/vm_setup/push_code.yml
+vm_tool/vm_setup/push_code_tasks.yml
 vm_tool/vm_setup/setup.yml
 vm_tool/vm_setup/setup_project_env.yml
 vm_tool/vm_setup/docker/create_docker_service.yml

vm_tool-1.0.33/codePushToGithub.sh

@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# Navigate to the directory
-script_directory="$(dirname "$0")"
-
-# Navigate to the script's directory
-cd "$script_directory"
-
-# Ask for the branch name
-read -p "Enter the branch name: " branch_name
-
-# Check if the branch name is "main"
-if [ "$branch_name" = "main" ]; then
-
-    bump-my-version bump patch --allow-dirty
-
-    # Add all changes
-    git add .
-
-    # Ask for the commit message
-    read -p "Enter the commit message: " commit_message
-
-    # Commit with the entered message
-    git commit -m "$commit_message"
-
-    # Push changes directly to the "main" branch
-    git push origin main
-
-    git pull origin main
-else
-    # Create and switch to the new branch
-    git checkout -b "$branch_name"
-
-    # Add all changes
-    git add .
-
-    # Ask for the commit message
-    read -p "Enter the commit message: " commit_message
-
-    # Commit with the entered message
-    git commit -m "$commit_message"
-
-    # Push changes to the specified branch
-    git push origin "$branch_name"
-
-    git checkout main
-fi

vm_tool-1.0.33/vm_tool/vm_setup/push_code.yml

@@ -1,42 +0,0 @@
-- name: Push Code Playbook
-  hosts: all
-  gather_facts: false
-  tasks:
-    - name: Ensure project directory exists
-      file:
-        path: "{{ project_dest_dir }}"
-        state: directory
-        mode: '0755'
-
-    - name: Copy project files to target
-      copy:
-        src: "{{ playbook_dir }}/../../" 
-        dest: "{{ project_dest_dir }}/"
-        # Note: In ansible-runner, playbook_dir is inside private_data_dir/project/vm_setup.
-        # We need to be careful about the source path.
-        # However, ansible_runner isolates execution.
-        # Better approach: Pass SOURCE_PATH as extravar.
-      when: false # Placeholder, we will use synchronize or better strategy.
-
-    # Re-thinking: simple 'copy' of just the compose file is safer for now if we don't know build context.
-    # But usually context is needed. 
-    # Let's rely on 'synchronize' (rsync) if available, or just copy the compose file if user only provided that.
-    
-    # For MVP of 'deploy-docker', let's copy the DOCKER_COMPOSE_FILE_PATH and .env if exists.
-    - name: Copy Docker Compose file
-      copy:
-        src: "{{ SOURCE_PATH }}/{{ DOCKER_COMPOSE_FILE_PATH }}"
-        dest: "{{ project_dest_dir }}/{{ DOCKER_COMPOSE_FILE_PATH }}"
-
-    - name: Copy Env file
-      copy:
-        src: "{{ SOURCE_PATH }}/{{ ENV_FILE_PATH | default('.env') }}"
-        dest: "{{ project_dest_dir }}/{{ ENV_FILE_PATH | default('.env') }}"
-      failed_when: false
-
-    - name: Deploy application
-      shell: "{{ DEPLOY_COMMAND | default('docker-compose up -d --remove-orphans') }}"
-      args:
-        chdir: "{{ project_dest_dir }}"
-      environment:
-        GITHUB_REPOSITORY_OWNER: "{{ GITHUB_REPOSITORY_OWNER | default('') }}"