Replace --skip-system-scope with --skip-os-packages

Author: davidkopp

CLAUDE.md

@@ -15,7 +15,7 @@ pip install -r requirements.txt
 
 # Run specific detectors for testing
 python3 -m dependency_resolver docker <container_name>
-python3 -m dependency_resolver host --skip-system-scope --skip-hash-generation
+python3 -m dependency_resolver host --skip-os-packages --skip-hash-generation
 
 # Execute linting and formatting
 pre-commit run --files $(git diff --name-only --diff-filter=ACMR HEAD)

dependency_resolver/__init__.py

@@ -11,7 +11,7 @@
 def resolve_host_dependencies(
     working_dir: Optional[str] = None,
     debug: bool = False,
-    skip_system_scope: bool = False,
+    skip_os_packages: bool = False,
     venv_path: Optional[str] = None,
     pretty_print: bool = False,
 ) -> str:
@@ -21,15 +21,15 @@ def resolve_host_dependencies(
     Args:
         working_dir: Working directory to analyze (defaults to current directory)
         debug: Enable debug output
-        skip_system_scope: Skip system-scope package managers
+        skip_os_packages: Skip OS package managers (dpkg, apk)
         venv_path: Explicit virtual environment path for pip detector
         pretty_print: Format JSON output with indentation
 
     Returns:
         JSON string containing all discovered dependencies
     """
     executor = HostExecutor(debug=debug)
-    orchestrator = Orchestrator(debug=debug, skip_system_scope=skip_system_scope, venv_path=venv_path)
+    orchestrator = Orchestrator(debug=debug, skip_os_packages=skip_os_packages, venv_path=venv_path)
     dependencies = orchestrator.resolve_dependencies(executor, working_dir)
     formatter = OutputFormatter(debug=debug)
     return formatter.format_json(dependencies, pretty_print=pretty_print)
@@ -39,7 +39,7 @@ def resolve_docker_dependencies(
     container_identifier: str,
     working_dir: Optional[str] = None,
     debug: bool = False,
-    skip_system_scope: bool = False,
+    skip_os_packages: bool = False,
     venv_path: Optional[str] = None,
     only_container_info: bool = False,
     pretty_print: bool = False,
@@ -51,7 +51,7 @@ def resolve_docker_dependencies(
         container_identifier: Container ID or name
         working_dir: Working directory to analyze within the container
         debug: Enable debug output
-        skip_system_scope: Skip system-scope package managers
+        skip_os_packages: Skip OS package managers (dpkg, apk)
         venv_path: Explicit virtual environment path for pip detector
         only_container_info: Only analyze container metadata (skip dependency detection)
         pretty_print: Format JSON output with indentation
@@ -60,7 +60,7 @@ def resolve_docker_dependencies(
         JSON string containing all discovered dependencies
     """
     executor = DockerExecutor(container_identifier, debug=debug)
-    orchestrator = Orchestrator(debug=debug, skip_system_scope=skip_system_scope, venv_path=venv_path)
+    orchestrator = Orchestrator(debug=debug, skip_os_packages=skip_os_packages, venv_path=venv_path)
     dependencies = orchestrator.resolve_dependencies(executor, working_dir, only_container_info)
     formatter = OutputFormatter(debug=debug)
     return formatter.format_json(dependencies, pretty_print=pretty_print)
@@ -70,7 +70,7 @@ def resolve_docker_dependencies_as_dict(
     container_identifier: str,
     working_dir: Optional[str] = None,
     debug: bool = False,
-    skip_system_scope: bool = False,
+    skip_os_packages: bool = False,
     venv_path: Optional[str] = None,
     only_container_info: bool = False,
 ) -> dict[str, Any]:
@@ -84,7 +84,7 @@ def resolve_docker_dependencies_as_dict(
         container_identifier: Container ID or name
         working_dir: Working directory to analyze within the container
         debug: Enable debug output
-        skip_system_scope: Skip system-scope package managers
+        skip_os_packages: Skip OS package managers (dpkg, apk)
         venv_path: Explicit virtual environment path for pip detector
         only_container_info: Only analyze container metadata (skip dependency detection)
 
@@ -99,7 +99,7 @@ def resolve_docker_dependencies_as_dict(
         raise ValueError("Container identifier is required")
 
     executor = DockerExecutor(container_identifier, debug=debug)
-    orchestrator = Orchestrator(debug=debug, skip_system_scope=skip_system_scope, venv_path=venv_path)
+    orchestrator = Orchestrator(debug=debug, skip_os_packages=skip_os_packages, venv_path=venv_path)
     return orchestrator.resolve_dependencies(executor, working_dir, only_container_info)
 
 
@@ -108,7 +108,7 @@ def resolve_dependencies_as_dict(
     environment_identifier: Optional[str] = None,
     working_dir: Optional[str] = None,
     debug: bool = False,
-    skip_system_scope: bool = False,
+    skip_os_packages: bool = False,
     venv_path: Optional[str] = None,
     only_container_info: bool = False,
 ) -> dict[str, Any]:
@@ -120,7 +120,7 @@ def resolve_dependencies_as_dict(
         environment_identifier: Environment identifier (required for docker)
         working_dir: Working directory to analyze
         debug: Enable debug output
-        skip_system_scope: Skip system-scope package managers
+        skip_os_packages: Skip OS package managers (dpkg, apk)
         venv_path: Explicit virtual environment path for pip detector
         only_container_info: Only analyze container metadata (for docker environments)
 
@@ -137,7 +137,7 @@ def resolve_dependencies_as_dict(
     else:
         raise ValueError(f"Unsupported environment type: {environment_type}")
 
-    orchestrator = Orchestrator(debug=debug, skip_system_scope=skip_system_scope, venv_path=venv_path)
+    orchestrator = Orchestrator(debug=debug, skip_os_packages=skip_os_packages, venv_path=venv_path)
     return orchestrator.resolve_dependencies(executor, working_dir, only_container_info)
 
 

dependency_resolver/__main__.py

@@ -35,7 +35,7 @@ def parse_arguments() -> argparse.Namespace:
   %(prog)s --working-dir /tmp/repo                # Set working directory on target environment
   %(prog)s --venv-path ~/.virtualenvs/myproject   # Use specific virtual environment for pip
   %(prog)s --debug                                # Enable debug output
-  %(prog)s --skip-system-scope                    # Skip system scope package managers
+  %(prog)s --skip-os-packages                     # Skip OS package managers (dpkg, apk)
   %(prog)s --skip-hash-collection                 # Skip hash collection for improved performance
   %(prog)s --select-detectors "pip,dpkg"          # Use only pip and dpkg detectors
         """,
@@ -63,9 +63,9 @@ def parse_arguments() -> argparse.Namespace:
     parser.add_argument("--debug", action="store_true", help="Print debug statements")
 
     parser.add_argument(
-        "--skip-system-scope",
+        "--skip-os-packages",
         action="store_true",
-        help="Skip system scope package managers (system packages or globally installed Python packages)",
+        help="Skip OS package managers (dpkg, apk) - language package managers like pip/npm will still run",
     )
 
     parser.add_argument(
@@ -137,7 +137,7 @@ def main() -> None:
         executor = create_executor(args.environment_type, args.environment_identifier, debug=args.debug)
         orchestrator = Orchestrator(
             debug=args.debug,
-            skip_system_scope=args.skip_system_scope,
+            skip_os_packages=args.skip_os_packages,
             venv_path=args.venv_path,
             skip_hash_collection=args.skip_hash_collection,
             selected_detectors=args.select_detectors,

dependency_resolver/core/interfaces.py

@@ -49,10 +49,10 @@ def get_dependencies(
         raise NotImplementedError
 
     @abstractmethod
-    def has_system_scope(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:
-        """Check if this detector operates at system scope for the given environment.
+    def is_os_package_manager(self) -> bool:
+        """Check if this detector manages OS-level packages (like dpkg, apk).
 
-        Returns True if the detector would return scope: "system" in get_dependencies().
-        This allows efficient scope checking without the overhead of dependency extraction.
+        Returns True for OS package managers that install system packages.
+        Returns False for language package managers (pip, npm, maven) and other detectors.
         """
         raise NotImplementedError

dependency_resolver/core/orchestrator.py

@@ -14,13 +14,13 @@ class Orchestrator:
     def __init__(
         self,
         debug: bool = False,
-        skip_system_scope: bool = False,
+        skip_os_packages: bool = False,
         venv_path: str | None = None,
         skip_hash_collection: bool = False,
         selected_detectors: str | None = None,
     ):
         self.debug = debug
-        self.skip_system_scope = skip_system_scope
+        self.skip_os_packages = skip_os_packages
         self.skip_hash_collection = skip_hash_collection
 
         # Create all detector instances
@@ -77,10 +77,10 @@ def resolve_dependencies(
 
             try:
                 if detector.is_usable(executor, working_dir):
-                    # Check if detector has system scope and skip if requested
-                    if self.skip_system_scope and detector.has_system_scope(executor, working_dir):
+                    # Check if detector is OS package manager and skip if requested
+                    if self.skip_os_packages and detector.is_os_package_manager():
                         if self.debug:
-                            print(f"Skipping {detector_name} (system scope, --skip-system-scope enabled)")
+                            print(f"Skipping {detector_name} (OS package manager, --skip-os-packages enabled)")
                         continue
 
                     if self.debug:

dependency_resolver/detectors/apk_detector.py

@@ -75,6 +75,6 @@ def get_dependencies(
 
         return {"scope": "system", "dependencies": dependencies}
 
-    def has_system_scope(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:
-        """APK always has system scope (system packages)."""
+    def is_os_package_manager(self) -> bool:
+        """APK manages OS-level packages."""
         return True

dependency_resolver/detectors/docker_info_detector.py

@@ -42,8 +42,6 @@ def get_dependencies(
 
         return result
 
-    def has_system_scope(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:
-        """Docker container info has container scope, not system scope."""
-        _ = executor  # Unused parameter, required by interface
-        _ = working_dir  # Unused parameter, required by interface
+    def is_os_package_manager(self) -> bool:
+        """Docker info detector is not an OS package manager."""
         return False

dependency_resolver/detectors/dpkg_detector.py

@@ -224,6 +224,6 @@ def _combine_md5_hashes(self, md5_hashes: list[str]) -> str | None:
         content = "\n".join(sorted(md5_hashes))
         return hashlib.sha256(content.encode()).hexdigest()
 
-    def has_system_scope(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:
-        """DPKG always has system scope (system packages)."""
+    def is_os_package_manager(self) -> bool:
+        """DPKG manages OS-level packages."""
         return True

dependency_resolver/detectors/maven_detector.py

@@ -52,8 +52,8 @@ def get_dependencies(
         result["dependencies"] = dependencies
         return result
 
-    def has_system_scope(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:
-        """Maven is always project scope."""
+    def is_os_package_manager(self) -> bool:
+        """Maven is a language package manager, not an OS package manager."""
         return False
 
     def _maven_available(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:

dependency_resolver/detectors/npm_detector.py

@@ -152,7 +152,6 @@ def _generate_location_hash(self, executor: EnvironmentExecutor, location: str)
                 print(f"ERROR: location: {location}")
             return ""
 
-    def has_system_scope(self, executor: EnvironmentExecutor, working_dir: Optional[str] = None) -> bool:
-        """NPM has system scope when no local package.json or node_modules exists."""
-        location = self._get_npm_location(executor, working_dir)
-        return self._is_system_location(location)
+    def is_os_package_manager(self) -> bool:
+        """NPM is a language package manager, not an OS package manager."""
+        return False