fosslight-dependency 3.13.8__py3-none-any.whl → 3.14.0__py3-none-any.whl

fosslight_dependency/constant.py

@@ -25,7 +25,7 @@ HELM = 'helm'
 
 # Supported package name and manifest file
 SUPPORT_PACKAE = {
-    PYPI: ['requirements.txt', 'setup.py'],
+    PYPI: ['requirements.txt', 'setup.py', 'pyproject.toml'],
     NPM: 'package.json',
     MAVEN: 'pom.xml',
     GRADLE: 'build.gradle',

fosslight_dependency/package_manager/Cocoapods.py

@@ -86,7 +86,7 @@ class Cocoapods(PackageManager):
             try:
                 comment_list = []
                 deps_list = []
-                if self.direct_dep:
+                if self.direct_dep and (len(self.direct_dep_list) > 0):
                     if pod_oss_name_origin in self.direct_dep_list:
                         comment_list.append('direct')
                     else:
@@ -98,10 +98,12 @@ class Cocoapods(PackageManager):
                 comment = ','.join(comment_list)
                 deps = ','.join(deps_list)
 
+                oss_name_report = f'{self.package_manager_name}:{pod_oss_name_origin}'
                 pod_oss_name = pod_oss_name_origin
                 if '/' in pod_oss_name_origin:
                     pod_oss_name = pod_oss_name_origin.split('/')[0]
                 if pod_oss_name in external_source_list:
+                    oss_name_report = pod_oss_name_origin
                     podspec_filename = pod_oss_name + '.podspec.json'
                     spec_file_path = os.path.join("Pods", "Local Podspecs", podspec_filename)
                 else:
@@ -126,13 +128,14 @@ class Cocoapods(PackageManager):
                     spec_file_path = os.path.join(file_path_without_version, pod_oss_version, file_path[-1])
 
                 oss_name, oss_version, license_name, dn_loc, homepage = self.get_oss_in_podspec(spec_file_path)
+                if pod_oss_name in external_source_list:
+                    homepage = dn_loc
                 if oss_name == '':
                     continue
                 if pod_oss_version != oss_version:
                     logger.warning(f'{pod_oss_name_origin} has different version({pod_oss_version})\
                                    with spec version({oss_version})')
-                sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name),
-                                  f'{self.package_manager_name}:{pod_oss_name_origin}',
+                sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name), oss_name_report,
                                    pod_oss_version, license_name, dn_loc, homepage, '', '', comment, deps])
             except Exception as e:
                 logger.warning(f"Fail to get {pod_oss_name_origin}:{e}")

fosslight_dependency/package_manager/Helm.py

@@ -44,25 +44,32 @@ class Helm(PackageManager):
                 logger.error(f"Failed to build helm dependency: {cmd}")
                 ret = False
             else:
-                shutil.copytree(charts_dir, self.tmp_charts_dir)
-                shutil.rmtree(charts_dir, ignore_errors=True)
-
-        ret = extract_compressed_dir(self.tmp_charts_dir, self.tmp_charts_dir, False)
-        if not ret:
-            logger.error(f'Fail to extract compressed dir: {self.tmp_charts_dir}')
-        else:
-            logger.warning('Success to extract compressed dir')
+                if not os.path.isdir(charts_dir):
+                    logger.warning(f"Cannot create {charts_dir} because of no dependencies in Chart.yaml. "
+                                   f"So you don't need to analyze dependency.")
+                    return True
+                else:
+                    shutil.copytree(charts_dir, self.tmp_charts_dir)
+                    shutil.rmtree(charts_dir, ignore_errors=True)
+        if ret:
+            ret = extract_compressed_dir(self.tmp_charts_dir, self.tmp_charts_dir, False)
+            if not ret:
+                logger.error(f'Fail to extract compressed dir: {self.tmp_charts_dir}')
+            else:
+                logger.warning('Success to extract compressed dir')
 
         return ret
 
     def parse_oss_information(self, f_name):
         dep_item_list = []
         sheet_list = []
