devs-cli 3.2.4__tar.gz → 3.3.1__tar.gz

{devs_cli-3.2.4/devs_cli.egg-info → devs_cli-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-cli
-Version: 3.2.4
+Version: 3.3.1
 Summary: DevContainer Management Tool - Manage multiple named devcontainers for any project
 Author: Dan Lester
 License-Expression: MIT

{devs_cli-3.2.4 → devs_cli-3.3.1}/devs/cli.py

@@ -168,46 +168,52 @@ def cli(ctx, debug: bool, repo: str) -> None:
 @cli.command()
 @click.argument('dev_names', nargs=-1, required=True)
 @click.option('--rebuild', is_flag=True, help='Force rebuild of container images')
+@click.option('--rebuild-if-changed', 'rebuild_if_changed', is_flag=True, help='Rebuild if devcontainer files have changed since last build')
 @click.option('--live', is_flag=True, help='Mount current directory as workspace instead of copying')
 @click.option('--env', multiple=True, help='Environment variables to pass to container (format: VAR=value)')
 @debug_option
-def start(dev_names: tuple, rebuild: bool, live: bool, env: tuple, debug: bool) -> None:
+def start(dev_names: tuple, rebuild: bool, rebuild_if_changed: bool, live: bool, env: tuple, debug: bool) -> None:
     """Start named devcontainers.
-    
+
     DEV_NAMES: One or more development environment names to start
-    
+
     Example: devs start sally bob
     Example: devs start sally --live  # Mount current directory directly
+    Example: devs start sally --rebuild-if-changed  # Rebuild only if devcontainer files changed
     Example: devs start sally --env QUART_PORT=5001 --env DB_HOST=localhost:3307
     """
     check_dependencies()
     project = get_project()
-    
+
     console.print(f"🚀 Starting devcontainers for project: {project.info.name}")
-    
+
     container_manager = ContainerManager(project, config)
     workspace_manager = WorkspaceManager(project, config)
-    
+
     for dev_name in dev_names:
         console.print(f"   Starting: {dev_name}")
-        
+
         # Load environment variables from DEVS.yml and merge with CLI --env flags
         devs_env = DevsConfigLoader.load_env_vars(dev_name, project.info.name)
         cli_env = parse_env_vars(env) if env else {}
         extra_env = merge_env_vars(devs_env, cli_env) if devs_env or cli_env else None
-        
+
         if extra_env:
             console.print(f"🔧 Environment variables: {', '.join(f'{k}={v}' for k, v in extra_env.items())}")
-        
+
         try:
             # Create/ensure workspace exists (handles live mode internally)
             workspace_dir = workspace_manager.create_workspace(dev_name, live=live)
-            
-            # Ensure container is running
+
+            # Ensure container is running.
+            # --rebuild: always force a full rebuild
+            # --rebuild-if-changed: rebuild only when devcontainer file content has changed
+            # (default): never auto-rebuild
             if container_manager.ensure_container_running(
-                dev_name, 
-                workspace_dir, 
+                dev_name,
+                workspace_dir,
                 force_rebuild=rebuild,
+                check_rebuild=rebuild_if_changed,
                 debug=debug,
                 live=live,
                 extra_env=extra_env
@@ -215,7 +221,7 @@ def start(dev_names: tuple, rebuild: bool, live: bool, env: tuple, debug: bool)
                 continue
             else:
                 console.print(f"   ⚠️  Failed to start {dev_name}, continuing with others...")
-                
+
         except (ContainerError, WorkspaceError) as e:
             console.print(f"   ❌ Error starting {dev_name}: {e}")
             continue
@@ -268,8 +274,8 @@ def vscode(dev_names: tuple, delay: float, live: bool, env: tuple, debug: bool)
             # Ensure workspace exists (handles live mode internally)
             workspace_dir = workspace_manager.create_workspace(dev_name, live=live)
             
-            # Ensure container is running before launching VS Code
-            if container_manager.ensure_container_running(dev_name, workspace_dir, debug=debug, live=live, extra_env=extra_env):
+            # Ensure container is running before launching VS Code (no auto-rebuild in CLI)
+            if container_manager.ensure_container_running(dev_name, workspace_dir, check_rebuild=False, debug=debug, live=live, extra_env=extra_env):
                 workspace_dirs.append(workspace_dir)
                 valid_dev_names.append(dev_name)
             else:
@@ -776,11 +782,13 @@ def tunnel(dev_name: str, auth: bool, status: bool, kill_tunnel: bool, live: boo
                 extra_env=extra_env
             )
             if is_running:
-                console.print(f"Tunnel status for {dev_name}:")
+                console.print(f"[bold]Tunnel for {dev_name}:[/bold]")
                 console.print(status_msg)
             else:
-                console.print(f"No tunnel running in {dev_name}")
-                console.print(f"   {status_msg}")
+                console.print(f"[bold]Tunnel for {dev_name}:[/bold]")
+                console.print(f"[dim]   Not running[/dim]")
+                if status_msg:
+                    console.print(f"   {status_msg}")
 
         elif kill_tunnel:
             # Kill the tunnel

{devs_cli-3.2.4 → devs_cli-3.3.1/devs_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devs-cli
-Version: 3.2.4
+Version: 3.3.1
 Summary: DevContainer Management Tool - Manage multiple named devcontainers for any project
 Author: Dan Lester
 License-Expression: MIT

{devs_cli-3.2.4 → devs_cli-3.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devs-cli"
-version = "3.2.4"
+version = "3.3.1"
 description = "DevContainer Management Tool - Manage multiple named devcontainers for any project"
 readme = "README.md"
 requires-python = ">=3.8"

{devs_cli-3.2.4 → devs_cli-3.3.1}/tests/test_container_manager.py

@@ -246,7 +246,7 @@ class TestContainerManager:
                 assert result is False
 
     def test_should_rebuild_image_no_existing(self, mock_project):
-        """Test should_rebuild_image when no image exists."""
+        """Test should_rebuild_image returns False when no existing container."""
         with patch('devs_common.utils.docker_client.docker') as mock_docker:
             mock_docker_instance = MagicMock()
             mock_docker.from_env.return_value = mock_docker_instance
@@ -257,13 +257,14 @@ class TestContainerManager:
 
                 manager = ContainerManager(mock_project)
 
-                # Mock no existing images
-                manager.docker.find_images_by_pattern = MagicMock(return_value=[])
+                # Mock no existing containers
+                manager.docker.find_containers_by_labels = MagicMock(return_value=[])
 
-                should_rebuild, reason = manager.should_rebuild_image("alice")
+                project_labels = {'devs.project': 'test-org-test-repo', 'devs.dev': 'alice'}
+                should_rebuild, reason = manager.should_rebuild_image("alice", project_labels)
 
                 assert should_rebuild is False
-                assert "No existing image" in reason
+                assert "No existing container" in reason
 
     def test_find_aborted_containers(self, mock_project):
         """Test finding aborted containers."""