fosslight-dependency 4.1.23__tar.gz → 4.1.25__tar.gz

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_dependency
-Version: 4.1.23
+Version: 4.1.25
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -23,7 +23,7 @@ Requires-Dist: lxml
 Requires-Dist: virtualenv
 Requires-Dist: pyyaml
 Requires-Dist: lastversion
-Requires-Dist: fosslight_util>=2.1.18
+Requires-Dist: fosslight_util>=2.1.30
 Requires-Dist: PyGithub
 Requires-Dist: requirements-parser
 Requires-Dist: defusedxml

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/requirements.txt

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

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/setup.py

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

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/src/fosslight_dependency/_help.py

@@ -3,8 +3,9 @@
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
 from fosslight_util.help import PrintHelpMsg, print_package_version
+from fosslight_util.output_format import SUPPORT_FORMAT
 
-_HELP_MESSAGE_DEPENDENCY = """
+_HELP_MESSAGE_DEPENDENCY = f"""
     Usage: fosslight_dependency [option1] <arg1> [option2] <arg2>...
 
     FOSSLight Dependency Scanner is the tool that supports the analysis of dependencies for multiple package managers.
@@ -39,10 +40,11 @@ _HELP_MESSAGE_DEPENDENCY = """
             -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> [<format> ...]\t    Output formats (excel, csv, opossum, yaml, spdx-tag, spdx-yaml, spdx-json, spdx-xml)
-        \t\t\t\t    Multiple formats can be specified separated by space.
+            -f <format> [<format> ...]\t    Output formats
+            \t\t\t\t    \t({', '.join(SUPPORT_FORMAT)})
+            \t\t\t\t    Multiple formats can be specified separated by space.
             --graph-path <save_path> \t    Enter the path where the graph image will be saved
-            \t\t\t\t\t(ex. /your/directory/path/filename.{pdf, jpg, png}) (recommend pdf extension)
+            \t\t\t\t\t(ex. /your/directory/path/filename.[pdf, jpg, png]) (recommend pdf extension)
             --graph-size <width> <height>   Enter the size of the graph image (The size unit is pixels)
             \t\t\t\t\t--graph-path option is required
             --direct\t\t\t    Print the direct/transitive dependency type in comment.

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/src/fosslight_dependency/package_manager/Android.py

@@ -9,6 +9,7 @@ import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager, get_url_to_purl
 from fosslight_dependency.dependency_item import DependencyItem, change_dependson_to_purl
+from fosslight_util.get_pom_license import get_license_from_pom
 from fosslight_util.oss_item import OssItem
 
 logger = logging.getLogger(constant.LOGGER_NAME)
@@ -55,6 +56,13 @@ class Android(PackageManager):
                         oss_item.download_location, oss_item.homepage = split_str[:7]
                 else:
                     continue
+                if not oss_item.license:
+                    license_names = get_license_from_pom(oss_item.name.split(':')[0],
+                                                         oss_item.name.split(':')[1],
+                                                         oss_item.version)
+                    if license_names:
+                        oss_item.license = license_names
+
                 dep_item.purl = get_url_to_purl(oss_item.download_location, 'maven')
                 purl_dict[f'{oss_item.name}({oss_item.version})'] = dep_item.purl
 

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/src/fosslight_dependency/package_manager/Gradle.py

@@ -11,6 +11,7 @@ import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
 from fosslight_dependency._package_manager import version_refine, get_url_to_purl
 from fosslight_dependency.dependency_item import DependencyItem, change_dependson_to_purl
+from fosslight_util.get_pom_license import get_license_from_pom
 from fosslight_util.oss_item import OssItem
 
 logger = logging.getLogger(constant.LOGGER_NAME)
@@ -69,6 +70,10 @@ class Gradle(PackageManager):
                 oss_item.license = ', '.join(license_names)
             except Exception:
                 logger.info("Cannot find the license name")
+            if not oss_item.license:
+                license_names = get_license_from_pom(group_id, artifact_id, oss_ini_version)
+                if license_names:
+                    oss_item.license = license_names
 
             if used_filename or group_id == "":
                 oss_item.download_location = 'Unknown'

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/src/fosslight_dependency/package_manager/Maven.py

@@ -15,6 +15,7 @@ import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
 from fosslight_dependency._package_manager import version_refine, get_url_to_purl, change_file_mode
 from fosslight_dependency.dependency_item import DependencyItem, change_dependson_to_purl
+from fosslight_util.get_pom_license import get_license_from_pom
 from fosslight_util.oss_item import OssItem
 
 logger = logging.getLogger(constant.LOGGER_NAME)
@@ -246,6 +247,10 @@ class Maven(PackageManager):
                     if key_license.findtext("name") is not None:
                         license_names.append(key_license.findtext("name").replace(",", ""))
                 oss_item.license = ', '.join(license_names)
+            if not oss_item.license:
+                license_names = get_license_from_pom(groupid, artifactid, version)
+                if license_names:
+                    oss_item.license = license_names
 
             dep_key = f"{oss_item.name}({version})"
 

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_dependency
-Version: 4.1.23
+Version: 4.1.25
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -23,7 +23,7 @@ Requires-Dist: lxml
 Requires-Dist: virtualenv
 Requires-Dist: pyyaml
 Requires-Dist: lastversion
-Requires-Dist: fosslight_util>=2.1.18
+Requires-Dist: fosslight_util>=2.1.30
 Requires-Dist: PyGithub
 Requires-Dist: requirements-parser
 Requires-Dist: defusedxml

{fosslight_dependency-4.1.23 → fosslight_dependency-4.1.25}/src/fosslight_dependency.egg-info/requires.txt

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