+        _dependencies = 'dependencies'
 
         with open(f_name, 'r', encoding='utf8') as yaml_fp:
             yaml_f = yaml.safe_load(yaml_fp)
-            for dep in yaml_f['dependencies']:
-                dep_item_list.append(dep['name'])
+            if _dependencies in yaml_f:
+                for dep in yaml_f[_dependencies]:
+                    dep_item_list.append(dep['name'])
         for dep in dep_item_list:
             try:
                 f_path = os.path.join(self.tmp_charts_dir, dep, f_name)

fosslight_dependency/package_manager/Npm.py

@@ -22,6 +22,7 @@ class Npm(PackageManager):
 
     dn_url = 'https://www.npmjs.com/package/'
     input_file_name = 'tmp_npm_license_output.json'
+    tmp_custom_json = 'custom.json'
     flag_tmp_node_modules = False
 
     def __init__(self, input_dir, output_dir):
@@ -32,6 +33,8 @@ class Npm(PackageManager):
             os.remove(self.input_file_name)
         if self.flag_tmp_node_modules:
             shutil.rmtree(node_modules, ignore_errors=True)
+        if os.path.exists(self.tmp_custom_json):
+            os.remove(self.tmp_custom_json)
 
     def run_plugin(self):
         ret = self.start_license_checker()
@@ -39,10 +42,9 @@ class Npm(PackageManager):
 
     def start_license_checker(self):
         ret = True
-        tmp_custom_json = 'custom.json'
-        license_checker_cmd = f'license-checker --excludePrivatePackages --production --json --out {self.input_file_name}'
+        license_checker_cmd = f'license-checker --production --json --out {self.input_file_name}'
         custom_path_option = ' --customPath '
-        npm_install_cmd = 'npm install --omit=dev'
+        npm_install_cmd = 'npm install --production'
 
         if os.path.isdir(node_modules) != 1:
             logger.info(f"node_modules directory is not existed. So it executes '{npm_install_cmd}'.")
@@ -53,18 +55,18 @@ class Npm(PackageManager):
                 return False
 
         # customized json file for obtaining specific items with license-checker
-        self.make_custom_json(tmp_custom_json)
+        self.make_custom_json(self.tmp_custom_json)
 
-        cmd = license_checker_cmd + custom_path_option + tmp_custom_json
+        cmd = license_checker_cmd + custom_path_option + self.tmp_custom_json
         cmd_ret = subprocess.call(cmd, shell=True)
         if cmd_ret != 0:
             logger.error(f"It returns the error: {cmd}")
             logger.error("Please check if the license-checker is installed.(sudo npm install -g license-checker)")
-            return False
+            ret = False
         else:
             self.append_input_package_list_file(self.input_file_name)
-
-        os.remove(tmp_custom_json)
+        if os.path.exists(self.tmp_custom_json):
+            os.remove(self.tmp_custom_json)
 
         return ret
 
@@ -111,7 +113,7 @@ class Npm(PackageManager):
             ret = False
         if ret:
             if result.returncode == 1:
-                logger.warning(f'npm ls returns an error code: {result.stderr}')
+                logger.warning(f"'{cmd}' returns error code: {result.stderr}")
 
             try:
                 rel_json = json.loads(rel_tree)
@@ -119,13 +121,16 @@ class Npm(PackageManager):
                     ret = False
                 else:
                     self.package_name = f'{rel_json[_name]}({rel_json[_version]})'
-                    self.parse_rel_dependencies(rel_json[_name], rel_json[_version], rel_json[_dependencies])
+                    if _dependencies in rel_json:
+                        self.parse_rel_dependencies(rel_json[_name], rel_json[_version], rel_json[_dependencies])
             except Exception as e:
                 ret = False
                 err_msg = e
         return ret, err_msg
 
     def parse_direct_dependencies(self):
+        if not self.direct_dep:
+            return
         try:
             if os.path.isfile(const.SUPPORT_PACKAE.get(self.package_manager_name)):
                 ret, err_msg = self.parse_transitive_relationship()
