devs-cli 3.2.3__tar.gz → 3.3.0__tar.gz

{devs_cli-3.2.3/devs_cli.egg-info → devs_cli-3.3.0}/PKG-INFO

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

{devs_cli-3.2.3 → devs_cli-3.3.0}/devs/cli.py

@@ -11,7 +11,6 @@ from rich.console import Console
 from rich.table import Table
 
 from .config import config
-from pathlib import Path
 from .core import Project, ContainerManager, WorkspaceManager
 from .core.integration import VSCodeIntegration, ExternalToolIntegration
 from devs_common.devs_config import DevsConfigLoader
@@ -169,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
@@ -216,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
@@ -269,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:
@@ -362,13 +367,12 @@ def shell(dev_name: str, live: bool, env: tuple, debug: bool) -> None:
 @cli.command()
 @click.argument('dev_name', required=False)
 @click.argument('prompt', required=False)
-@click.option('--auth', is_flag=True, help='Set up Claude authentication for devcontainers')
-@click.option('--api-key', help='Claude API key to authenticate with (use with --auth)')
+@click.option('--auth', is_flag=True, help='Show Claude authentication setup instructions')
 @click.option('--reset-workspace', is_flag=True, help='Reset workspace contents before execution')
 @click.option('--live', is_flag=True, help='Start container with current directory mounted as workspace')
 @click.option('--env', multiple=True, help='Environment variables to pass to container (format: VAR=value)')
 @debug_option
-def claude(dev_name: str, prompt: str, auth: bool, api_key: str, reset_workspace: bool, live: bool, env: tuple, debug: bool) -> None:
+def claude(dev_name: str, prompt: str, auth: bool, reset_workspace: bool, live: bool, env: tuple, debug: bool) -> None:
     """Execute Claude CLI in devcontainer or set up authentication.
 
     DEV_NAME: Development environment name
@@ -378,12 +382,22 @@ def claude(dev_name: str, prompt: str, auth: bool, api_key: str, reset_workspace
     Example: devs claude sally "Fix the tests" --reset-workspace
     Example: devs claude sally "Fix the tests" --live  # Run with current directory
     Example: devs claude sally "Start the server" --env QUART_PORT=5001
-    Example: devs claude --auth                        # Interactive authentication
-    Example: devs claude --auth --api-key <YOUR_KEY>   # API key authentication
+    Example: devs claude --auth                        # Show auth setup instructions
     """
     # Handle authentication mode
     if auth:
-        _handle_claude_auth(api_key=api_key, debug=debug)
+        console.print("🔐 Claude authentication for devcontainers")
+        console.print("")
+        console.print("1. Generate a token (on a machine with a browser):")
+        console.print("   [cyan]claude setup-token[/cyan]")
+        console.print("")
+        console.print("2. Add the token to your environment:")
+        console.print("   [cyan]export CLAUDE_CODE_OAUTH_TOKEN=<token>[/cyan]")
+        console.print("")
+        console.print("   Or add it to [cyan]~/.devs/envs/default/.env[/cyan]:")
+        console.print("   [dim]CLAUDE_CODE_OAUTH_TOKEN=<token>[/dim]")
+        console.print("")
+        console.print("The token will be automatically passed to all devcontainers.")
         return
 
     # Validate required arguments for execution mode
