fix ignoring; simplify global ignoring patterns

Author: MarshalX

cycode/cli/files_collector/walk_ignore.py

@@ -10,10 +10,8 @@
 
 _SUPPORTED_IGNORE_PATTERN_FILES = {'.gitignore', '.cycodeignore'}
 _DEFAULT_GLOBAL_IGNORE_PATTERNS = [
-    '.git',
-    '.cycode',
-    '**/.git/**',
-    '**/.cycode/**',
+    '**/.git',
+    '**/.cycode',
 ]
 
 
@@ -67,7 +65,7 @@ def walk_ignore(path: str) -> List[str]:
 
         # decrease recursion depth of os.walk() because of topdown=True by changing the list in-place
         # slicing ([:]) is mandatory to change dict in-place!
-        dirnames[:] = [d for d in dirnames if _should_include_path(ignore_patterns, d)]
-        filenames[:] = [f for f in filenames if _should_include_path(ignore_patterns, f)]
+        dirnames[:] = [d for d in dirnames if _should_include_path(ignore_patterns, os.path.join(dirpath, d))]
+        filenames[:] = [f for f in filenames if _should_include_path(ignore_patterns, os.path.join(dirpath, f))]
 
         yield dirpath, dirnames, filenames

tests/cli/files_collector/test_walk_ignore.py

@@ -87,12 +87,10 @@ def test_get_global_ignore_patterns(fs: 'FakeFilesystem') -> None:
     _create_mocked_file_structure(fs)
     ignore_patterns = _get_global_ignore_patterns('/home/user/project/subdir')
 
-    assert len(ignore_patterns) == 7
+    assert len(ignore_patterns) == 5
     # default global:
-    assert '.git' in ignore_patterns
-    assert '.cycode' in ignore_patterns
-    assert '**/.git/**' in ignore_patterns
-    assert '**/.cycode/**' in ignore_patterns
+    assert '**/.git' in ignore_patterns
+    assert '**/.cycode' in ignore_patterns
     # additional:
     assert '*.txt' in ignore_patterns
     assert '*.pyc' in ignore_patterns