@@ -145,6 +150,9 @@ class Npm(PackageManager):
 
         sheet_list = []
         comment = ''
+        _licenses = 'licenses'
+        _repository = 'repository'
+        _private = 'private'
 
         keys = [key for key in json_data]
 
@@ -153,31 +161,38 @@ class Npm(PackageManager):
             oss_init_name = d['name']
             oss_name = self.package_manager_name + ":" + oss_init_name
 
-            if d['licenses']:
-                license_name = d['licenses']
+            if d[_licenses]:
+                license_name = d[_licenses]
             else:
                 license_name = ''
 
             oss_version = d['version']
             package_path = d['path']
 
-            if d['repository']:
-                dn_loc = d['repository']
-            else:
-                dn_loc = f"{self.dn_url}{oss_init_name}/v/{oss_version}"
+            private_pkg = False
+            if _private in d:
+                if d[_private]:
+                    private_pkg = True
 
             homepage = self.dn_url + oss_init_name
+            dn_loc = f"{self.dn_url}{oss_init_name}/v/{oss_version}"
+            if d[_repository]:
+                dn_loc = d[_repository]
+            elif private_pkg:
+                dn_loc = ''
 
             comment_list = []
             deps_list = []
-            if self.direct_dep and len(self.relation_tree) > 0:
-                if self.package_name == f'{oss_init_name}({oss_version})':
-                    comment_list.append('root package')
+            if private_pkg:
+                homepage = dn_loc
+                comment_list.append('private')
+            if self.package_name == f'{oss_init_name}({oss_version})':
+                comment_list.append('root package')
+            elif self.direct_dep and len(self.relation_tree) > 0:
+                if f'{oss_init_name}({oss_version})' in self.relation_tree[self.package_name]:
+                    comment_list.append('direct')
                 else:
-                    if f'{oss_init_name}({oss_version})' in self.relation_tree[self.package_name]:
-                        comment_list.append('direct')
-                    else:
-                        comment_list.append('transitive')
+                    comment_list.append('transitive')
 
                 if f'{oss_init_name}({oss_version})' in self.relation_tree:
                     rel_items = [f'npm:{ri}' for ri in self.relation_tree[f'{oss_init_name}({oss_version})']]

fosslight_dependency/package_manager/Pypi.py

@@ -75,10 +75,10 @@ class Pypi(PackageManager):
         install_cmd_list = []
         for manifest_file in manifest_files:
             if os.path.exists(manifest_file):
-                if manifest_file == 'setup.py':
-                    install_cmd_list.append("pip install .")
-                elif manifest_file == 'requirements.txt':
+                if manifest_file == 'requirements.txt':
                     install_cmd_list.append("pip install -r requirements.txt")
+                else:
+                    install_cmd_list.append("pip install .")
             else:
                 manifest_files.remove(manifest_file)
                 self.set_manifest_file(manifest_files)
@@ -237,7 +237,7 @@ class Pypi(PackageManager):
             install_deptree_command = f"pip install {pipdeptree}"
             command_list.append(install_deptree_command)
             uninstall_deptree_command = f"pip uninstall -y {pipdeptree}"
-        pipdeptree_command = f"{pipdeptree} --local-only --json-tree -e pipdeptree > {self.tmp_deptree_file}"
+        pipdeptree_command = f"{pipdeptree} --json-tree -e 'pipdeptree,pip,wheel,setuptools' > {self.tmp_deptree_file}"
         command_list.append(pipdeptree_command)
         command_list.append(uninstall_deptree_command)
         command_list.append(deactivate_command)
@@ -247,8 +247,16 @@ class Pypi(PackageManager):
             cmd_ret = subprocess.call(command, shell=True)
             if cmd_ret == 0:
                 self.append_input_package_list_file(self.tmp_file_name)
