codeowners-coverage 0.2.1__tar.gz → 0.3.1__tar.gz

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeowners-coverage
-Version: 0.2.1
+Version: 0.3.1
 Summary: Measure and enforce CODEOWNERS coverage
 Author-email: Sentry Team <hello@sentry.io>
 License: Apache-2.0
@@ -10,7 +10,8 @@ Requires-Dist: pathspec>=0.12.0
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: click>=8.0
 Requires-Dist: requests>=2.31.0
-Requires-Dist: ollama>=0.3.0
+Provides-Extra: suggest
+Requires-Dist: ollama>=0.3.0; extra == "suggest"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0; extra == "dev"
@@ -57,7 +58,11 @@ just ollama-setup  # Downloads and configures Ollama model
 ## Installation
 
 ```bash
+# Core (check + baseline commands)
 pip install codeowners-coverage
+
+# With AI-powered suggestions (requires Ollama)
+pip install codeowners-coverage[suggest]
 ```
 
 ## Usage
@@ -76,6 +81,8 @@ codeowners-coverage baseline
 
 ### Suggest CODEOWNERS entries (AI-powered)
 
+> Requires the `[suggest]` extra: `pip install codeowners-coverage[suggest]`
+
 Use local LLM to intelligently suggest team ownership based on git history.
 
 **GitHub Token Setup:**
@@ -251,8 +258,8 @@ just release
 ### Manual commands
 
 ```bash
-# Install in development mode
-uv pip install -e ".[dev]"
+# Install in development mode (all features)
+uv pip install -e ".[dev,suggest]"
 
 # Run tests
 pytest tests/ -v

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/README.md

@@ -36,7 +36,11 @@ just ollama-setup  # Downloads and configures Ollama model
 ## Installation
 
 ```bash
+# Core (check + baseline commands)
 pip install codeowners-coverage
+
+# With AI-powered suggestions (requires Ollama)
+pip install codeowners-coverage[suggest]
 ```
 
 ## Usage
@@ -55,6 +59,8 @@ codeowners-coverage baseline
 
 ### Suggest CODEOWNERS entries (AI-powered)
 
+> Requires the `[suggest]` extra: `pip install codeowners-coverage[suggest]`
+
 Use local LLM to intelligently suggest team ownership based on git history.
 
 **GitHub Token Setup:**
@@ -230,8 +236,8 @@ just release
 ### Manual commands
 
 ```bash
-# Install in development mode
-uv pip install -e ".[dev]"
+# Install in development mode (all features)
+uv pip install -e ".[dev,suggest]"
 
 # Run tests
 pytest tests/ -v

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "codeowners-coverage"
-version = "0.2.1"
+version = "0.3.1"
 description = "Measure and enforce CODEOWNERS coverage"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -17,13 +17,15 @@ dependencies = [
     "PyYAML>=6.0",       # Config file parsing
     "click>=8.0",        # CLI framework
     "requests>=2.31.0",  # For GitHub API
-    "ollama>=0.3.0",     # For local LLM integration
 ]
 
 [project.scripts]
 codeowners-coverage = "codeowners_coverage.__main__:main"
 
 [project.optional-dependencies]
