vm-tool 1.0.33__py3-none-any.whl → 1.0.39__py3-none-any.whl

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/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/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/vm_setup/push_code.yml

@@ -2,41 +2,4 @@
   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('') }}"
+    - include_tasks: push_code_tasks.yml

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.dist-info → vm_tool-1.0.39.dist-info}/METADATA

@@ -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.dist-info → vm_tool-1.0.39.dist-info}/RECORD

@@ -24,7 +24,7 @@ vm_tool/alerting.py,sha256=6bNfQNSAQ_SJW9dQfB8s8gDZ-7ocYw4Q211VM6FWiXU,8269
 vm_tool/audit.py,sha256=spVtMcwadTkD9lELH1tur7Dr3OHjajk44ZatKYEbeVI,3388
 vm_tool/backup.py,sha256=WhwCXXJDYCQgoexroksNhWgB5ki6HUly0JhQ9ybCdMg,4130
 vm_tool/benchmarking.py,sha256=9AZ4JwKd5aEjwtKnhsuFa77y6WSO_fSEIqgMh3w_Btw,6212
-vm_tool/cli.py,sha256=Q2eAjs3bqrT4_y5CsuMLLEDHgaiR8oMWxlJfin9gdbo,28597
+vm_tool/cli.py,sha256=PLq5CfO8p-6ppfXc_nm64NUZGD0vid9F_wmbizsdsig,28828
 vm_tool/cloud.py,sha256=1fQV1o3wCth55B1hSenME_j2n5gCJDo9gtUcqDxCs7s,4047
 vm_tool/completion.py,sha256=U8W8mmNdR0Ci0WjlEIa8CLOUtaVLZ5tWYpqViBBIBF8,7431
 vm_tool/compliance.py,sha256=7yXrvRoPxJMW0DTVhJ-ZxbaJo7quDSVgae2_mYbVAmE,3173
@@ -41,7 +41,7 @@ vm_tool/policy.py,sha256=Z05TLSqMu-tSM0_SnCdsIZqebHGRtXNSRLwkOBDthtY,6072
 vm_tool/rbac.py,sha256=hdFzh4QhUuQmGmMXBuG-o21FdEp1fb8WSJrCWAz-drI,3999
 vm_tool/recovery.py,sha256=fesho6Pi_ItRkdtiNK2bh-8Q_T98kSn2LZwKovMFsWI,5473
 vm_tool/reporting.py,sha256=yiLdArTfu7A8-PWL3dmFSRNpcMvBSq1iHNw6YJRO1hI,7419
-vm_tool/runner.py,sha256=C2pFRvKlXeXnmmbRiSVl45AiO-XmXMrB2u1fyzC9rQA,17451
+vm_tool/runner.py,sha256=JoksxK31e2zVd4t-vHA8_GFrVvgeUngoMU9AFNxoxw4,17666
 vm_tool/secrets.py,sha256=bvbunxt4dLupFZQs3VUHkxDOASoBgtpggO0oavTuzOk,9397
 vm_tool/ssh.py,sha256=c9Nxs20VEq--qWCLZyc6uRqgny2-OCSwnTlcx9bZJtg,4905
 vm_tool/state.py,sha256=DxJoRLITwT8mWcs_eAgFNTDfcrGh4PMdQuFjdGb1n6Y,4079
@@ -54,10 +54,11 @@ vm_tool/strategies/canary.py,sha256=heLW3599IBXTp9m79MKB5Lo-XO93jUf8Ehs3cM_q_Q4,
 vm_tool/vm_setup/cleanup.yml,sha256=7eToWeIyoOEGWpm-bisoxymo1b-R8yPdF2AeukPyMUk,863
 vm_tool/vm_setup/inventory.yml,sha256=_dV8RYKfHA9vMq5WJg9jpplR8_R_lh6F0fA3tzAY6oY,34
 vm_tool/vm_setup/k8s.yml,sha256=Rn7dypJ_ccf_LxFSECuGFWpRrkX5svrt5IHJbjMmll0,342