+                with open(self.tmp_file_name, 'r', encoding='utf-8') as json_f:
+                    json_data = json.load(json_f)
+                    for d in json_data:
+                        self.total_dep_list.append(re.sub(r"[-_.]+", "-", d['Name']).lower())
                 if len(pip_license_pkg_list) != 0:
                     self.append_input_package_list_file(self.tmp_pip_license_info_file_name)
+                    with open(self.tmp_pip_license_info_file_name, 'r', encoding='utf-8') as json_f:
+                        json_data = json.load(json_f)
+                        for d in json_data:
+                            self.total_dep_list.append(re.sub(r"[-_.]+", "-", d['Name']).lower())
             else:
                 logger.error(f"Failed to run command: {command}")
                 ret = False
@@ -287,7 +295,9 @@ class Pypi(PackageManager):
 
                 comment_list = []
                 deps_list = []
-                if self.direct_dep_list:
+                if oss_init_name == self.package_name:
+                    comment_list.append('root package')
+                elif self.direct_dep and len(self.direct_dep_list) > 0:
                     if f'{oss_init_name}({oss_version})' in self.direct_dep_list:
                         comment_list.append('direct')
                     else:
@@ -312,12 +322,12 @@ class Pypi(PackageManager):
         deps = 'dependencies'
         installed_ver = 'installed_version'
 
-        pkg_name = package[package_name]
+        pkg_name = re.sub(r"[-_.]+", "-", package[package_name]).lower()
         pkg_ver = package[installed_ver]
         dependency_list = package[deps]
         dependencies[f"{pkg_name}({pkg_ver})"] = []
         for dependency in dependency_list:
-            dep_name = dependency[package_name]
+            dep_name = re.sub(r"[-_.]+", "-", dependency[package_name]).lower()
             dep_version = dependency[installed_ver]
             dependencies[f"{pkg_name}({pkg_ver})"].append(f"{dep_name}({dep_version})")
             if dependency[deps] != []:
@@ -332,8 +342,20 @@ class Pypi(PackageManager):
 
         with open(self.tmp_deptree_file, 'r', encoding='utf8') as f:
             json_f = json.load(f)
-            for package in json_f:
-                self.direct_dep_list.append(f"{package['package_name']}({package['installed_version']})")
+            root_package = json_f
+            if ('pyproject.toml' in self.manifest_file_name) or ('setup.py' in self.manifest_file_name):
+                direct_without_system_package = 0
+                for package in root_package:
+                    package_name = re.sub(r"[-_.]+", "-", package['package_name']).lower()
+                    if package_name in self.total_dep_list:
+                        direct_without_system_package += 1
+                if direct_without_system_package == 1:
+                    self.package_name = re.sub(r"[-_.]+", "-", json_f[0]['package_name']).lower()
+                    root_package = json_f[0]['dependencies']
+
+            for package in root_package:
+                package_name = re.sub(r"[-_.]+", "-", package['package_name']).lower()
+                self.direct_dep_list.append(f"{package_name}({package['installed_version']})")
                 if package['dependencies'] == []:
                     continue
                 self.relation_tree = self.get_dependencies(self.relation_tree, package)

