refactor: code cleanup

Author: shenxianpeng

cpp_linter_hooks/clang_format.py

@@ -3,7 +3,7 @@
 from argparse import ArgumentParser
 from typing import Tuple
 
-from .util import _install_tool, DEFAULT_CLANG_FORMAT_VERSION
+from cpp_linter_hooks.util import _resolve_install, DEFAULT_CLANG_FORMAT_VERSION
 
 
 parser = ArgumentParser()
@@ -15,8 +15,8 @@
 
 def run_clang_format(args=None) -> Tuple[int, str]:
     hook_args, other_args = parser.parse_known_args(args)
-    if hook_args.version is not None:
-        _install_tool("clang-format", hook_args.version)
+    if hook_args.version:
+        _resolve_install("clang-format", hook_args.version)
     command = ["clang-format", "-i"]
 
     # Add verbose flag if requested

cpp_linter_hooks/clang_tidy.py

@@ -2,7 +2,7 @@
 from argparse import ArgumentParser
 from typing import Tuple
 
-from .util import ensure_installed, DEFAULT_CLANG_TIDY_VERSION
+from cpp_linter_hooks.util import _resolve_install, DEFAULT_CLANG_TIDY_VERSION
 
 
 parser = ArgumentParser()
@@ -11,7 +11,8 @@
 
 def run_clang_tidy(args=None) -> Tuple[int, str]:
     hook_args, other_args = parser.parse_known_args(args)
-    ensure_installed("clang-tidy", hook_args.version)
+    if hook_args.version:
+        _resolve_install("clang-tidy", hook_args.version)
     command = ["clang-tidy"] + other_args
 
     retval = 0

cpp_linter_hooks/util.py

@@ -20,16 +20,10 @@ def get_version_from_dependency(tool: str) -> Optional[str]:
         return None
     with open(pyproject_path, "rb") as f:
         data = tomllib.load(f)
-    # First try project.optional-dependencies.tools
-    optional_deps = data.get("project", {}).get("optional-dependencies", {})
-    tools_deps = optional_deps.get("tools", [])
-    for dep in tools_deps:
-        if dep.startswith(f"{tool}=="):
-            return dep.split("==")[1]
-
-    # Fallback to project.dependencies for backward compatibility
-    dependencies = data.get("project", {}).get("dependencies", [])
-    for dep in dependencies:
+    # Check build-system.requires
+    build_system = data.get("build-system", {})
+    requires = build_system.get("requires", [])
+    for dep in requires:
         if dep.startswith(f"{tool}=="):
             return dep.split("==")[1]
     return None
@@ -148,20 +142,6 @@ def parse_version(v: str):
         return None
 
 
-def _get_runtime_version(tool: str) -> Optional[str]:
-    """Get the runtime version of a tool."""
-    try:
-        output = subprocess.check_output([tool, "--version"], text=True)
-        if tool == "clang-tidy":
-            lines = output.strip().splitlines()
-            if len(lines) > 1:
-                return lines[1].split()[-1]
-        elif tool == "clang-format":
-            return output.strip().split()[-1]
-    except Exception:
-        return None
-
-
 def _install_tool(tool: str, version: str) -> Optional[Path]:
     """Install a tool using pip."""
     try:
@@ -187,31 +167,4 @@ def _resolve_install(tool: str, version: Optional[str]) -> Optional[Path]:
             else DEFAULT_CLANG_TIDY_VERSION
         )
 
-    path = shutil.which(tool)
-    if path:
-        runtime_version = _get_runtime_version(tool)
-        if runtime_version and user_version not in runtime_version:
-            LOG.info(
-                "%s version mismatch (%s != %s), reinstalling...",
-                tool,
-                runtime_version,
-                user_version,
-            )
-            return _install_tool(tool, user_version)
-        return Path(path)
-
     return _install_tool(tool, user_version)
-
-
-def is_installed(tool: str) -> Optional[Path]:
-    """Check if a tool is installed and return its path."""
-    path = shutil.which(tool)
-    if path:
-        return Path(path)
-    return None
-
-
-def ensure_installed(tool: str, version: Optional[str] = None) -> None:
-    """Ensure a tool is installed, resolving its version if necessary."""
-    if version is not None:
-        _install_tool(tool, version)

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=45", "setuptools-scm", "clang-format", "clang-tidy"]
+requires = ["setuptools>=45", "setuptools-scm", "clang-format==21.1.0", "clang-tidy==21.1.0"]
 build-backend = "setuptools.build_meta"
 
 requires-python = ">=3.9"
@@ -46,12 +46,6 @@ source =  "https://github.com/cpp-linter/cpp-linter-hooks"
 tracker = "https://github.com/cpp-linter/cpp-linter-hooks/issues"
 
 [project.optional-dependencies]
-# only clang tools can added to this section to make hooks work
-tools = [
-    "clang-format==21.1.0",
-    "clang-tidy==21.1.0",
-]
-
 dev = [
     "coverage",
     "pre-commit",