-vm_tool/vm_setup/main.yml,sha256=i6iQ6c5yqWOlMEIK__rIEEEKEWDVOVEB9_9rnzg1rSU,651
+vm_tool/vm_setup/main.yml,sha256=QUWUFf7W1y9dvfL-sfYIgh491cxRBTm521jI4he24Jg,657
 vm_tool/vm_setup/monitoring.yml,sha256=u4WhkO2P6O2Mrqo02z8G_FshcFjAbY1Avve5mb5sxZs,1090
 vm_tool/vm_setup/project_service.yml,sha256=YlvRx9XgW2X1MsKa9XWr7LWK-BET2zFly8Q-7cNedH4,545
-vm_tool/vm_setup/push_code.yml,sha256=B1e7OB-AsEL2mdWLu0M6n-9A14F06XCEFGflbjjZ7Vs,1707
+vm_tool/vm_setup/push_code.yml,sha256=U5zqx04oV2S4U4VsXaecn8S9_UrZGEcTjKbhIZdCgs8,112
+vm_tool/vm_setup/push_code_tasks.yml,sha256=dgPgcn3WAxff50GiWB7z2cWpndoqPZWOvij7DZzBxwM,1773
 vm_tool/vm_setup/setup.yml,sha256=D3qsBkzWEWEgeAmxO7bk99wxUaFImeSbZNVa3I2BXR8,659
 vm_tool/vm_setup/setup_project_env.yml,sha256=Q4K6ZgGfgP8pW-QKV3Wkvb0V82AGjHoWB9TM8xq2Nd0,274
 vm_tool/vm_setup/docker/create_docker_service.yml,sha256=C4nZpFBVzA7_xn0PEMIpYjXcYyA73ClxdMQgTh319eI,2140
@@ -65,9 +66,9 @@ vm_tool/vm_setup/docker/docker_setup.yml,sha256=kg6Abu3TjcLwV0JHnCAVUkj5l2HaGf7O
 vm_tool/vm_setup/docker/install_docker_and_compose.yml,sha256=NxPm4YkOekRH0dpJQVgxjcSqrmT6f912Dv0owYsLBxE,3402
 vm_tool/vm_setup/docker/login_to_docker_hub.yml,sha256=y9WaWLb1f1SuHVa1NNm24Gvf5bbwQ8eqEsImGLHGHGU,223
 vm_tool/vm_setup/github/git_configuration.yml,sha256=hKuzOFsVlYRoBAXujREfrLiqV7j4RnQYbL5s63AEAqk,2355
-vm_tool-1.0.33.dist-info/licenses/LICENSE,sha256=4OO6Zd_hYEOemzTNdgUR_E7oNvUJLuN2E7ZAgm7DcSM,1063
-vm_tool-1.0.33.dist-info/METADATA,sha256=xDKQOms427Z8kxbI4Es-3qKV3FDL_EvgoSCAs3lutUA,6191
-vm_tool-1.0.33.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-vm_tool-1.0.33.dist-info/entry_points.txt,sha256=A2EAvw95ftFXzVAWfHKIM-SsxQVxrIrByRNe-ArOp2k,45
-vm_tool-1.0.33.dist-info/top_level.txt,sha256=jTLckJpKvJplpmKoMhPz2YKp_sQB9Q5-cCGmUHCp06M,17
-vm_tool-1.0.33.dist-info/RECORD,,
+vm_tool-1.0.39.dist-info/licenses/LICENSE,sha256=4OO6Zd_hYEOemzTNdgUR_E7oNvUJLuN2E7ZAgm7DcSM,1063
+vm_tool-1.0.39.dist-info/METADATA,sha256=6MURa9xBzCUWCcfFKEYP7W1A-3wzbBghfFCcczB7HE0,6191
+vm_tool-1.0.39.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+vm_tool-1.0.39.dist-info/entry_points.txt,sha256=A2EAvw95ftFXzVAWfHKIM-SsxQVxrIrByRNe-ArOp2k,45
+vm_tool-1.0.39.dist-info/top_level.txt,sha256=jTLckJpKvJplpmKoMhPz2YKp_sQB9Q5-cCGmUHCp06M,17
+vm_tool-1.0.39.dist-info/RECORD,,