{fosslight_dependency-3.13.8.dist-info → fosslight_dependency-3.14.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 3.13.8
+Version: 3.14.0
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics

{fosslight_dependency-3.13.8.dist-info → fosslight_dependency-3.14.0.dist-info}/RECORD

@@ -2,32 +2,32 @@ fosslight_dependency/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 fosslight_dependency/_analyze_dependency.py,sha256=5fJ-eAkGUVsAo0Eks9l40zyWNBm7HxGQMWD2bAbOWa0,3710
 fosslight_dependency/_help.py,sha256=gBZfnYF8e4-WQnKa0z6zwXSRUKoIWtQyHbsvjvEFysE,2708
 fosslight_dependency/_package_manager.py,sha256=BtmwTAPwH38nVMTzaMbewsYYm8xn2spmbJPoIIgYOMQ,12085
-fosslight_dependency/constant.py,sha256=v4NisxQwmnhb3e1hIfAvwDr4i_v0euZWo3wcG7U81KM,935
+fosslight_dependency/constant.py,sha256=vj3YI1e1pesUoSW0wp0t9RFHCNjoKJZ6Fv4P8EAl6hU,953
 fosslight_dependency/run_dependency_scanner.py,sha256=YLCQ_6oI9usfvW0ap4nQDZoornL8LQKpjWyKRnTeY_Y,11275
 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=Up4Fv57kuqddZsD8vy5VRwQW7bNtDbqRatjP8MgzGR8,2849
 fosslight_dependency/package_manager/Carthage.py,sha256=GtJxBq_3cujbZoQC2KFdFQM4cEjcK_j9bsZaxEaZu6s,6075
-fosslight_dependency/package_manager/Cocoapods.py,sha256=vgp3SPcZOwYqGUHVUb5-w93TrQIk7eODhTG6RgqhfCs,8087
+fosslight_dependency/package_manager/Cocoapods.py,sha256=h_W-lknWcqDPDnixSNtJig_h0J-jel6MsIrptUWiTsc,8292
 fosslight_dependency/package_manager/Go.py,sha256=d3U_hRtcPWEYbT_JVHAB3jEUKLO4FodbF8hMEWS4JFM,5866
 fosslight_dependency/package_manager/Gradle.py,sha256=SVWjZM5LIVSaANQlU9W0eoDKKsK9UaG8S7Xz7RoAeYQ,4062
-fosslight_dependency/package_manager/Helm.py,sha256=Ou_PHQ7V0r6qZz4MH-qvsQA5VXO-Eaipxy64y0bbUnI,3504
+fosslight_dependency/package_manager/Helm.py,sha256=ZXgbtwWNgJKRUikdtFycMIwdJPu4J7vPpVvzgNLk03Q,3925
 fosslight_dependency/package_manager/Maven.py,sha256=xlQXpm9Ur0DzWa5P9VesJxm-r-mQZ_hoXYWFu7oD1LA,10157
-fosslight_dependency/package_manager/Npm.py,sha256=NdBpm5XHbyg148OesWRIY8wMeCGmcFZpVvMtnussQ9E,9935
+fosslight_dependency/package_manager/Npm.py,sha256=0NUBSDBYs15H9lxqaLxh7PgxPI7ewyef8BKtVxeQg14,10495
 fosslight_dependency/package_manager/Nuget.py,sha256=CzYO548zetC1YNKskUpG1gSWPGF4QrrQz77VZJ5b3Eo,8866
 fosslight_dependency/package_manager/Pub.py,sha256=zRelrIAeDlLAd8uTUJzYWvLUJeOnzmGPzOx8pcMG55Y,8845
-fosslight_dependency/package_manager/Pypi.py,sha256=ussVudgZ1cE53z0CoFwbAVkn_B1LZBxwIgBE71Chm60,13831
+fosslight_dependency/package_manager/Pypi.py,sha256=kNtLhhhpd0QMgMv86KAXclbHPJbcewSp6UefKljAwUA,15321
 fosslight_dependency/package_manager/Swift.py,sha256=jHWor3dZzunwZt--8rdD42vDq4Z66m9fo5xFnIw5_cQ,6453
 fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.13.8.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-3.13.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-3.13.8.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-3.13.8.dist-info/METADATA,sha256=h_I3I9MuC6bWWwOoETmJTIF1DwITDGNdEXFIVBfvhwc,4603
-fosslight_dependency-3.13.8.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-3.13.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-fosslight_dependency-3.13.8.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
-fosslight_dependency-3.13.8.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-3.13.8.dist-info/RECORD,,
+fosslight_dependency-3.14.0.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-3.14.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-3.14.0.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-3.14.0.dist-info/METADATA,sha256=jC9CvSTt5IrvxKogfUnTNqk3DXd-OSIMgQyfY-RYjiA,4603
+fosslight_dependency-3.14.0.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-3.14.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+fosslight_dependency-3.14.0.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
+fosslight_dependency-3.14.0.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-3.14.0.dist-info/RECORD,,