fosslight-dependency 4.1.14__py3-none-any.whl → 4.1.15__py3-none-any.whl

fosslight_dependency/constant.py

@@ -45,5 +45,11 @@ SUPPORT_PACKAE = {
     CARGO: 'Cargo.toml'
 }
 
+SUGGESTED_PACKAGE = {
+    'Podfile': COCOAPODS,
+    'Package.swift': SWIFT,
+    'Cartfile': CARTHAGE
+}
+
 # default android app name
 default_app_name = 'app'

fosslight_dependency/run_dependency_scanner.py

@@ -61,6 +61,7 @@ def find_package_manager(input_dir, abs_path_to_exclude=[], manifest_file_name=[
                 manifest_file_name.append(value)
 
     found_manifest_file = []
+    suggested_files = []
     for parent, dirs, files in os.walk(input_dir):
         if len(files) < 1:
             continue
@@ -76,6 +77,8 @@ def find_package_manager(input_dir, abs_path_to_exclude=[], manifest_file_name=[
                 continue
             if file in manifest_file_name:
                 found_manifest_file.append(file)
+            if file in const.SUGGESTED_PACKAGE.keys():
+                suggested_files.append(os.path.join(parent, file))
         for dir in dirs:
             for manifest_f in manifest_file_name:
                 manifest_l = manifest_f.split(os.path.sep)
@@ -111,7 +114,7 @@ def find_package_manager(input_dir, abs_path_to_exclude=[], manifest_file_name=[
         ret = False
         logger.info("Cannot find the manifest file.")
 
-    return ret, found_package_manager, input_dir
+    return ret, found_package_manager, input_dir, suggested_files
 
 
 def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='', pip_activate_cmd='',
@@ -213,7 +216,9 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
         manifest_file_name = []
 
     try:
-        ret, found_package_manager, input_dir = find_package_manager(input_dir, abs_path_to_exclude, manifest_file_name)
+        ret, found_package_manager, input_dir, suggested_files = find_package_manager(input_dir,
+                                                                                      abs_path_to_exclude,
+                                                                                      manifest_file_name)
         if ret:
             os.chdir(input_dir)
     except Exception as e:
@@ -226,9 +231,18 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
                 logger.info('Try to analyze dependency without manifest file. (Manual mode)')
                 found_package_manager[package_manager] = []
             else:
-                logger.error("Terminated: package manager could not be found.")
                 ret = False
-                return False, scan_item
+                if suggested_files:
+                    suggested_files_str = []
+                    suggested_files_str.append("Please check the following files and try again:")
+                    for f in suggested_files:
+                        pm = const.SUGGESTED_PACKAGE[f.split(os.path.sep)[-1]]
+                        suggested_files_str.append(f"\t\t\t{f} ({pm}) detected, but {const.SUPPORT_PACKAE[pm]} missing.")
+
+                    suggested_files_str.append("\t\t\tRefer: https://fosslight.org/fosslight-guide-en/scanner/3_dependency.html.")
+                    scan_item.set_cover_comment('\n'.join(suggested_files_str))
+                else:
+                    scan_item.set_cover_comment("No Package manager detected.")
 
     pass_key = 'PASS'
     success_pm = []
@@ -264,9 +278,6 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
             info_msg = 'Check log file(fosslight_log*.txt) ' \
                        'and https://fosslight.org/fosslight-guide-en/scanner/3_dependency.html#-prerequisite.'
             scan_item.set_cover_comment(f"Analysis failed Package manager: {', '.join(fail_pm)} ({info_msg})")
-    else:
-        if autodetect:
-            scan_item.set_cover_comment("No Package manager detected.")
 
     if ret and graph_path:
         graph_path = os.path.abspath(graph_path)
@@ -300,12 +311,14 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
             else:
                 logger.warning(f"{err_msg}")
             for i in scan_item.get_cover_comment():
-                logger.info(i)
+                if ret:
+                    logger.info(i)
+                else:
+                    logger.warning(i)
         else:
             ret = False
             logger.error(f"Fail to generate result file. msg:({err_msg})")
 
-    logger.warning("### FINISH ###")
     return ret, scan_item
 
 

{fosslight_dependency-4.1.14.dist-info → fosslight_dependency-4.1.15.dist-info}/METADATA

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

{fosslight_dependency-4.1.14.dist-info → fosslight_dependency-4.1.15.dist-info}/RECORD

@@ -3,9 +3,9 @@ fosslight_dependency/_analyze_dependency.py,sha256=AKwKPEjA5x4p3oCWMJugQjd4zX9WK
 fosslight_dependency/_graph_convertor.py,sha256=D8GwmJfuj9Wg3_DeKRPLGGdyHSLcoU2Q0VzKQbkJG4g,2267
 fosslight_dependency/_help.py,sha256=S5tt26ccMLp-BEgWoXWyPxd8JzLtwZ5bIc-A2UTeM4k,3365
 fosslight_dependency/_package_manager.py,sha256=e2elnBIxVjuAaFGVx1y9VUUcUSMrd8t9RKj4lCMXinY,14916
-fosslight_dependency/constant.py,sha256=nGa2Q_IWMojHEKkwdvoFvZrsqZZ4jMCk9h3M78j_lMc,1122
+fosslight_dependency/constant.py,sha256=5upuTFSTmmQwqv2u-MRcEG4lxaIZAIi_c-rAPhOrsfM,1226
 fosslight_dependency/dependency_item.py,sha256=wNLWcsNycf3HQ5Pib2WrMeo2dn0eHCRg20NLcL95Qew,3345
-fosslight_dependency/run_dependency_scanner.py,sha256=rCHwKW2NsOSRyRxsFmUunKruK9vN24O2ucHghJYgey4,17600
+fosslight_dependency/run_dependency_scanner.py,sha256=k1UnI3tFjF1ZRG3TAceEvJnrpy2oYXzgtXlcl_DBmKo,18519
 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
@@ -24,12 +24,12 @@ fosslight_dependency/package_manager/Pypi.py,sha256=LPeI7amFXKxhXMSRwiVaKfhHL_D7
 fosslight_dependency/package_manager/Swift.py,sha256=8fdbdAXTNlp2NDoSqQXm48JGAg9UhxA91M1-NhHkT40,6752
 fosslight_dependency/package_manager/Unity.py,sha256=n1006GZ6Qrk8wAdO6wla1Q-JD7Evin7REVj-HDeTARc,5142
 fosslight_dependency/package_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fosslight_dependency-4.1.14.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.14.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-fosslight_dependency-4.1.14.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
-fosslight_dependency-4.1.14.dist-info/METADATA,sha256=SsbCQHD2M6ZcanS4HwKkC1ELBncP6Ds1jCxZvF19j1g,5103
-fosslight_dependency-4.1.14.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
-fosslight_dependency-4.1.14.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-fosslight_dependency-4.1.14.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
-fosslight_dependency-4.1.14.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
-fosslight_dependency-4.1.14.dist-info/RECORD,,
+fosslight_dependency-4.1.15.dist-info/Apache-2.0.txt,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.15.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+fosslight_dependency-4.1.15.dist-info/LicenseRef-3rd_party_licenses.txt,sha256=EcsFt7aE1rp3OXAdJgmXayfOZdpRdBMcmRnyoqWMCsw,95687
+fosslight_dependency-4.1.15.dist-info/METADATA,sha256=CxzxHgXhk1agjJoDriMPn-aX9Z8ekeKwtf3uL-z8HDU,5103
+fosslight_dependency-4.1.15.dist-info/MIT.txt,sha256=9cx4CbArgByWvkoEZNqpzbpJgA9TUe2D62rMocQpgfs,1082
+fosslight_dependency-4.1.15.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+fosslight_dependency-4.1.15.dist-info/entry_points.txt,sha256=e1QZbnCrQvfbwe9L6PxXnkRZMhl-PSo0QyUes0dGjU8,91
+fosslight_dependency-4.1.15.dist-info/top_level.txt,sha256=Jc0V7VcVCH0TEM8ksb8dwroTYz4AmRaQnlr3FB71Hcs,21
+fosslight_dependency-4.1.15.dist-info/RECORD,,