fosslight-dependency 4.1.20__tar.gz → 4.1.21__tar.gz

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_dependency
-Version: 4.1.20
+Version: 4.1.21
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -51,7 +51,7 @@ In this user guide, you can see how to install the FOSSLight Dependency Scanner
 </thead>
 <tbody>
   <tr>
-    <td rowspan="2">Javascript</td>
+    <td rowspan="3">Javascript</td>
     <td>Npm</td>
     <td>package.json</td>
     <td>O</td>
@@ -64,6 +64,13 @@ In this user guide, you can see how to install the FOSSLight Dependency Scanner
     <td>O</td>
     <td>O</td>
     <td>O</td>
+  </tr>
+    <tr>
+    <td>Yarn</td>
+    <td>package.json</td>
+    <td>O</td>
+    <td>O</td>
+    <td>O</td>
   </tr>
   <tr>
     <td rowspan="2">Java</td>

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/README.md

@@ -31,7 +31,7 @@ In this user guide, you can see how to install the FOSSLight Dependency Scanner
 </thead>
 <tbody>
   <tr>
-    <td rowspan="2">Javascript</td>
+    <td rowspan="3">Javascript</td>
     <td>Npm</td>
     <td>package.json</td>
     <td>O</td>
@@ -44,6 +44,13 @@ In this user guide, you can see how to install the FOSSLight Dependency Scanner
     <td>O</td>
     <td>O</td>
     <td>O</td>
+  </tr>
+    <tr>
+    <td>Yarn</td>
+    <td>package.json</td>
+    <td>O</td>
+    <td>O</td>
+    <td>O</td>
   </tr>
   <tr>
     <td rowspan="2">Java</td>

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/setup.py

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

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/src/fosslight_dependency/_analyze_dependency.py

@@ -35,7 +35,7 @@ def analyze_dependency(package_manager_name, input_dir, output_dir, pip_activate
 
     if package_manager_name == const.PYPI:
         package_manager = Pypi(input_dir, output_dir, pip_activate_cmd, pip_deactivate_cmd)
-    elif package_manager_name == const.NPM:
+    elif package_manager_name == const.NPM or package_manager_name == const.YARN:
         package_manager = Npm(input_dir, output_dir)
     elif package_manager_name == const.MAVEN:
         package_manager = Maven(input_dir, output_dir, output_custom_dir)

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/src/fosslight_dependency/_help.py

@@ -16,6 +16,7 @@ _HELP_MESSAGE_DEPENDENCY = """
         Maven (Java)
         NPM (Node.js)
         PNPM (Node.js)
+        Yarn (Node.js)
         PIP (Python)
         Pub (Dart with flutter)
         Cocoapods (Swift/Obj-C)
@@ -33,7 +34,7 @@ _HELP_MESSAGE_DEPENDENCY = """
             -v\t\t\t\t    Print the version of the script.
             -m <package_manager>\t    Enter the package manager.
                                         \t(npm, maven, gradle, pypi, pub, cocoapods, android, swift, carthage,
-                                        \t go, nuget, helm, unity, cargo, pnpm)
+                                        \t go, nuget, helm, unity, cargo, pnpm, yarn)
             -p <input_path>\t\t    Enter the path where the script will be run.
             -e <exclude_path>\t\t    Enter the path where the analysis will not be performed.
             -o <output_path>\t\t    Output path

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/src/fosslight_dependency/constant.py

@@ -25,6 +25,7 @@ HELM = 'helm'
 UNITY = 'unity'
 CARGO = 'cargo'
 PNPM = 'pnpm'
+YARN = 'yarn'
 
 # Supported package name and manifest file
 SUPPORT_PACKAE = {

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/src/fosslight_dependency/package_manager/Npm.py

@@ -53,8 +53,14 @@ class Npm(PackageManager):
             self.flag_tmp_node_modules = True
             cmd_ret = subprocess.call(npm_install_cmd, shell=True)
             if cmd_ret != 0:
-                logger.error(f"{npm_install_cmd} returns an error")
-                return False
+                logger.warning(f"{npm_install_cmd} returns an error. Trying yarn as fallback...")
+                yarn_install_cmd = 'yarn install --production --ignore-scripts'
+                cmd_ret = subprocess.call(yarn_install_cmd, shell=True)
+                if cmd_ret != 0:
+                    logger.error(f"Both {npm_install_cmd} and {yarn_install_cmd} failed")
+                    return False
+                else:
+                    logger.info(f"Successfully executed {yarn_install_cmd}")
 
         # customized json file for obtaining specific items with license-checker
         self.make_custom_json(self.tmp_custom_json)

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/src/fosslight_dependency/run_dependency_scanner.py

@@ -207,6 +207,9 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
     autodetect = True
     found_package_manager = {}
     if package_manager:
+        scan_item.set_cover_comment(f"Manual detect mode (-m {package_manager})")
+        if package_manager == const.YARN:
+            package_manager = const.NPM
         autodetect = False
         support_packagemanager = list(const.SUPPORT_PACKAE.keys())
 
@@ -221,7 +224,6 @@ def run_dependency_scanner(package_manager='', input_dir='', output_dir_file='',
             manifest_file_name.extend(value)
         else:
             manifest_file_name.append(value)
-        scan_item.set_cover_comment(f"Manual detect mode (-m {package_manager})")
     else:
         manifest_file_name = []
 

{fosslight_dependency-4.1.20 → fosslight_dependency-4.1.21}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 4.1.20
+Version: 4.1.21
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Download-URL: https://github.com/fosslight/fosslight_dependency_scanner
@@ -51,7 +51,7 @@ In this user guide, you can see how to install the FOSSLight Dependency Scanner
 </thead>
 <tbody>
   <tr>
-    <td rowspan="2">Javascript</td>
+    <td rowspan="3">Javascript</td>
     <td>Npm</td>
     <td>package.json</td>
     <td>O</td>
@@ -64,6 +64,13 @@ In this user guide, you can see how to install the FOSSLight Dependency Scanner
     <td>O</td>
     <td>O</td>
     <td>O</td>
+  </tr>
+    <tr>
+    <td>Yarn</td>
+    <td>package.json</td>
+    <td>O</td>
+    <td>O</td>
+    <td>O</td>
   </tr>
   <tr>
     <td rowspan="2">Java</td>