fosslight-dependency 4.1.16__tar.gz → 4.1.18__tar.gz

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/PKG-INFO

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

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/requirements.txt

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

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/setup.py

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

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/src/fosslight_dependency/_help.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2021 LG Electronics Inc.
 # SPDX-License-Identifier: Apache-2.0
-from fosslight_util.help import PrintHelpMsg
+from fosslight_util.help import PrintHelpMsg, print_package_version
 
 _HELP_MESSAGE_DEPENDENCY = """
     Usage: fosslight_dependency [option1] <arg1> [option2] <arg2>...
@@ -64,6 +64,10 @@ _HELP_MESSAGE_DEPENDENCY = """
         """
 
 
+def print_version(pkg_name: str) -> None:
+    print_package_version(pkg_name, "FOSSLight Dependency Scanner Version:")
+
+
 def print_help_msg():
     helpMsg = PrintHelpMsg(_HELP_MESSAGE_DEPENDENCY)
     helpMsg.print_help_msg(True)

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/src/fosslight_dependency/package_manager/Cargo.py

@@ -92,11 +92,12 @@ class Cargo(PackageManager):
 
                 oss_item.name = f"{self.package_manager_name}:{oss_origin_name}"
                 oss_item.version = json_data['version']
-                oss_item.homepage = f"{self.dn_url}{oss_origin_name}"
-                oss_item.download_location = json_data['repository']
-                if oss_item.download_location is None:
-                    oss_item.download_location = oss_item.homepage
-                dep_item.purl = get_url_to_purl(oss_item.homepage, self.package_manager_name, oss_origin_name, oss_item.version)
+                dn_without_ver = f"{self.dn_url}{oss_origin_name}"
+                oss_item.homepage = json_data['repository']
+                if oss_item.homepage is None:
+                    oss_item.homepage = dn_without_ver
+                dep_item.purl = get_url_to_purl(dn_without_ver, self.package_manager_name, oss_origin_name, oss_item.version)
+                oss_item.download_location = f'{dn_without_ver}/{oss_item.version}'
                 purl_dict[f'{oss_origin_name}({oss_item.version})'] = dep_item.purl
                 if json_data['license'] is not None:
                     oss_item.license = json_data['license']

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/src/fosslight_dependency/run_dependency_scanner.py

@@ -7,7 +7,6 @@ import os
 import platform
 import sys
 import argparse
-import pkg_resources
 import warnings
 from datetime import datetime
 import logging
@@ -16,7 +15,7 @@ import fosslight_dependency.constant as const
 from collections import defaultdict
 from fosslight_util.set_log import init_log
 import fosslight_util.constant as constant
-from fosslight_dependency._help import print_help_msg
+from fosslight_dependency._help import print_version, print_help_msg
 from fosslight_dependency._analyze_dependency import analyze_dependency
 from fosslight_util.output_format import check_output_formats_v2, write_output_file
 from fosslight_util.oss_item import ScannerItem
@@ -361,9 +360,7 @@ def main():
         print_help_msg()
 
     if args.version:  # -v option
-        cur_version = pkg_resources.get_distribution(_PKG_NAME).version
-        print(f"FOSSLight Dependency Scanner Version: {cur_version}")
-        sys.exit(0)
+        print_version(_PKG_NAME)
 
     if args.manager:  # -m option
         package_manager = ''.join(args.manager)

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/src/fosslight_dependency.egg-info/PKG-INFO

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

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/src/fosslight_dependency.egg-info/requires.txt

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

{fosslight_dependency-4.1.16 → fosslight_dependency-4.1.18}/src/fosslight_dependency/_package_manager.py

@@ -277,6 +277,8 @@ def get_url_to_purl(url, pkg_manager, oss_name='', oss_version=''):
                         purl = f'{purl}#{match.group(2)}'
                 elif pkg_manager == 'go':
                     purl = f'{purl_prefix}lang/{match.group(1)}@{match.group(2)}'
+                elif pkg_manager == 'cargo':
+                    purl = f'{purl_prefix}/{oss_name}@{oss_version}'
             else:
                 if pkg_manager == 'swift':
                     if oss_version:
@@ -286,8 +288,6 @@ def get_url_to_purl(url, pkg_manager, oss_name='', oss_version=''):
                 elif pkg_manager == 'carthage':
                     if oss_version:
                         purl = f'{purl}@{oss_version}'
-                elif pkg_manager == 'cargo':
-                    purl = f'{purl_prefix}/{oss_name}@{oss_version}'
         except Exception:
             logger.debug('Fail to get purl. So use the link purl({purl}).')
     return purl