+suggest = [
+    "ollama>=0.3.0",     # For local LLM integration (suggest command)
+]
 dev = [
     "pytest>=7.0",
     "pytest-cov>=4.0",

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/src/codeowners_coverage/__init__.py

@@ -1,6 +1,6 @@
 """CODEOWNERS coverage checking tool."""
 
-__version__ = "0.2.1"
+__version__ = "0.3.1"
 
 from .checker import CoverageChecker
 from .config import Config

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/src/codeowners_coverage/cli.py

@@ -6,21 +6,18 @@ import json
 import sys
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Dict, List, Tuple, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Tuple, cast
 
 import click
 
-from .checker import CoverageChecker
-from .config import Config
-from .directory_consolidator import DirectoryConsolidator
-from .git_analyzer import GitHistoryAnalyzer
-from .github_client import GitHubClient
-from .matcher import CodeOwnersPatternMatcher
-from .ollama_matcher import OllamaLLMMatcher, TeamSuggestion
-from .suggest_cache import SuggestCache
-from .suggester import OwnershipSuggester, SuggestionResult
 from . import __version__
 
+if TYPE_CHECKING:
+    from .config import Config
+    from .ollama_matcher import TeamSuggestion
+    from .suggest_cache import SuggestCache
+    from .suggester import SuggestionResult
+
 
 @click.group()
 @click.version_option(version=__version__)
@@ -33,7 +30,12 @@ def cli() -> None:
 @click.option("--json", "output_json", is_flag=True, help="Output JSON format")
 @click.option("--files", multiple=True, help="Specific files to check")
 @click.option("--config", default=".codeowners-config.yml", help="Config file path")
-def check(output_json: bool, files: Tuple[str, ...], config: str) -> None:
+@click.option(
+    "--allow-dirty-baseline",
+    is_flag=True,
+    help="Don't fail when baseline contains entries that are now covered",
+)
+def check(output_json: bool, files: Tuple[str, ...], config: str, allow_dirty_baseline: bool) -> None:
     """
     Check CODEOWNERS coverage.
 
@@ -42,30 +44,30 @@ def check(output_json: bool, files: Tuple[str, ...], config: str) -> None:
     New uncovered files will cause the check to fail.
     """
     try:
+        from .checker import CoverageChecker
+        from .config import Config
+
         cfg = Config.load(config)
         checker = CoverageChecker(cfg)
 
         file_list: List[str] | None = list(files) if files else None
         result = checker.check_coverage(file_list)
 
-        if output_json:
-            click.echo(json.dumps(result, indent=2))
-        else:
-            _print_human_readable_result(result)
-
-        # Exit with error if there are new uncovered files
-        if result["uncovered_files"]:
-            sys.exit(1)
-
-        # Exit with code 2 if baseline can be reduced (positive signal)
-        # Check if any baseline entries (literal paths or glob patterns)
-        # no longer match any uncovered files
+        # Calculate unused baseline entries early
         loaded_baseline = checker._load_baseline()
         baseline_matched = cast(List[str], result["baseline_files"])
         unused_entries = loaded_baseline.get_unused_entries(baseline_matched)
 
-        if unused_entries:
-            if not output_json:
+        # Output results
+        if output_json:
+            json_output = result.copy()
+            json_output["unused_baseline_entries"] = unused_entries
+            click.echo(json.dumps(json_output, indent=2))
+        else:
+            _print_human_readable_result(result)
+
+            # Print unused entries message in human-readable mode
+            if unused_entries:
                 click.echo(f"\n🎉 Great news! {len(unused_entries)} baseline entries can be removed:")
                 for entry in unused_entries[:10]:
                     click.echo(f"  - {entry}")
@@ -73,6 +75,14 @@ def check(output_json: bool, files: Tuple[str, ...], config: str) -> None:
                     click.echo(f"  ... and {len(unused_entries) - 10} more")
                 click.echo("\nThese entries now have CODEOWNERS coverage! Update the baseline:")
                 click.echo("  codeowners-coverage baseline")
+
+        # Exit with error if there are new uncovered files
+        if result["uncovered_files"]:
+            sys.exit(1)
+
+        # Exit with code 2 if baseline can be reduced (positive signal)
+        # Only exit with code 2 if baseline is dirty AND flag is not set
+        if unused_entries and not allow_dirty_baseline:
             sys.exit(2)
 
     except FileNotFoundError as e:
@@ -95,6 +105,9 @@ def baseline(config: str, files: Tuple[str, ...]) -> None:
     allowing existing gaps.
     """
     try:
+        from .checker import CoverageChecker
+        from .config import Config
+
         cfg = Config.load(config)
         checker = CoverageChecker(cfg)
 
@@ -198,6 +211,15 @@ def suggest(
     Requires Ollama to be installed and running.
     """
     try:
+        from .checker import CoverageChecker
+        from .config import Config
+        from .directory_consolidator import DirectoryConsolidator
+        from .git_analyzer import GitHistoryAnalyzer
+        from .github_client import GitHubClient
+        from .matcher import CodeOwnersPatternMatcher
+        from .ollama_matcher import OllamaLLMMatcher
+        from .suggester import OwnershipSuggester
+
         # Load config
         cfg = Config.load(config)
 
@@ -308,6 +330,9 @@ def suggest(
                 f"✓ Connected to Ollama "
                 f"(model: {cfg.ollama_model})"
             )
+        except ImportError as e:
+            click.echo(f"❌ {e}", err=True)
+            sys.exit(1)
         except Exception as e:
             click.echo(
                 f"❌ Failed to connect to Ollama: {e}",
@@ -397,6 +422,8 @@ def _setup_cache(
     files: List[str],
 ) -> SuggestCache | None:
     """Load or initialize the suggest cache."""
+    from .suggest_cache import SuggestCache
+
     if no_cache:
         click.echo("   Cache: disabled (--no-cache)")
         return None

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/src/codeowners_coverage/ollama_matcher.py

@@ -6,7 +6,10 @@ import json
 from dataclasses import dataclass
 from typing import Dict, List, Tuple
 
-import ollama
+try:
+    import ollama
+except ImportError:
+    ollama = None  # type: ignore[assignment]
 
 
 @dataclass
@@ -38,10 +41,15 @@ class OllamaLLMMatcher:
         Raises:
             Exception: If unable to connect to Ollama
         """
+        if ollama is None:
+            raise ImportError(
+                "The 'ollama' package is required for the suggest command. "
+                "Install it with: pip install codeowners-coverage[suggest]"
+            )
+
         self.model = model
         self.base_url = base_url
 
-        # Verify Ollama is available
         try:
             ollama.list()
         except Exception as e:

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/src/codeowners_coverage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codeowners-coverage
-Version: 0.2.1
+Version: 0.3.1
 Summary: Measure and enforce CODEOWNERS coverage
 Author-email: Sentry Team <hello@sentry.io>
 License: Apache-2.0
@@ -10,7 +10,8 @@ Requires-Dist: pathspec>=0.12.0
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: click>=8.0
 Requires-Dist: requests>=2.31.0
-Requires-Dist: ollama>=0.3.0
+Provides-Extra: suggest
+Requires-Dist: ollama>=0.3.0; extra == "suggest"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0; extra == "dev"
@@ -57,7 +58,11 @@ just ollama-setup  # Downloads and configures Ollama model
 ## Installation
 
 ```bash
+# Core (check + baseline commands)
 pip install codeowners-coverage
+
+# With AI-powered suggestions (requires Ollama)
+pip install codeowners-coverage[suggest]
 ```
 
 ## Usage
@@ -76,6 +81,8 @@ codeowners-coverage baseline
 
 ### Suggest CODEOWNERS entries (AI-powered)
 
+> Requires the `[suggest]` extra: `pip install codeowners-coverage[suggest]`
+
 Use local LLM to intelligently suggest team ownership based on git history.
 
 **GitHub Token Setup:**
@@ -251,8 +258,8 @@ just release
 ### Manual commands
 
 ```bash
-# Install in development mode
-uv pip install -e ".[dev]"
+# Install in development mode (all features)
+uv pip install -e ".[dev,suggest]"
 
 # Run tests
 pytest tests/ -v

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/src/codeowners_coverage.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ src/codeowners_coverage.egg-info/entry_points.txt
 src/codeowners_coverage.egg-info/requires.txt
 src/codeowners_coverage.egg-info/top_level.txt
 tests/test_checker.py
+tests/test_cli.py
 tests/test_config.py
 tests/test_directory_consolidator.py
 tests/test_git_analyzer.py

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/src/codeowners_coverage.egg-info/requires.txt

@@ -2,7 +2,6 @@ pathspec>=0.12.0
 PyYAML>=6.0
 click>=8.0
 requests>=2.31.0
-ollama>=0.3.0
 
 [dev]
 pytest>=7.0
@@ -11,3 +10,6 @@ mypy>=1.0
 ruff>=0.1.0
 types-requests>=2.31.0
 types-PyYAML>=6.0
+
+[suggest]
+ollama>=0.3.0

codeowners_coverage-0.3.1/tests/test_cli.py

@@ -0,0 +1,228 @@
+"""Tests for CLI functionality."""
+
+from __future__ import annotations
+
+import json
+import tempfile
+from pathlib import Path
+from unittest.mock import patch
+
+from click.testing import CliRunner
+
+from codeowners_coverage.cli import cli
+
+
+def test_check_dirty_baseline_without_flag_exits_2() -> None:
+    """Test that check exits with code 2 when baseline is dirty (default behavior)."""
+    runner = CliRunner()
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        # Create CODEOWNERS file
+        codeowners_path = Path(tmpdir) / "CODEOWNERS"
+        codeowners_path.write_text("*.py @python-team\n")
+
+        # Create baseline with an entry that now has coverage
+        baseline_path = Path(tmpdir) / "baseline.txt"
+        baseline_path.write_text("covered.py\n")
+
+        # Create config
+        config_path = Path(tmpdir) / ".codeowners-config.yml"
+        config_path.write_text(
+            f"codeowners_path: {codeowners_path}\n"
+            f"baseline_path: {baseline_path}\n"
+            f"exclusions: []\n"
+        )
+
+        # Mock get_repository_files to return empty (all files covered)
+        with patch(
+            "codeowners_coverage.checker.CoverageChecker.get_repository_files",
+            return_value=["covered.py"],
+        ):
+            result = runner.invoke(cli, ["check", "--config", str(config_path)])
+
+        # Should exit with code 2 (baseline can be reduced)
+        assert result.exit_code == 2
+        assert "baseline entries can be removed" in result.output
+
+
+def test_check_dirty_baseline_with_flag_exits_0() -> None:
+    """Test that check exits with code 0 when baseline is dirty but flag is set."""
+    runner = CliRunner()
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        # Create CODEOWNERS file
+        codeowners_path = Path(tmpdir) / "CODEOWNERS"
+        codeowners_path.write_text("*.py @python-team\n")
+
+        # Create baseline with an entry that now has coverage
+        baseline_path = Path(tmpdir) / "baseline.txt"
+        baseline_path.write_text("covered.py\n")
+
+        # Create config
+        config_path = Path(tmpdir) / ".codeowners-config.yml"
+        config_path.write_text(
+            f"codeowners_path: {codeowners_path}\n"
+            f"baseline_path: {baseline_path}\n"
+            f"exclusions: []\n"
+        )
+
+        # Mock get_repository_files to return covered files
+        with patch(
+            "codeowners_coverage.checker.CoverageChecker.get_repository_files",
+            return_value=["covered.py"],
+        ):
+            result = runner.invoke(
+                cli, ["check", "--config", str(config_path), "--allow-dirty-baseline"]
+            )
+
+        # Should exit with code 0 (success despite dirty baseline)
+        assert result.exit_code == 0
+        assert "baseline entries can be removed" in result.output
+
+
+def test_check_clean_baseline_with_flag_exits_0() -> None:
+    """Test that check exits with code 0 when baseline is clean (with or without flag)."""
+    runner = CliRunner()
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        # Create CODEOWNERS file
+        codeowners_path = Path(tmpdir) / "CODEOWNERS"
+        codeowners_path.write_text("*.py @python-team\n")
+
+        # Create empty baseline
+        baseline_path = Path(tmpdir) / "baseline.txt"
+        baseline_path.write_text("")
+
+        # Create config
+        config_path = Path(tmpdir) / ".codeowners-config.yml"
+        config_path.write_text(
+            f"codeowners_path: {codeowners_path}\n"
+            f"baseline_path: {baseline_path}\n"
+            f"exclusions: []\n"
+        )
+
+        # Mock get_repository_files to return covered files
+        with patch(
+            "codeowners_coverage.checker.CoverageChecker.get_repository_files",
+            return_value=["covered.py"],
+        ):
+            result = runner.invoke(
+                cli, ["check", "--config", str(config_path), "--allow-dirty-baseline"]
+            )
+
+        # Should exit with code 0
+        assert result.exit_code == 0
+        assert "baseline entries can be removed" not in result.output
+
+
+def test_check_json_output_includes_unused_baseline_entries() -> None:
+    """Test that JSON output includes unused_baseline_entries field."""
+    runner = CliRunner()
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        # Create CODEOWNERS file
+        codeowners_path = Path(tmpdir) / "CODEOWNERS"
+        codeowners_path.write_text("*.py @python-team\n")
+
+        # Create baseline with entries that now have coverage
+        baseline_path = Path(tmpdir) / "baseline.txt"
+        baseline_path.write_text("covered1.py\ncovered2.py\n")
+
+        # Create config
+        config_path = Path(tmpdir) / ".codeowners-config.yml"
+        config_path.write_text(
+            f"codeowners_path: {codeowners_path}\n"
+            f"baseline_path: {baseline_path}\n"
+            f"exclusions: []\n"
+        )
+
+        # Mock get_repository_files to return covered files
+        with patch(
+            "codeowners_coverage.checker.CoverageChecker.get_repository_files",
+            return_value=["covered1.py", "covered2.py"],
+        ):
+            result = runner.invoke(
+                cli, ["check", "--config", str(config_path), "--json"]
+            )
+
+        # Parse JSON output
+        output = json.loads(result.output)
+
+        # Should include unused_baseline_entries
+        assert "unused_baseline_entries" in output
+        assert "covered1.py" in output["unused_baseline_entries"]
+        assert "covered2.py" in output["unused_baseline_entries"]
+
+
+def test_check_new_uncovered_takes_precedence_over_dirty_baseline() -> None:
+    """Test that new uncovered files cause exit 1 even with --allow-dirty-baseline."""
+    runner = CliRunner()
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        # Create CODEOWNERS file
+        codeowners_path = Path(tmpdir) / "CODEOWNERS"
+        codeowners_path.write_text("*.py @python-team\n")
+
+        # Create baseline with an entry that now has coverage
+        baseline_path = Path(tmpdir) / "baseline.txt"
+        baseline_path.write_text("covered.py\n")
+
+        # Create config
+        config_path = Path(tmpdir) / ".codeowners-config.yml"
+        config_path.write_text(
+            f"codeowners_path: {codeowners_path}\n"
+            f"baseline_path: {baseline_path}\n"
+            f"exclusions: []\n"
+        )
+
+        # Mock get_repository_files to return covered + new uncovered file
+        with patch(
+            "codeowners_coverage.checker.CoverageChecker.get_repository_files",
+            return_value=["covered.py", "new_uncovered.txt"],
+        ):
+            result = runner.invoke(
+                cli, ["check", "--config", str(config_path), "--allow-dirty-baseline"]
+            )
+
+        # Should exit with code 1 (new uncovered files)
+        assert result.exit_code == 1
+        assert "new_uncovered.txt" in result.output
+
+
+def test_check_json_output_with_clean_baseline() -> None:
+    """Test that JSON output includes empty unused_baseline_entries when baseline is clean."""
+    runner = CliRunner()
+
+    with tempfile.TemporaryDirectory() as tmpdir:
+        # Create CODEOWNERS file
+        codeowners_path = Path(tmpdir) / "CODEOWNERS"
+        codeowners_path.write_text("*.py @python-team\n")
+
+        # Create baseline with entries still uncovered
+        baseline_path = Path(tmpdir) / "baseline.txt"
+        baseline_path.write_text("still_uncovered.txt\n")
+
+        # Create config
+        config_path = Path(tmpdir) / ".codeowners-config.yml"
+        config_path.write_text(
+            f"codeowners_path: {codeowners_path}\n"
+            f"baseline_path: {baseline_path}\n"
+            f"exclusions: []\n"
+        )
+
+        # Mock get_repository_files to return baseline file (still uncovered)
+        with patch(
+            "codeowners_coverage.checker.CoverageChecker.get_repository_files",
+            return_value=["covered.py", "still_uncovered.txt"],
+        ):
+            result = runner.invoke(
+                cli, ["check", "--config", str(config_path), "--json"]
+            )
+
+        # Parse JSON output
+        output = json.loads(result.output)
+
+        # Should include empty unused_baseline_entries
+        assert "unused_baseline_entries" in output
+        assert output["unused_baseline_entries"] == []
+        assert result.exit_code == 0

{codeowners_coverage-0.2.1 → codeowners_coverage-0.3.1}/tests/test_ollama_matcher.py

@@ -2,17 +2,21 @@
 
 from __future__ import annotations
 
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 import pytest
 
+from codeowners_coverage import ollama_matcher
 from codeowners_coverage.ollama_matcher import OllamaLLMMatcher
 
+_mock_ollama_module = MagicMock()
+_mock_ollama_module.list.return_value = []
+
 
 @pytest.fixture
 def mock_ollama() -> None:
     """Mock Ollama availability check."""
-    with patch("ollama.list", return_value=[]):
+    with patch.object(ollama_matcher, "ollama", _mock_ollama_module):
         yield
 
 
@@ -91,7 +95,7 @@ def test_match_file_to_team(mock_ollama: None) -> None:
         }
     }
 
-    with patch("ollama.chat", return_value=mock_response):
+    with patch.object(_mock_ollama_module, "chat", return_value=mock_response):
         suggestion = matcher.match_file_to_team(
             filepath="src/components/Button.tsx",
             contributors=[("alice@example.com", 5)],
@@ -292,7 +296,7 @@ def test_match_file_passes_allowlist(mock_ollama: None) -> None:
         }
     }
 
-    with patch("ollama.chat", return_value=mock_response):
+    with patch.object(_mock_ollama_module, "chat", return_value=mock_response):
         suggestion = matcher.match_file_to_team(
             filepath="src/components/Button.tsx",
             contributors=[("alice@example.com", 5)],