fix: 🐛 Fix check command (#56)

getcodelimit · Dec 14, 2024 · fead1ab · fead1ab
1 parent 9f2b392
commit fead1ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/codelimit/commands/check.py b/codelimit/commands/check.py
@@ -7,15 +7,14 @@
 from pygments.util import ClassNotFound
 
 from codelimit.common.CheckResult import CheckResult
-from codelimit.common.Configuration import Configuration
-from codelimit.common.Scanner import is_excluded, scan_file
+from codelimit.common.Scanner import is_excluded, scan_file, generate_exclude_spec
 from codelimit.common.lexer_utils import lex
 from codelimit.languages import Languages
 
 
 def check_command(paths: list[Path], quiet: bool):
     check_result = CheckResult()
-    excludes_spec = PathSpec.from_lines("gitignore", Configuration.exclude)
+    excludes_spec = generate_exclude_spec(Path.cwd())
     for path in paths:
         if path.is_file():
             _handle_file_path(path, check_result, excludes_spec)
@@ -25,7 +24,7 @@ def check_command(paths: list[Path], quiet: bool):
                 dirs[:] = [d for d in dirs if not d[0] == "."]
                 for file in files:
                     abs_path = Path(os.path.join(root, file))
-                    rel_path = abs_path.relative_to(path.absolute())
+                    rel_path = abs_path.relative_to(Path.cwd())
                     if is_excluded(rel_path, excludes_spec):
                         continue
                     check_file(abs_path, check_result)

diff --git a/codelimit/common/Scanner.py b/codelimit/common/Scanner.py
@@ -83,7 +83,7 @@ def scan_path(path: Path, cached_report: Union[Report, None] = None,
               add_file_entry_callback: Union[Callable[[SourceFileEntry], None], None] = None,
               ) -> Codebase:
     result = Codebase(str(path.resolve().absolute()))
-    excludes_spec = _generate_exclude_spec(path)
+    excludes_spec = generate_exclude_spec(path)
     for root, dirs, files in os.walk(path.absolute()):
         files = [f for f in files if not f[0] == "."]
         dirs[:] = [d for d in dirs if not d[0] == "."]
@@ -180,7 +180,7 @@ def scan_file(tokens: list[Token], language: Language) -> list[Measurement]:
     return measurements
 
 
-def _generate_exclude_spec(root: Path) -> PathSpec:
+def generate_exclude_spec(root: Path) -> PathSpec:
     excludes = DEFAULT_EXCLUDES.copy()
     excludes.extend(Configuration.exclude)
     gitignore_excludes = _read_gitignore(root)

diff --git a/tests/common/test_Scanner.py b/tests/common/test_Scanner.py
@@ -86,6 +86,7 @@ def test_is_excluded():
     excludes_spec = PathSpec.from_lines("gitignore", DEFAULT_EXCLUDES)
 
     assert is_excluded(Path("venv/foo/bar.py"), excludes_spec)
+    assert is_excluded(Path("tests/test_utils.py"), excludes_spec)
     assert not is_excluded(Path("foo/bar.py"), excludes_spec)
 
     excludes_spec = PathSpec.from_lines("gitignore", ["output"])