cycode 3.5.1.dev2__py3-none-any.whl → 3.5.1.dev4__py3-none-any.whl

cycode/__init__.py

@@ -1 +1 @@
-__version__ = '3.5.1.dev2'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+__version__ = '3.5.1.dev4'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

cycode/cli/files_collector/walk_ignore.py

@@ -1,9 +1,11 @@
 import os
 from collections.abc import Generator, Iterable
 
-from cycode.cli.logger import logger
+from cycode.cli.logger import get_logger
 from cycode.cli.utils.ignore_utils import IgnoreFilterManager
 
+logger = get_logger('Ignores')
+
 _SUPPORTED_IGNORE_PATTERN_FILES = {
     '.gitignore',
     '.cycodeignore',
@@ -30,7 +32,7 @@ def _collect_top_level_ignore_files(path: str) -> list[str]:
         for ignore_file in _SUPPORTED_IGNORE_PATTERN_FILES:
             ignore_file_path = os.path.join(dir_path, ignore_file)
             if os.path.exists(ignore_file_path):
-                logger.debug('Apply top level ignore file: %s', ignore_file_path)
+                logger.debug('Reading top level ignore file: %s', ignore_file_path)
                 ignore_files.append(ignore_file_path)
     return ignore_files
 
@@ -41,4 +43,17 @@ def walk_ignore(path: str) -> Generator[tuple[str, list[str], list[str]], None,
         global_ignore_file_paths=_collect_top_level_ignore_files(path),
         global_patterns=_DEFAULT_GLOBAL_IGNORE_PATTERNS,
     )
-    yield from ignore_filter_manager.walk()
+    for dirpath, dirnames, filenames, ignored_dirnames, ignored_filenames in ignore_filter_manager.walk_with_ignored():
+        rel_dirpath = '' if dirpath == path else os.path.relpath(dirpath, path)
+        display_dir = rel_dirpath or '.'
+        for is_dir, names in (
+            (True, ignored_dirnames),
+            (False, ignored_filenames),
+        ):
+            for name in names:
+                full_path = os.path.join(path, display_dir, name)
+                if is_dir:
+                    full_path = os.path.join(full_path, '*')
+                logger.debug('Ignoring match %s', full_path)
+
+        yield dirpath, dirnames, filenames

cycode/cli/utils/ignore_utils.py

@@ -388,19 +388,38 @@ class IgnoreFilterManager:
             return matches[-1].is_exclude
         return None
 
-    def walk(self, **kwargs) -> Generator[tuple[str, list[str], list[str]], None, None]:
-        """Wrap os.walk() without ignored files and subdirectories and kwargs are passed to walk."""
+    def walk_with_ignored(
+        self, **kwargs
+    ) -> Generator[tuple[str, list[str], list[str], list[str], list[str]], None, None]:
+        """Wrap os.walk() and also return lists of ignored directories and files.
+
+        Yields tuples: (dirpath, included_dirnames, included_filenames, ignored_dirnames, ignored_filenames)
+        """
         for dirpath, dirnames, filenames in os.walk(self.path, topdown=True, **kwargs):
             rel_dirpath = '' if dirpath == self.path else os.path.relpath(dirpath, self.path)
 
+            original_dirnames = list(dirnames)
+            included_dirnames = []
+            ignored_dirnames = []
+            for d in original_dirnames:
+                if self.is_ignored(os.path.join(rel_dirpath, d)):
+                    ignored_dirnames.append(d)
+                else:
+                    included_dirnames.append(d)
+
             # decrease recursion depth of os.walk() by ignoring subdirectories because of topdown=True
             # slicing ([:]) is mandatory to change dict in-place!
-            dirnames[:] = [d for d in dirnames if not self.is_ignored(os.path.join(rel_dirpath, d))]
+            dirnames[:] = included_dirnames
 
-            # remove ignored files
-            filenames = [f for f in filenames if not self.is_ignored(os.path.join(rel_dirpath, f))]
+            included_filenames = []
+            ignored_filenames = []
+            for f in filenames:
+                if self.is_ignored(os.path.join(rel_dirpath, f)):
+                    ignored_filenames.append(f)
+                else:
+                    included_filenames.append(f)
 
-            yield dirpath, dirnames, filenames
+            yield dirpath, dirnames, included_filenames, ignored_dirnames, ignored_filenames
 
     @classmethod
     def build(

{cycode-3.5.1.dev2.dist-info → cycode-3.5.1.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cycode
-Version: 3.5.1.dev2
+Version: 3.5.1.dev4
 Summary: Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning.
 Home-page: https://github.com/cycodehq/cycode-cli
 License: MIT

{cycode-3.5.1.dev2.dist-info → cycode-3.5.1.dev4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cycode/__init__.py,sha256=oYnO-z8cBBuxlZJlOy3piDeQLm8ahXqMN_a814F05Mw,114
+cycode/__init__.py,sha256=XN1WA4LmLRY3X64V9asZ0ddr2SwdNaBw1wb5fkYwR_Q,114
 cycode/__main__.py,sha256=Z3bD5yrA7yPvAChcADQrqCaZd0ChGI1gdiwALwbWJ6U,104
 cycode/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/app.py,sha256=UC5A5TKIvlxOYKERfJykN8apTT0VyMY5pUjRh_LM-dw,6098
@@ -96,7 +96,7 @@ cycode/cli/files_collector/sca/ruby/restore_ruby_dependencies.py,sha256=WS_T9-2C
 cycode/cli/files_collector/sca/sbt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cycode/cli/files_collector/sca/sbt/restore_sbt_dependencies.py,sha256=6ZFTWkga2bZ_dwCCWeZxDkgBMEOLw4S_YnhIYGBSKbc,617
 cycode/cli/files_collector/sca/sca_file_collector.py,sha256=KY-IcLY_dyV7fak1hw_MIl1RyqqRnIxwPufjgGYQPjI,7701
-cycode/cli/files_collector/walk_ignore.py,sha256=OKZrGHp8UMpBLXT4J1CxJeXlnOzDUmokL1iLxDUgGuM,1417
+cycode/cli/files_collector/walk_ignore.py,sha256=6zqvkm20qx8k_ox-60zL1vlAYmrJdZk3mtS273hssC0,2062
 cycode/cli/files_collector/zip_documents.py,sha256=WTNLp4yHY6zeVYkE2QTOO8K93cJEA9I-BmD39sRdo5k,1837
 cycode/cli/logger.py,sha256=mlaYEQGYd582fTCc3SC3cFMj0PKTB6EsaI12Q4VL1z8,65
 cycode/cli/main.py,sha256=QTPqIZsJsNK_vun8---vP2jP4ljlNJ15xidNrQ-Y0Rc,316
@@ -130,7 +130,7 @@ cycode/cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 cycode/cli/utils/enum_utils.py,sha256=h_VTCfJ-0hnhwDsEznmx56rJrCb5FQ8u6PrI6p8MP3E,187
 cycode/cli/utils/get_api_client.py,sha256=J3hls7A-ktBYBbAvLm2zk-wC3QLfIy0QpjnlXbxDb5o,1697
 cycode/cli/utils/git_proxy.py,sha256=FPHMBiyLFK9X9vKYpKySRKJH6Dc9Cb3nO241Q95dASE,2911
-cycode/cli/utils/ignore_utils.py,sha256=k0JPjI9nlkucNdxPDZjok8iawU2wydtlN1932AAd9UU,14933
+cycode/cli/utils/ignore_utils.py,sha256=cODqhnOHA2kRo8rMY0YcmcKkmXNPOC9UTCmFu62RRqE,15567
 cycode/cli/utils/jwt_utils.py,sha256=TfTHCCCxKO6RvSKT2qspx4577Gax3n9YRj2UgigpGuQ,537
 cycode/cli/utils/path_utils.py,sha256=OmAOtZwvPmYqqhBnB4jI6hkSnCkGpSOibY7PtP213Cc,3235
 cycode/cli/utils/progress_bar.py,sha256=bKBWHHdZsVkdDdWMJLfgLGR0cBYeB44P_DpRM8pvWqU,9528
@@ -159,8 +159,8 @@ cycode/cyclient/report_client.py,sha256=h12pz3vWCwDF73BhqFX7iDSxBgQDFwkiGh3hmul2
 cycode/cyclient/scan_client.py,sha256=nQJyt34Bne8UAQNj9OHSgvoCfI1EJFKNaEeeGPnrKcg,12471
 cycode/cyclient/scan_config_base.py,sha256=mXsPZGYCtp85rv5GIige40yQZXuRcEKUW-VQJ0vgFzk,1201
 cycode/logger.py,sha256=xAzpkWLZhixO4egRcYn4HXM9lIfx5wHdpkHxNc5jrX8,2225
-cycode-3.5.1.dev2.dist-info/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
-cycode-3.5.1.dev2.dist-info/METADATA,sha256=OjoIircKVoHAYclGng1j00B2Qcwdds6y6TWkds5ToKA,75852
-cycode-3.5.1.dev2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-cycode-3.5.1.dev2.dist-info/entry_points.txt,sha256=iDcVJM8ByLElVgvBgtYxDjw1kT7O8Mo0LcWZIT5L3Ig,45
-cycode-3.5.1.dev2.dist-info/RECORD,,
+cycode-3.5.1.dev4.dist-info/LICENCE,sha256=2Wx4N6mD_4xB7-E3hPkZ3MPhpJy__k_I8MaCSO-PDRo,1068
+cycode-3.5.1.dev4.dist-info/METADATA,sha256=ATB9EQPCLzKsePOha1laW_wGGdpzZJ0kxr3CxTRCNIk,75852
+cycode-3.5.1.dev4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+cycode-3.5.1.dev4.dist-info/entry_points.txt,sha256=iDcVJM8ByLElVgvBgtYxDjw1kT7O8Mo0LcWZIT5L3Ig,45
+cycode-3.5.1.dev4.dist-info/RECORD,,