Merge pull request #47 from fosslight/develop

Fix the gradle license parsing error

Author: dd-jy

src/fosslight_dependency/_help.py

@@ -7,30 +7,34 @@
 _HELP_MESSAGE_DEPENDENCY = """
     Usage: fosslight_dependency [option1] <arg1> [option2] <arg2>...
 
-    FOSSLight Dependency utilizes the open source software for analyzing each package manager dependencies.
-    We choose the open source software for each package manager that shows not only the direct dependencies
-    but also the transitive dependencies including the information of dependencies such as oss name, oss version and license name.
-
-    Each package manager uses the results of the following software:
-        NPM : NPM License Checker
-        Pypi : Pip-licenses
-        Gradle : License Gradle Plugin
-        Maven : License-maven-plugin
-        Pub : Flutter_oss_licenses
-        Android : android-dependency-scanning
+    FOSSLight Dependency Scanner is the tool that supports the analysis of dependencies for multiple package managers.
+    It detects the manifest file of package managers automatically and analyzes the dependencies with using open source tools.
+    Then, it generates the report file that contains OSS information of dependencies.
+
+    Currently, it supports the following package managers:
+        Gradle (Java)
+        Maven (Java)
+        NPM (Node.js)
+        PIP (Python)
+        Pub (Dart with flutter)
+        Cocoapods (Swift/Obj-C)
+        Swift (Swift)
 
     Options:
         Optional
             -h\t\t\t\t    Print help message.
             -v\t\t\t\t    Print the version of the script.
-            -m <package_manager>\t    Enter the package manager(npm, maven, gradle, pip, pub, cocoapods, android).
+            -m <package_manager>\t    Enter the package manager(npm, maven, gradle, pip, pub, cocoapods, android, swift).
             -p <input_path>\t\t    Enter the path where the script will be run.
             -o <output_path>\t\t    Enter the path where the result file will be generated.
 
         Required only for pypi
             -a <activate_cmd>\t\t    Virtual environment activate command(ex, 'conda activate (venv name)')
             -d <deactivate_cmd>\t\t    Virtual environment deactivate command(ex, 'conda deactivate')
 
+        Required only for swift
+            -t <token>\t\t      Enter the github personal access token.
+
         Optional only for gradle, maven
             -c <dir_name>\t\t    Enter the customized build output directory name
                                     \t\t-Default name : 'build' for gradle, 'target' for maven

src/fosslight_dependency/analyze_dependency.py

@@ -761,9 +761,13 @@ def parse_and_generate_output_gradle(input_fp):
         oss_version = version_refine(oss_ini_version)
 
         license_names = []
-        for licenses in d['licenses']:
-            license_names.append(licenses['name'].replace(",", ""))
-        license_name = ', '.join(license_names)
+        try:
+            for licenses in d['licenses']:
+                if licenses['name'] != '':
+                    license_names.append(licenses['name'].replace(",", ""))
+            license_name = ', '.join(license_names)
+        except Exception:
+            logger.info("Cannot find the license name")
 
         if used_filename == "true" or group_id == "":
             dn_loc = 'Unknown'