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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vm_tool
-Version: 1.0.37
+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.37 → vm_tool-1.0.39}/codePushToGithub.py

@@ -13,11 +13,7 @@ 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
+            cmd, shell=shell, check=check, capture_output=True, text=True
         )
         if result.stdout:
             print(result.stdout)
@@ -37,7 +33,7 @@ def get_venv_path():
 def get_python_executable():
     """Get the Python executable path for the virtual environment."""
     venv_path = get_venv_path()
-    if os.name == 'nt':  # Windows
+    if os.name == "nt":  # Windows
         return venv_path / "Scripts" / "python.exe"
     else:  # Unix/Linux/Mac
         return venv_path / "bin" / "python"
@@ -46,7 +42,7 @@ def get_python_executable():
 def get_pip_executable():
     """Get the pip executable path for the virtual environment."""
     venv_path = get_venv_path()
-    if os.name == 'nt':  # Windows
+    if os.name == "nt":  # Windows
         return venv_path / "Scripts" / "pip.exe"
     else:  # Unix/Linux/Mac
         return venv_path / "bin" / "pip"
@@ -55,7 +51,7 @@ def get_pip_executable():
 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')
@@ -67,23 +63,23 @@ def create_venv():
 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()
@@ -99,21 +95,21 @@ def setup_environment():
 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':
+    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)
 
 
@@ -136,71 +132,70 @@ def main():
     print("🔧 Setting up environment...")
     setup_environment()
     print()
-    
+
     # Ask for the branch name
     branch_name = input("Enter the branch name: ").strip()
-    
+
     if branch_name == "main":
-        # Get current version before bump
+        # 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()
-        
-        # Bump version for main branch
-        print("\n" + "="*60)
+        print("\n" + "=" * 60)
         print(f"🔢 Bumping version from {current_version}...")
-        print("="*60)
+        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("\n" + "=" * 60)
         print(f"✅ Version bumped: {current_version} → {new_version}")
-        print("="*60 + "\n")
-        
-        # 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 directly to the "main" branch
+        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}!")
 
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vm_tool"
-version = "1.0.37"
+version = "1.0.39"
 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.37"
+current_version = "1.0.39"
 commit = true
 tag = true
 

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

@@ -12,7 +12,7 @@ else:
 
 setup(
     name="vm_tool",
-    version="1.0.37",  # 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.37 → 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.37")
+    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.37 → 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
@@ -391,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.37 → vm_tool-1.0.39}/vm_tool/vm_setup/push_code_tasks.yml

@@ -19,6 +19,13 @@
 # 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 }}"

{vm_tool-1.0.37 → 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.37
+Version: 1.0.39
 Summary: A Comprehensive Tool for Setting Up Virtual Machines.
 Home-page: https://github.com/thesunnysinha/vm_tool
 Author: Sunny Sinha