Merge pull request #63 from fosslight/develop

Add setup.py installation for pypi

Author: dd-jy

README.md

@@ -39,7 +39,7 @@ Because we utilizes the different open source software to analyze the dependenci
 ## 📖 User Guide
 
 We describe the user guide in the FOSSLight guide page.
-Please see the [**User Guide**](https://fosslight.org/fosslight-guide-en/scanner/2_dependency.html) for more information on how to install and run it.
+Please see the [**User Guide**](https://fosslight.org/fosslight-guide-en/scanner/3_dependency.html) for more information on how to install and run it.
 
 ## 👏 Contributing Guide
 

src/fosslight_dependency/_analyze_dependency.py

@@ -21,7 +21,7 @@
 
 
 def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate_cmd='', pip_deactivate_cmd='',
-                       output_custom_dir='', app_name=const.default_app_name, github_token=''):
+                       output_custom_dir='', app_name=const.default_app_name, github_token='', manifest_file_name=[]):
     ret = True
     package_sheet_list = []
 
@@ -48,6 +48,8 @@ def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate
         ret = False
         return ret, package_sheet_list
 
+    if manifest_file_name:
+        package_manager.set_manifest_file(manifest_file_name)
     ret = package_manager.run_plugin()
     if ret:
         for f_name in package_manager.input_package_list_file:

src/fosslight_dependency/_package_manager.py

@@ -34,6 +34,7 @@ def __init__(self, package_manager_name, dn_url, input_dir, output_dir):
         self.input_dir = input_dir
         self.output_dir = output_dir
         self.dn_url = dn_url
+        self.manifest_file_name = []
 
         self.platform = platform.system()
         self.license_scanner_bin = check_license_scanner(self.platform)
@@ -45,6 +46,9 @@ def run_plugin(self):
     def append_input_package_list_file(self, input_package_file):
         self.input_package_list_file.append(input_package_file)
 
+    def set_manifest_file(self, manifest_file_name):
+        self.manifest_file_name = manifest_file_name
+
 
 def version_refine(oss_version):
     version_cmp = oss_version.upper()

src/fosslight_dependency/constant.py

@@ -21,7 +21,7 @@
 
 # Supported package name and manifest file
 SUPPORT_PACKAE = {
-    PYPI: 'requirements.txt',
+    PYPI: ['requirements.txt', 'setup.py'],
     NPM: 'package.json',
     MAVEN: 'pom.xml',
     GRADLE: 'build.gradle',

src/fosslight_dependency/package_manager/Pypi.py

@@ -8,6 +8,7 @@
 import subprocess
 import json
 import shutil
+import copy
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager
@@ -62,11 +63,21 @@ def run_plugin(self):
     def create_virtualenv(self):
         ret = True
 
-        manifest_file = const.SUPPORT_PACKAE.get(self.package_manager_name)
-        if not os.path.isfile(manifest_file):
-            logger.error('Cannot create virtualenv becuase it cannot find the ' + manifest_file)
-            logger.error("Please run with '-a' and '-d' option.")
-            return False
+        manifest_files = self.manifest_file_name
+        if not manifest_files:
+            manifest_files = copy.deepcopy(const.SUPPORT_PACKAE[self.package_manager_name])
+            self.set_manifest_file(manifest_files)
+
+        install_cmd_list = []
+        for manifest_file in manifest_files:
+            if os.path.exists(manifest_file):
+                if manifest_file == 'setup.py':
+                    install_cmd_list.append("pip install .")
+                elif manifest_file == 'requirements.txt':
+                    install_cmd_list.append("pip install -r requirements.txt")
+            else:
+                manifest_files.remove(manifest_file)
+                self.set_manifest_file(manifest_files)
 
         venv_path = os.path.join(self.input_dir, self.venv_tmp_dir)
 
@@ -79,7 +90,15 @@ def create_virtualenv(self):
             activate_cmd = ". " + os.path.join(venv_path, "bin", "activate")
             cmd_separator = ";"
 
-        install_cmd = "pip install -r requirements.txt"
+        if install_cmd_list:
+            install_cmd = cmd_separator.join(install_cmd_list)
+        else:
+            logger.error(const.SUPPORT_PACKAE[self.package_manager_name])
+            logger.error('Cannot create virtualenv becuase it cannot find: '
+                         + ', '.join(const.SUPPORT_PACKAE[self.package_manager_name]))
+            logger.error("Please run with '-a' and '-d' option.")
+            return False
+
         deactivate_cmd = "deactivate"
 
         self.set_pip_activate_cmd(activate_cmd)
@@ -234,7 +253,7 @@ def parse_oss_information(self, f_name):
                 if license_name_with_license_scanner != "":
                     license_name = license_name_with_license_scanner
 
-                sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name),
+                sheet_list.append([', '.join(self.manifest_file_name),
                                    oss_name, oss_version,
                                    license_name, dn_loc, homepage, '', '', ''])
 

src/fosslight_dependency/run_dependency_scanner.py

@@ -11,6 +11,8 @@
 from datetime import datetime
 import logging
 import fosslight_dependency.constant as const
+import traceback
+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
@@ -26,22 +28,35 @@
 
 def find_package_manager():
     ret = True
-    manifest_file_name = list(set(list(const.SUPPORT_PACKAE.values())))
+    manifest_file_name = []
+    for value in const.SUPPORT_PACKAE.values():
+        if isinstance(value, list):
+            manifest_file_name.extend(value)
+        else:
+            manifest_file_name.append(value)
 
     found_manifest_file = []
     for f in manifest_file_name:
         if os.path.isfile(f):
             found_manifest_file.append(f)
 
-    found_package_manager = []
+    found_package_manager = defaultdict(list)
     for f_idx in found_manifest_file:
         for key, value in const.SUPPORT_PACKAE.items():
-            if value == f_idx:
-                found_package_manager.append(key)
+            if isinstance(value, list):
+                for v in value:
+                    if f_idx == v:
+                        if key in found_package_manager.keys():
+                            found_package_manager[key].append(f_idx)
+                        else:
+                            found_package_manager[key] = [f_idx]
+            else:
+                if value == f_idx:
+                    found_package_manager[key] = [f_idx]
 
     if len(found_package_manager) >= 1:
         logger.info("Found the manifest file(" + ','.join(found_manifest_file) + ")automatically.")
-        logger.warning("### Set Package Manager = " + ', '.join(found_package_manager))
+        logger.warning("### Set Package Manager = " + ', '.join(found_package_manager.keys()))
     else:
         ret = False
         logger.error("Cannot find the manifest file.")
@@ -105,23 +120,24 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
         input_dir = os.getcwd()
         os.chdir(input_dir)
 
-    found_package_manager = []
+    found_package_manager = {}
     if autodetect:
         try:
             ret, found_package_manager = find_package_manager()
         except Exception as e:
             logger.error(str(e))
+            logger.error(traceback.format_exc())
             ret = False
         finally:
             if not ret:
                 logger.error("Failed to detect package manager automatically.")
                 return False, sheet_list
     else:
-        found_package_manager.append(package_manager)
+        found_package_manager[package_manager] = ''
 
-    for pm in found_package_manager:
+    for pm, manifest_file_name in found_package_manager.items():
         ret, package_sheet_list = analyze_dependency(pm, input_dir, output_path, pip_activate_cmd, pip_deactivate_cmd,
-                                                     output_custom_dir, app_name, github_token)
+                                                     output_custom_dir, app_name, github_token, manifest_file_name)
         if ret:
             sheet_list[_sheet_name].extend(package_sheet_list)