fosslight-dependency 4.1.23__py3-none-any.whl → 4.1.25__py3-none-any.whl

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/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/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/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.dist-info → fosslight_dependency-4.1.25.dist-info}/METADATA

@@ -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.dist-info → fosslight_dependency-4.1.25.dist-info}/RECORD

@@ -1,21 +1,21 @@
 fosslight_dependency/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fosslight_dependency/_analyze_dependency.py,sha256=TX86cl7BF3_kCsAQY459X9sqGqP0xbJI7hqnqe7IbnU,5598
 fosslight_dependency/_graph_convertor.py,sha256=D8GwmJfuj9Wg3_DeKRPLGGdyHSLcoU2Q0VzKQbkJG4g,2267
-fosslight_dependency/_help.py,sha256=npxm927ZnlEoXKTwhtVyDRygq7ur7sKmn4xtg2vh86I,3624
+fosslight_dependency/_help.py,sha256=KE4u-H2oZETohNZAHh2CY5GoGgUsUSf6CpHNonxgz5A,3671
 fosslight_dependency/_package_manager.py,sha256=mN1ukEmZkm6COhxWm-mVfhCZkHppfFgXyXzBT1x02Sw,15016
 fosslight_dependency/constant.py,sha256=0Jr0D5T9S3AuLTEgepiqcKvW4nIJeqotz1lt_YDwbGU,1263
 fosslight_dependency/dependency_item.py,sha256=wNLWcsNycf3HQ5Pib2WrMeo2dn0eHCRg20NLcL95Qew,3345
 fosslight_dependency/run_dependency_scanner.py,sha256=4uocLr5HY2r9ouLI0NGLTI8TE-5g3aQlA9eaP7cqBHk,21338
 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=0UZFvbLxDIreerK4fR316YPyhUpPliV_kfZulrxkUyo,3218
+fosslight_dependency/package_manager/Android.py,sha256=SgQyVxEYvAcCN3EgP9p4QOQZpLIGDahXRm8ntgoCM3c,3666
 fosslight_dependency/package_manager/Cargo.py,sha256=cvAVtKeZSePFU1yRwYkfyZaxH_6D7Q_AnwLqQPHjOQE,5966
 fosslight_dependency/package_manager/Carthage.py,sha256=VU506KafUiHBrr_62iOOXNI1fDOreOQgcC2EWM5PpQo,6122
 fosslight_dependency/package_manager/Cocoapods.py,sha256=k_URV1ekMOU8l_y9_KIp_luu96ZGOl1xLIkH737VREA,8524
 fosslight_dependency/package_manager/Go.py,sha256=eEWvPoE3Jd0lMJAxWMNdFcoi21fJF0EwtRbjBDHF8KQ,7309
-fosslight_dependency/package_manager/Gradle.py,sha256=IYmj9q3XiE_DPKdtll6lyRr98lFuyKWW2qz57X26Fn0,4359
+fosslight_dependency/package_manager/Gradle.py,sha256=zTMvospDpfabl2DRk1jW316lW9BJfGtf05TBcna6E8E,4640
 fosslight_dependency/package_manager/Helm.py,sha256=ucx2Y0tWX37UHIzIGaRyTe7uQ2vlu2nUuO09hOMq9ZU,4223
-fosslight_dependency/package_manager/Maven.py,sha256=ps6kxpB_aWMwjoNWFnXxetxn_y7iGDUz4NcNoxMmDNA,10709
+fosslight_dependency/package_manager/Maven.py,sha256=h-JkVVT_hNNBM26I677kl6RaLUwAoTB0eGncCo-Qp4k,10980
 fosslight_dependency/package_manager/Npm.py,sha256=cPKo3TewAPN8IQUUFlJZ7nc202_GnpMzGMl4gIF4St8,10982
 fosslight_dependency/package_manager/Nuget.py,sha256=u4w084Qozk4nrVdT4o_nDiT8v4URIlXaOrDh11Hu1Bw,8885
 fosslight_dependency/package_manager/Pnpm.py,sha256=LDKooFGQHui_Q5U7XqSJ8KcCPiLVndXf5oGKTJExh5w,7056
@@ -25,12 +25,12 @@ fosslight_dependency/package_manager/Swift.py,sha256=8fdbdAXTNlp2NDoSqQXm48JGAg9
 fosslight_dependency/package_manager/Unity.py,sha256=n1006GZ6Qrk8wAdO6wla1Q-JD7Evin7REVj-HDeTARc,5142
 fosslight_dependency/package_manager/Yarn.py,sha256=8K2bTImdvPtuDT_Tz1StnBnx6DjoHWV1Wzb0WlhBRhw,9586
 fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_dependency-4.1.23.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.23.dist-info/licenses/LICENSES/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.23.dist-info/licenses/LICENSES/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-4.1.23.dist-info/licenses/LICENSES/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-4.1.23.dist-info/METADATA,sha256=WPwzLjLGc28Co_4GfoSy5Dpffn-ey65GO5ntktS1EJM,5555
-fosslight_dependency-4.1.23.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-fosslight_dependency-4.1.23.dist-info/entry_points.txt,sha256=AeU-9Bl8al8Sa-XvhitGHdT3ZTPIrlhqADcp7s5OLF8,90
-fosslight_dependency-4.1.23.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-4.1.23.dist-info/RECORD,,
+fosslight_dependency-4.1.25.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.25.dist-info/licenses/LICENSES/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.25.dist-info/licenses/LICENSES/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-4.1.25.dist-info/licenses/LICENSES/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-4.1.25.dist-info/METADATA,sha256=y76t53xjKXM9g869hEAA-t5Rq5jRDrPjy8lLqNFp5sI,5555
+fosslight_dependency-4.1.25.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+fosslight_dependency-4.1.25.dist-info/entry_points.txt,sha256=AeU-9Bl8al8Sa-XvhitGHdT3ZTPIrlhqADcp7s5OLF8,90
+fosslight_dependency-4.1.25.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-4.1.25.dist-info/RECORD,,