Merge pull request #60 from fosslight/develop

Return sheet_list and change sheet name to SRC_FL_Dependency

Author: soimkim

requirements-dev.txt

@@ -1,3 +1,4 @@
+flake8==3.9.2
 pyinstaller
 tox
 tox-wheel

requirements.txt

@@ -4,5 +4,5 @@ lxml
 virtualenv
 pyyaml
 lastversion
-fosslight_util>=1.1.0
-PyGithub
+fosslight_util>=1.3.3
+PyGithub

src/fosslight_dependency/run_dependency_scanner.py

@@ -22,7 +22,7 @@
 _PKG_NAME = "fosslight_dependency"
 logger = logging.getLogger(constant.LOGGER_NAME)
 warnings.filterwarnings("ignore", category=FutureWarning)
-_sheet_name = "SRC"
+_sheet_name = "SRC_FL_Dependency"
 _fosslight_report = "FOSSLight-Report"
 _xlsx_extension = '.xlsx'
 _csv_extension = '.csv'
@@ -60,6 +60,8 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
 
     ret = True
     output_filename = ''
+    sheet_list = {}
+    sheet_list[_sheet_name] = []
 
     if output_dir:
         dirname = os.path.dirname(output_dir)
@@ -95,7 +97,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
         logger.error("You entered the wrong output path(" + output_dir + ") to generate output file.")
         logger.error("Please enter the output path that already exists or can be created with the '-o' option.")
         logger.error(" > err msg : " + err_msg)
-        return False
+        return False, sheet_list
 
     autodetect = True
     if package_manager:
@@ -106,7 +108,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
             logger.error("You entered the unsupported package manager(" + package_manager + ").")
             logger.error("Please enter the supported package manager({0}) with '-m' option."
                          .format(", ".join(support_packagemanager)))
-            return False
+            return False, sheet_list
 
     if input_dir:
         if os.path.isdir(input_dir):
@@ -115,7 +117,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
         else:
             logger.error("You entered the wrong input path(" + input_dir + ") to run the script.")
             logger.error("Please enter the existed input path with '-p' option.")
-            return False
+            return False, sheet_list
     else:
         input_dir = os.getcwd()
         os.chdir(input_dir)
@@ -130,13 +132,10 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
         finally:
             if not ret:
                 logger.error("Failed to detect package manager automatically.")
-                return False
+                return False, sheet_list
     else:
         found_package_manager.append(package_manager)
 
-    sheet_list = {}
-    sheet_list[_sheet_name] = []
-
     for pm in found_package_manager:
         ret, package_sheet_list = analyze_dependency(pm, input_dir, output_dir, pip_activate_cmd, pip_deactivate_cmd,
                                                      output_custom_dir, app_name, github_token)
@@ -163,7 +162,7 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir='', pip_
         logger.error("Analyzing result is empty.")
 
     logger.warning("### FINISH ###")
-    return ret
+    return ret, sheet_list
 
 
 def main():