cycode 0.2.6.dev14__tar.gz → 0.2.6.dev16__tar.gz

{cycode-0.2.6.dev14 → cycode-0.2.6.dev16}/PKG-INFO

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

{cycode-0.2.6.dev14 → cycode-0.2.6.dev16}/cycode/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.2.6.dev14'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+__version__ = '0.2.6.dev16'  # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
 
 if __version__ == '0.0.1.dev1':
     # If CLI was installed from shallow clone, __version__ will be 0.0.1.dev1 due to non-strict versioning.

{cycode-0.2.6.dev14 → cycode-0.2.6.dev16}/cycode/cli/consts.py

@@ -1,3 +1,5 @@
+PROGRAM_NAME = 'cycode'
+
 PRE_COMMIT_COMMAND_SCAN_TYPE = 'pre_commit'
 PRE_RECEIVE_COMMAND_SCAN_TYPE = 'pre_receive'
 COMMIT_HISTORY_COMMAND_SCAN_TYPE = 'commit_history'

{cycode-0.2.6.dev14 → cycode-0.2.6.dev16}/cycode/cli/helpers/sca_code_scanner.py

@@ -43,13 +43,16 @@ def perform_pre_hook_range_scan_actions(
 def add_ecosystem_related_files_if_exists(
     documents: List[Document], repo: Optional[Repo] = None, commit_rev: Optional[str] = None
 ) -> None:
+    documents_to_add: List[Document] = []
     for doc in documents:
         ecosystem = get_project_file_ecosystem(doc)
         if ecosystem is None:
             logger.debug('failed to resolve project file ecosystem: %s', doc.path)
             continue
-        documents_to_add = get_doc_ecosystem_related_project_files(doc, documents, ecosystem, commit_rev, repo)
-        documents.extend(documents_to_add)
+
+        documents_to_add.extend(get_doc_ecosystem_related_project_files(doc, documents, ecosystem, commit_rev, repo))
+
+    documents.extend(documents_to_add)
 
 
 def get_doc_ecosystem_related_project_files(
@@ -59,11 +62,10 @@ def get_doc_ecosystem_related_project_files(
     for ecosystem_project_file in consts.PROJECT_FILES_BY_ECOSYSTEM_MAP.get(ecosystem):
         file_to_search = join_paths(get_file_dir(doc.path), ecosystem_project_file)
         if not is_project_file_exists_in_documents(documents, file_to_search):
-            file_content = (
-                get_file_content_from_commit(repo, commit_rev, file_to_search)
-                if repo
-                else get_file_content(file_to_search)
-            )
+            if repo:
+                file_content = get_file_content_from_commit(repo, commit_rev, file_to_search)
+            else:
+                file_content = get_file_content(file_to_search)
 
             if file_content is not None:
                 documents_to_add.append(Document(file_to_search, file_content))

{cycode-0.2.6.dev14 → cycode-0.2.6.dev16}/cycode/cli/main.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import sys
 from typing import TYPE_CHECKING, List, Optional, Tuple
@@ -8,7 +9,7 @@ from cycode import __version__
 from cycode.cli import code_scanner
 from cycode.cli.auth.auth_command import authenticate
 from cycode.cli.config import config
-from cycode.cli.consts import ISSUE_DETECTED_STATUS_CODE, NO_ISSUES_STATUS_CODE
+from cycode.cli.consts import ISSUE_DETECTED_STATUS_CODE, NO_ISSUES_STATUS_CODE, PROGRAM_NAME
 from cycode.cli.models import Severity
 from cycode.cli.user_settings.configuration_manager import ConfigurationManager
 from cycode.cli.user_settings.credentials_manager import CredentialsManager
@@ -180,8 +181,30 @@ def finalize(context: click.Context, *_, **__) -> None:
     sys.exit(exit_code)
 
 
+@click.command(short_help='Show the version and exit')
+@click.pass_context
+def version(context: click.Context) -> None:
+    output = context.obj['output']
+
+    prog = PROGRAM_NAME
+    ver = __version__
+
+    message = f'{prog}, version {ver}'
+    if output == 'json':
+        message = json.dumps({'name': prog, 'version': ver})
+
+    click.echo(message, color=context.color)
+    context.exit()
+
+
 @click.group(
-    commands={'scan': code_scan, 'configure': set_credentials, 'ignore': add_exclusions, 'auth': authenticate},
+    commands={
+        'scan': code_scan,
+        'configure': set_credentials,
+        'ignore': add_exclusions,
+        'auth': authenticate,
+        'version': version,
+    },
     context_settings=CONTEXT,
 )
 @click.option(
@@ -210,7 +233,7 @@ def finalize(context: click.Context, *_, **__) -> None:
     help='Characteristic JSON object that lets servers identify the application',
     type=str,
 )
-@click.version_option(__version__, prog_name='cycode')
+@click.version_option(__version__, prog_name=PROGRAM_NAME)
 @click.pass_context
 def main_cli(
     context: click.Context, verbose: bool, no_progress_meter: bool, output: str, user_agent: Optional[str]

{cycode-0.2.6.dev14 → cycode-0.2.6.dev16}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cycode"
-version = "0.2.6.dev14" # DON'T TOUCH. Placeholder. Will be filled automatically on poetry build from Git Tag
+version = "0.2.6.dev16" # 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>"]