fosslight-dependency 4.1.2__tar.gz → 4.1.4__tar.gz

{fosslight_dependency-4.1.2 → fosslight_dependency-4.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_dependency
-Version: 4.1.2
+Version: 4.1.4
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics
@@ -13,7 +13,7 @@ Description: <!--
         
         # FOSSLight Dependency Scanner
         
-        `<img src="https://img.shields.io/pypi/l/fosslight_dependency" alt="License" />` `<a href="https://pypi.org/project/fosslight-dependency/"><img src="https://img.shields.io/pypi/v/fosslight_dependency" alt="Current python package version." />``</a>` `<img src="https://img.shields.io/pypi/pyversions/fosslight_dependency" />` [![REUSE status](https://api.reuse.software/badge/github.com/fosslight/fosslight_dependency_scanner)](https://api.reuse.software/info/github.com/fosslight/fosslight_dependency_scanner)
+        <img src="https://img.shields.io/pypi/l/fosslight_dependency" alt="License" /> <a href="https://pypi.org/project/fosslight-dependency/"><img src="https://img.shields.io/pypi/v/fosslight_dependency" alt="Current python package version." /></a> <img src="https://img.shields.io/pypi/pyversions/fosslight_dependency" /> [![REUSE status](https://api.reuse.software/badge/github.com/fosslight/fosslight_dependency_scanner)](https://api.reuse.software/info/github.com/fosslight/fosslight_dependency_scanner)
         
         ## 💡 Introduction
         

{fosslight_dependency-4.1.2 → fosslight_dependency-4.1.4}/README.md

@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0
 
 # FOSSLight Dependency Scanner
 
-`<img src="https://img.shields.io/pypi/l/fosslight_dependency" alt="License" />` `<a href="https://pypi.org/project/fosslight-dependency/"><img src="https://img.shields.io/pypi/v/fosslight_dependency" alt="Current python package version." />``</a>` `<img src="https://img.shields.io/pypi/pyversions/fosslight_dependency" />` [![REUSE status](https://api.reuse.software/badge/github.com/fosslight/fosslight_dependency_scanner)](https://api.reuse.software/info/github.com/fosslight/fosslight_dependency_scanner)
+<img src="https://img.shields.io/pypi/l/fosslight_dependency" alt="License" /> <a href="https://pypi.org/project/fosslight-dependency/"><img src="https://img.shields.io/pypi/v/fosslight_dependency" alt="Current python package version." /></a> <img src="https://img.shields.io/pypi/pyversions/fosslight_dependency" /> [![REUSE status](https://api.reuse.software/badge/github.com/fosslight/fosslight_dependency_scanner)](https://api.reuse.software/info/github.com/fosslight/fosslight_dependency_scanner)
 
 ## 💡 Introduction
 

{fosslight_dependency-4.1.2 → fosslight_dependency-4.1.4}/requirements.txt

@@ -4,7 +4,7 @@ lxml
 virtualenv
 pyyaml
 lastversion
-fosslight_util>=2.1.0
+fosslight_util>=2.1.6
 PyGithub
 requirements-parser
 defusedxml

{fosslight_dependency-4.1.2 → fosslight_dependency-4.1.4}/setup.py

@@ -35,7 +35,7 @@ if __name__ == "__main__":
 
     setup(
         name=_PACKAEG_NAME,
-        version='4.1.2',
+        version='4.1.4',
         package_dir={"": "src"},
         packages=find_namespace_packages(where='src'),
         description='FOSSLight Dependency Scanner',

{fosslight_dependency-4.1.2 → fosslight_dependency-4.1.4}/src/fosslight_dependency/run_dependency_scanner.py

@@ -11,6 +11,7 @@ import pkg_resources
 import warnings
 from datetime import datetime
 import logging
+import shutil
 import fosslight_dependency.constant as const
 from collections import defaultdict
 from fosslight_util.set_log import init_log
@@ -30,12 +31,26 @@ EXTENDED_HEADER = {_sheet_name: ['ID', 'Package URL', 'OSS Name',
                                        'OSS Version', 'License', 'Download Location',
                                        'Homepage', 'Copyright Text', 'Exclude',
                                        'Comment', 'Depends On']}
-CUSTOMIZED_FORMAT = {'excel': '.xlsx', 'csv': '.csv', 'opossum': '.json', 'yaml': '.yaml',
-                     'spdx-yaml': '.yaml', 'spdx-json': '.json', 'spdx-xml': '.xml',
-                     'spdx-tag': '.tag'}
 _exclude_dir = ['node_moduels', 'venv']
 
 
+def get_terminal_size():
+    size = shutil.get_terminal_size()
+    return size.lines
+
+
+def paginate_file(file_path):
+    lines_per_page = get_terminal_size() - 1
+    with open(file_path, 'r', encoding='utf8') as file:
+        lines = file.readlines()
+
+    for i in range(0, len(lines), lines_per_page):
+        os.system('clear' if os.name == 'posix' else 'cls')
+        print(''.join(lines[i: i + lines_per_page]))
+        if i + lines_per_page < len(lines):
+            input("Press Enter to see the next page...")
+
+
 def find_package_manager(input_dir, abs_path_to_exclude=[]):
     ret = True
     manifest_file_name = []
@@ -113,12 +128,15 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
             to_remove = []  # elements of spdx format on windows that should be removed
             for i, output_extension in enumerate(output_extensions):
                 if formats:
-                    if formats[i].startswith('spdx'):
-                        if platform.system() != 'Windows':
-                            output_files[i] = f"fosslight_spdx_dep_{_start_time}"
-                        else:
-                            logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
+                    if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
+                        if platform.system() == 'Windows':
+                            logger.warning(f'{formats[i]} is not supported on Windows.Please remove {formats[i]} from format.')
                             to_remove.append(i)
+                        else:
+                            if formats[i].startswith('spdx'):
+                                output_files[i] = f"fosslight_spdx_dep_{_start_time}"
+                            elif formats[i].startswith('cyclonedx'):
+                                output_files[i] = f'fosslight_cyclonedx_dep_{_start_time}'
                     else:
                         if output_extension == _json_ext:
                             output_files[i] = f"fosslight_opossum_dep_{_start_time}"
@@ -220,7 +238,8 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
         if len(success_pm) > 0:
             scan_item.set_cover_comment(f"Analyzed Package manager: {', '.join(success_pm)}")
         if len(fail_pm) > 0:
-            info_msg = 'Check https://fosslight.org/fosslight-guide-en/scanner/3_dependency.html#-prerequisite.'
+            info_msg = 'Check log file(fosslight_log*.txt) ' \
+                       'and https://fosslight.org/fosslight-guide-en/scanner/3_dependency.html#-prerequisite.'
             scan_item.set_cover_comment(f"Analysis failed Package manager: {', '.join(fail_pm)} ({info_msg})")
     else:
         scan_item.set_cover_comment("No Package manager detected.")
@@ -229,7 +248,15 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
         graph_path = os.path.abspath(graph_path)
         try:
             converter = GraphConvertor(scan_item.file_items[_PKG_NAME])
-            converter.save(graph_path, graph_size)
+            growth_factor_per_node = 10
+            node_count_threshold = 20
+            node_count = len(scan_item.file_items[_PKG_NAME])
+            if node_count > node_count_threshold:
+                new_size = tuple(x + (node_count * growth_factor_per_node) for x in graph_size)
+            else:
+                new_size = graph_size
+            new_size = tuple((((x + 99) // 100) * 100) for x in new_size)
+            converter.save(graph_path, new_size)
             logger.info(f"Output graph image file: {graph_path}")
         except Exception as e:
             logger.error(f'Fail to make graph image: {e}')
@@ -326,9 +353,9 @@ def main():
     if args.graph_size:
         graph_size = args.graph_size
     if args.direct:  # --direct option
-        if args.direct == 'true':
+        if args.direct == 'true' or args.direct == 'True':
             direct = True
-        elif args.direct == 'false':
+        elif args.direct == 'false' or args.direct == 'False':
             direct = False
     if args.notice:  # --notice option
         try:
@@ -339,8 +366,10 @@ def main():
         data_path = os.path.join(base_path, 'LICENSES')
         print(f"*** {_PKG_NAME} open source license notice ***")
         for ff in os.listdir(data_path):
-            f = open(os.path.join(data_path, ff), 'r', encoding='utf8')
-            print(f.read())
+            source_file = os.path.join(data_path, ff)
+            destination_file = os.path.join(base_path, ff)
+            paginate_file(source_file)
+            shutil.copyfile(source_file, destination_file)
         sys.exit(0)
 
     run_dependency_scanner(package_manager, input_dir, output_dir, pip_activate_cmd, pip_deactivate_cmd,

{fosslight_dependency-4.1.2 → fosslight_dependency-4.1.4}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 4.1.2
+Version: 4.1.4
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics
@@ -13,7 +13,7 @@ Description: <!--
         
         # FOSSLight Dependency Scanner
         
-        `<img src="https://img.shields.io/pypi/l/fosslight_dependency" alt="License" />` `<a href="https://pypi.org/project/fosslight-dependency/"><img src="https://img.shields.io/pypi/v/fosslight_dependency" alt="Current python package version." />``</a>` `<img src="https://img.shields.io/pypi/pyversions/fosslight_dependency" />` [![REUSE status](https://api.reuse.software/badge/github.com/fosslight/fosslight_dependency_scanner)](https://api.reuse.software/info/github.com/fosslight/fosslight_dependency_scanner)
+        <img src="https://img.shields.io/pypi/l/fosslight_dependency" alt="License" /> <a href="https://pypi.org/project/fosslight-dependency/"><img src="https://img.shields.io/pypi/v/fosslight_dependency" alt="Current python package version." /></a> <img src="https://img.shields.io/pypi/pyversions/fosslight_dependency" /> [![REUSE status](https://api.reuse.software/badge/github.com/fosslight/fosslight_dependency_scanner)](https://api.reuse.software/info/github.com/fosslight/fosslight_dependency_scanner)
         
         ## 💡 Introduction
         

{fosslight_dependency-4.1.2 → fosslight_dependency-4.1.4}/src/fosslight_dependency.egg-info/requires.txt

@@ -4,7 +4,7 @@ lxml
 virtualenv
 pyyaml
 lastversion
-fosslight_util>=2.1.0
+fosslight_util>=2.1.6
 PyGithub
 requirements-parser
 defusedxml