fosslight-dependency 3.15.0__py3-none-any.whl → 3.15.1__py3-none-any.whl

fosslight_dependency/_help.py

@@ -32,6 +32,7 @@ _HELP_MESSAGE_DEPENDENCY = """
             -m <package_manager>\t    Enter the package manager.
                                         \t(npm, maven, gradle, pip, pub, cocoapods, android, swift, carthage, go, nuget, helm)
             -p <input_path>\t\t    Enter the path where the script will be run.
+            -e <exclude_path>\t\t    Enter the path where the analysis will not be performed.
             -o <output_path>\t\t    Output path
             \t\t\t\t\t(If you want to generate the specific file name, add the output path with file name.)
             -f <format>\t\t\t    Output file format (excel, csv, opossum, yaml, spdx-tag, spdx-yaml, spdx-json, spdx-xml)

fosslight_dependency/run_dependency_scanner.py

@@ -27,7 +27,7 @@ _PKG_NAME = "fosslight_dependency"
 logger = logging.getLogger(constant.LOGGER_NAME)
 warnings.filterwarnings("ignore", category=FutureWarning)
 _sheet_name = "DEP_FL_Dependency"
-EXTENDED_HEADER = {_sheet_name: ['ID', 'purl', 'OSS Name',
+EXTENDED_HEADER = {_sheet_name: ['ID', 'Package URL', 'OSS Name',
                                        'OSS Version', 'License', 'Download Location',
                                        'Homepage', 'Copyright Text', 'Exclude',
                                        'Comment', 'Depends On']}
@@ -37,7 +37,7 @@ CUSTOMIZED_FORMAT = {'excel': '.xlsx', 'csv': '.csv', 'opossum': '.json', 'yaml'
 _exclude_dir = ['node_moduels', 'venv']
 
 
-def find_package_manager(input_dir):
+def find_package_manager(input_dir, abs_path_to_exclude=[]):
     ret = True
     manifest_file_name = []
     for value in const.SUPPORT_PACKAE.values():
@@ -52,7 +52,14 @@ def find_package_manager(input_dir):
             continue
         if os.path.basename(parent) in _exclude_dir:
             continue
+        if os.path.abspath(parent) in abs_path_to_exclude:
+            continue
         for file in files:
+            file_path = os.path.join(parent, file)
+            file_abs_path = os.path.abspath(file_path)
+            if any(os.path.commonpath([file_abs_path, exclude_path]) == exclude_path
+                   for exclude_path in abs_path_to_exclude):
+                continue
             if file in manifest_file_name:
                 found_manifest_file.append(file)
         if len(found_manifest_file) > 0:
@@ -83,8 +90,9 @@ def find_package_manager(input_dir):
     return ret, found_package_manager, input_dir
 
 
-def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='', pip_activate_cmd='', pip_deactivate_cmd='',
-                           output_custom_dir='', app_name=const.default_app_name, github_token='', format='', direct=True):
+def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='', pip_activate_cmd='',
+                           pip_deactivate_cmd='', output_custom_dir='', app_name=const.default_app_name,
+                           github_token='', format='', direct=True, path_to_exclude=[]):
     global logger
 
     ret = True
@@ -117,7 +125,8 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
         sys.exit(1)
 
     logger, _result_log = init_log(os.path.join(output_path, "fosslight_log_dep_" + _start_time + ".txt"),
-                                   True, logging.INFO, logging.DEBUG, _PKG_NAME)
+                                   True, logging.INFO, logging.DEBUG, _PKG_NAME, "", path_to_exclude)
+    abs_path_to_exclude = [os.path.abspath(os.path.join(input_dir, path)) for path in path_to_exclude]
 
     logger.info(f"Tool Info : {_result_log['Tool Info']}")
 
@@ -151,7 +160,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
     found_package_manager = {}
     if autodetect:
         try:
-            ret, found_package_manager, input_dir = find_package_manager(input_dir)
+            ret, found_package_manager, input_dir = find_package_manager(input_dir, abs_path_to_exclude)
             os.chdir(input_dir)
         except Exception as e:
             logger.error(f'Fail to find package manager: {e}')
@@ -188,7 +197,8 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
             fail_pm.append(f"{pm} ({', '.join(manifest_file_name)})")
     cover = CoverItem(tool_name=_PKG_NAME,
                       start_time=_start_time,
-                      input_path=input_dir)
+                      input_path=input_dir,
+                      exclude_path=path_to_exclude)
     cover_comment_arr = []
     if len(found_package_manager.keys()) > 0:
         if len(success_pm) > 0:
@@ -231,6 +241,7 @@ def main():
     package_manager = ''
     input_dir = ''
     output_dir = ''
+    path_to_exclude = []
     pip_activate_cmd = ''
     pip_deactivate_cmd = ''
     output_custom_dir = ''
@@ -244,6 +255,7 @@ def main():
     parser.add_argument('-v', '--version', action='store_true', required=False)
     parser.add_argument('-m', '--manager', nargs=1, type=str, default='', required=False)
     parser.add_argument('-p', '--path', nargs=1, type=str, required=False)
+    parser.add_argument('-e', '--exclude', nargs='*', required=False, default=[])
     parser.add_argument('-o', '--output', nargs=1, type=str, required=False)
     parser.add_argument('-a', '--activate', nargs=1, type=str, default='', required=False)
     parser.add_argument('-d', '--deactivate', nargs=1, type=str, default='', required=False)
@@ -268,6 +280,8 @@ def main():
         package_manager = ''.join(args.manager)
     if args.path:  # -p option
         input_dir = ''.join(args.path)
+    if args.exclude:  # -e option
+        path_to_exclude = args.exclude
     if args.output:  # -o option
         output_dir = ''.join(args.output)
     if args.activate:  # -a option
@@ -301,7 +315,7 @@ def main():
         sys.exit(0)
 
     run_dependency_scanner(package_manager, input_dir, output_dir, pip_activate_cmd, pip_deactivate_cmd,
-                           output_custom_dir, app_name, github_token, format, direct)
+                           output_custom_dir, app_name, github_token, format, direct, path_to_exclude)
 
 
 if __name__ == '__main__':

{fosslight_dependency-3.15.0.dist-info → fosslight_dependency-3.15.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 3.15.0
+Version: 3.15.1
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics
@@ -20,7 +20,7 @@ Requires-Dist: lxml
 Requires-Dist: virtualenv
 Requires-Dist: pyyaml
 Requires-Dist: lastversion
-Requires-Dist: fosslight-util >=1.4.40
+Requires-Dist: fosslight-util >=1.4.43
 Requires-Dist: PyGithub
 Requires-Dist: requirements-parser
 Requires-Dist: defusedxml

{fosslight_dependency-3.15.0.dist-info → fosslight_dependency-3.15.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 fosslight_dependency/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fosslight_dependency/_analyze_dependency.py,sha256=f66gNPSluuDqx0e_7iyIuoSC_HNjpSitL_e1lak6kEA,3872
-fosslight_dependency/_help.py,sha256=7B-B-j8IXuZhhoeuRvcbj5AiyGQmqg6qMbv8zbDl95c,2730
+fosslight_dependency/_help.py,sha256=1hZd0C8vpePA9J9gHTYt2jS9Mi4gRaknmY7HJDzU0IM,2824
 fosslight_dependency/_package_manager.py,sha256=pVwD9KVYgJygPMDUqh2SckOEjFOZ4T0wAx5_hhHHQYY,17094
 fosslight_dependency/constant.py,sha256=1mJGu1SYyxVKo0W_pCIt-ANp52E_I5ovXFvpl2OMmjU,1039
-fosslight_dependency/run_dependency_scanner.py,sha256=9fktktCcY5Po3Hqxdh04Q8U-SbRNsu50WAPjQSrjZ3o,12795
+fosslight_dependency/run_dependency_scanner.py,sha256=QqF6nFZg_pyEJAM_nq--Y6OjXHxdfuaY__Xs886Ldug,13624
 fosslight_dependency/LICENSES/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 fosslight_dependency/LICENSES/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
 fosslight_dependency/package_manager/Android.py,sha256=JJZUYjefb3BZBk6ai-A3TMN8NZ4ydMfYAKq6k1BElsQ,3155
@@ -23,12 +23,12 @@ fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 fosslight_dependency/third_party/askalono/askalono.exe,sha256=NyngElHbrg3zLFRVwn6fPDZE_EDAEb1N8tiwWoCm4pQ,4743680
 fosslight_dependency/third_party/askalono/askalono_macos,sha256=cYSNXhAQpkdd8lkgnY5skNeDmU_8DIuP84eFi0OXKkE,5589868
 fosslight_dependency/third_party/nomos/nomossa,sha256=oFF9I-fhug6AVNyFnWeVXwDRin6NWSvk1g7mHBotB3Q,866408
-fosslight_dependency-3.15.0.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-3.15.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-3.15.0.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-3.15.0.dist-info/METADATA,sha256=gZi-Y-eZJt_wSLCUuhhPA52xjYFrzSU8QDyhrt1UJVE,4799
-fosslight_dependency-3.15.0.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-3.15.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fosslight_dependency-3.15.0.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
-fosslight_dependency-3.15.0.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-3.15.0.dist-info/RECORD,,
+fosslight_dependency-3.15.1.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-3.15.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-3.15.1.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-3.15.1.dist-info/METADATA,sha256=TR5EyhsgzjbcFRu6ACWFdrJiE1vVYXRr25_KE_yTc6Y,4799
+fosslight_dependency-3.15.1.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-3.15.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+fosslight_dependency-3.15.1.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
+fosslight_dependency-3.15.1.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-3.15.1.dist-info/RECORD,,