@@ -441,88 +455,6 @@ def claude(dev_name: str, prompt: str, auth: bool, api_key: str, reset_workspace
         sys.exit(1)
 
 
-def _handle_claude_auth(api_key: str, debug: bool) -> None:
-    """Handle Claude authentication setup.
-
-    This configures Claude authentication that will be shared across
-    all devcontainers for this project. The authentication is stored
-    on the host and bind-mounted into containers.
-    """
-    try:
-        # Ensure Claude config directory exists
-        config.ensure_directories()
-
-        console.print("🔐 Setting up Claude authentication...")
-        console.print(f"   Configuration will be saved to: {config.claude_config_dir}")
-
-        if api_key:
-            # Set API key directly using Claude CLI
-            console.print("   Using provided API key...")
-
-            # Set CLAUDE_CONFIG_DIR to our config directory and run auth with API key
-            env = os.environ.copy()
-            env['CLAUDE_CONFIG_DIR'] = str(config.claude_config_dir)
-
-            cmd = ['claude', 'auth', 'login', '--key', api_key]
-
-            if debug:
-                console.print(f"[dim]Running: {' '.join(cmd)}[/dim]")
-                console.print(f"[dim]CLAUDE_CONFIG_DIR: {config.claude_config_dir}[/dim]")
-
-            result = subprocess.run(
-                cmd,
-                env=env,
-                capture_output=True,
-                text=True
-            )
-
-            if result.returncode != 0:
-                error_msg = result.stderr or result.stdout or "Unknown error"
-                raise Exception(f"Claude authentication failed: {error_msg}")
-
-        else:
-            # Interactive authentication
-            console.print("   Starting interactive authentication...")
-            console.print("   Follow the prompts to authenticate with Claude")
-            console.print("")
-
-            # Set CLAUDE_CONFIG_DIR to our config directory
-            env = os.environ.copy()
-            env['CLAUDE_CONFIG_DIR'] = str(config.claude_config_dir)
-
-            cmd = ['claude', 'auth', 'login']
-
-            if debug:
-                console.print(f"[dim]Running: {' '.join(cmd)}[/dim]")
-                console.print(f"[dim]CLAUDE_CONFIG_DIR: {config.claude_config_dir}[/dim]")
-
-            # Run interactively
-            result = subprocess.run(
-                cmd,
-                env=env,
-                check=False
-            )
-
-            if result.returncode != 0:
-                raise Exception("Claude authentication was cancelled or failed")
-
-        console.print("")
-        console.print("✅ Claude authentication configured successfully!")
-        console.print(f"   Configuration saved to: {config.claude_config_dir}")
-        console.print("   This authentication will be shared across all devcontainers")
-        console.print("")
-        console.print("💡 You can now use Claude in any devcontainer:")
-        console.print("   devs claude <dev-name> 'Your prompt here'")
-
-    except FileNotFoundError:
-        console.print("❌ Claude CLI not found on host machine")
-        console.print("")
-        console.print("Please install Claude CLI first:")
-        console.print("   npm install -g @anthropic-ai/claude-cli")
-        console.print("")
-        console.print("Note: Claude needs to be installed on the host machine")
-        console.print("      for authentication. It's already available in containers.")
-        sys.exit(1)
 
     except Exception as e:
         console.print(f"❌ Failed to configure Claude authentication: {e}")

{devs_cli-3.2.3 → devs_cli-3.3.0/devs_cli.egg-info}/PKG-INFO

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

{devs_cli-3.2.3 → devs_cli-3.3.0}/pyproject.toml

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

{devs_cli-3.2.3 → devs_cli-3.3.0}/tests/test_cli.py

@@ -131,66 +131,15 @@ class TestCLI:
         assert result.exit_code == 0
         assert "Execute Claude CLI in devcontainer or set up authentication" in result.output
         assert "--auth" in result.output
-        assert "--api-key" in result.output
-
-    @patch('devs.cli.subprocess.run')
-    @patch('devs.cli.config')
-    def test_claude_auth_with_api_key(self, mock_config, mock_subprocess):
-        """Test claude --auth command with API key."""
-        # Setup mocks
-        mock_config.claude_config_dir = '/tmp/test-claude-config'
-        mock_config.ensure_directories = Mock()
-        mock_subprocess.return_value.returncode = 0
-
-        runner = CliRunner()
-        result = runner.invoke(cli, ['claude', '--auth', '--api-key', 'test-key-123'])
-
-        assert result.exit_code == 0
-        assert "Setting up Claude authentication" in result.output
-        assert "Claude authentication configured successfully" in result.output
-
-        # Verify subprocess was called with correct arguments
-        mock_subprocess.assert_called_once()
-        call_args = mock_subprocess.call_args
-        assert call_args[0][0] == ['claude', 'auth', 'login', '--key', 'test-key-123']
-
-    @patch('devs.cli.subprocess.run')
-    @patch('devs.cli.config')
-    def test_claude_auth_interactive(self, mock_config, mock_subprocess):
-        """Test claude --auth command in interactive mode."""
-        # Setup mocks
-        mock_config.claude_config_dir = '/tmp/test-claude-config'
-        mock_config.ensure_directories = Mock()
-        mock_subprocess.return_value.returncode = 0
 
+    def test_claude_auth_shows_instructions(self):
+        """Test claude --auth shows setup instructions."""
         runner = CliRunner()
         result = runner.invoke(cli, ['claude', '--auth'])
 
         assert result.exit_code == 0
-        assert "Setting up Claude authentication" in result.output
-        assert "Starting interactive authentication" in result.output
-        assert "Claude authentication configured successfully" in result.output
-
-        # Verify subprocess was called for interactive auth
-        mock_subprocess.assert_called_once()
-        call_args = mock_subprocess.call_args
-        assert call_args[0][0] == ['claude', 'auth', 'login']
-
-    @patch('devs.cli.subprocess.run')
-    @patch('devs.cli.config')
-    def test_claude_auth_command_not_found(self, mock_config, mock_subprocess):
-        """Test claude --auth when claude CLI is not installed."""
-        # Setup mocks
-        mock_config.claude_config_dir = '/tmp/test-claude-config'
-        mock_config.ensure_directories = Mock()
-        mock_subprocess.side_effect = FileNotFoundError()
-
-        runner = CliRunner()
-        result = runner.invoke(cli, ['claude', '--auth'])
-
-        assert result.exit_code == 1
-        assert "Claude CLI not found" in result.output
-        assert "npm install -g @anthropic-ai/claude-cli" in result.output
+        assert "claude setup-token" in result.output
+        assert "CLAUDE_CODE_OAUTH_TOKEN" in result.output
 
     def test_claude_missing_args(self):
         """Test claude command without required args (not using --auth)."""

{devs_cli-3.2.3 → devs_cli-3.3.0}/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."""