cycode 1.7.1.dev5__tar.gz → 1.7.1.dev7__tar.gz

{cycode-1.7.1.dev5 → cycode-1.7.1.dev7}/PKG-INFO

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

cycode-1.7.1.dev7/cycode/__init__.py

@@ -0,0 +1 @@
+__version__ = '1.7.1.dev7'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag

{cycode-1.7.1.dev5 → cycode-1.7.1.dev7}/cycode/cli/files_collector/sca/maven/base_restore_maven_dependencies.py

@@ -4,7 +4,7 @@ from typing import List, Optional
 import click
 
 from cycode.cli.models import Document
-from cycode.cli.utils.path_utils import get_file_dir, join_paths
+from cycode.cli.utils.path_utils import get_file_content, get_file_dir, join_paths
 from cycode.cli.utils.shell_executor import shell
 from cycode.cyclient import logger
 
@@ -39,6 +39,23 @@ class BaseRestoreMavenDependencies(ABC):
             else document.path
         )
 
+    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
+        manifest_file_path = self.get_manifest_file_path(document)
+        restore_file_path = build_dep_tree_path(document.path, self.get_lock_file_name())
+
+        if self.verify_restore_file_already_exist(restore_file_path):
+            restore_file_content = get_file_content(restore_file_path)
+        else:
+            restore_file_content = execute_command(
+                self.get_command(manifest_file_path), manifest_file_path, self.command_timeout
+            )
+
+        return Document(restore_file_path, restore_file_content, self.is_git_diff)
+
+    @abstractmethod
+    def verify_restore_file_already_exist(self, restore_file_path: str) -> bool:
+        pass
+
     @abstractmethod
     def is_project(self, document: Document) -> bool:
         pass
@@ -50,11 +67,3 @@ class BaseRestoreMavenDependencies(ABC):
     @abstractmethod
     def get_lock_file_name(self) -> str:
         pass
-
-    def try_restore_dependencies(self, document: Document) -> Optional[Document]:
-        manifest_file_path = self.get_manifest_file_path(document)
-        return Document(
-            build_dep_tree_path(document.path, self.get_lock_file_name()),
-            execute_command(self.get_command(manifest_file_path), manifest_file_path, self.command_timeout),
-            self.is_git_diff,
-        )

{cycode-1.7.1.dev5 → cycode-1.7.1.dev7}/cycode/cli/files_collector/sca/maven/restore_gradle_dependencies.py

@@ -1,3 +1,4 @@
+import os
 from typing import List
 
 import click
@@ -22,3 +23,6 @@ class RestoreGradleDependencies(BaseRestoreMavenDependencies):
 
     def get_lock_file_name(self) -> str:
         return BUILD_GRADLE_DEP_TREE_FILE_NAME
+
+    def verify_restore_file_already_exist(self, restore_file_path: str) -> bool:
+        return os.path.isfile(restore_file_path)

{cycode-1.7.1.dev5 → cycode-1.7.1.dev7}/cycode/cli/files_collector/sca/maven/restore_maven_dependencies.py

@@ -29,6 +29,9 @@ class RestoreMavenDependencies(BaseRestoreMavenDependencies):
     def get_lock_file_name(self) -> str:
         return join_paths('target', MAVEN_CYCLONE_DEP_TREE_FILE_NAME)
 
+    def verify_restore_file_already_exist(self, restore_file_path: str) -> bool:
+        return False
+
     def try_restore_dependencies(self, document: Document) -> Optional[Document]:
         restore_dependencies_document = super().try_restore_dependencies(document)
         manifest_file_path = self.get_manifest_file_path(document)

{cycode-1.7.1.dev5 → cycode-1.7.1.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "1.7.1.dev5" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "1.7.1.dev7" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
 description = "Boost security in your dev lifecycle via SAST, SCA, Secrets & IaC scanning."
 keywords=["secret-scan", "cycode", "devops", "token", "secret", "security", "cycode", "code"]
 authors = ["Cycode <support@cycode.com>"]
@@ -52,8 +52,7 @@ pyinstaller = ">=5.13.2,<5.14.0"
 dunamai = ">=1.18.0,<1.19.0"
 
 [tool.poetry.group.dev.dependencies]
-black = ">=23.3.0,<23.4.0"
-ruff = "0.0.277"
+ruff = "0.1.11"
 
 [tool.pytest.ini_options]
 log_cli = true
@@ -68,26 +67,6 @@ fix-shallow-repository=true
 vcs = "git"
 style = "pep440"
 
-[tool.black]
-line-length = 120
-skip-string-normalization=true
-target-version = ['py37']
-include = '\.pyi?$'
-exclude = '''
-(
-  /(
-      \.git
-    | \.mypy_cache
-    | .idea
-    | .pytest_cache
-    | venv
-    | htmlcov
-    | build
-    | dist
-  )/
-)
-'''
-
 [tool.ruff]
 extend-select = [
     "E",  # pycodestyle errors
@@ -125,6 +104,8 @@ ignore = [
     "ANN003", # Missing type annotation for `**kwargs`
     "ANN101", # Missing type annotation for `self` in method
     "ANN102", # Missing type annotation for `cls` in classmethod
+    "ANN401", # Dynamically typed expressions (typing.Any)
+    "ISC001", # Conflicts with ruff format
 ]
 
 [tool.ruff.flake8-quotes]
@@ -136,6 +117,9 @@ inline-quotes = "single"
 "tests/*.py" = ["S101", "S105"]
 "cycode/*.py" = ["BLE001"]
 
+[tool.ruff.format]
+quote-style = "single"
+
 [build-system]
 requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
 build-backend = "poetry_dynamic_versioning.backend"

cycode-1.7.1.dev5/cycode/__init__.py

@@ -1 +0,0 @@
-__version__ = '1.7.1.dev5'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag