Merge branch '273255-streaming' into 'main'HEADv3.28.3main

Stream `npm ci` output to log

See merge request gitlab-org/security-products/analyzers/license-finder!16

12 files changed, 20 insertions, 21 deletions

diff --git a/lib/license/finder/ext/bower.rb b/lib/license/finder/ext/bower.rb
index 7013369..52e6a16 100644
--- a/lib/license/finder/ext/bower.rb
+++ b/lib/license/finder/ext/bower.rb
@@ -17,7 +17,7 @@ module LicenseFinder
           '--verbose',
           '--loglevel',
           :debug
-        ], env: default_env)
+        ], env: default_env, capture: false)
       end
     end
 
diff --git a/lib/license/finder/ext/bundler.rb b/lib/license/finder/ext/bundler.rb
index b8c755b..9c9c045 100644
--- a/lib/license/finder/ext/bundler.rb
+++ b/lib/license/finder/ext/bundler.rb
@@ -11,16 +11,15 @@ module LicenseFinder
           shell.execute([
             :gem, :install, gem,
             '--no-document',
-            '--verbose',
             '--no-update-sources',
             '--ignore-dependencies',
             '--no-suggestions',
             '--local'
-          ], env: default_env)
+          ], env: default_env, capture: false)
         end
-        shell.execute([:asdf, :reshim], env: default_env)
-        shell.execute([:bundle, :config, '--local', :path, vendor_path], env: default_env)
-        shell.execute([:bundle, :install, '--verbose'], env: default_env)
+        shell.execute([:asdf, :reshim], env: default_env, capture: false)
+        shell.execute([:bundle, :config, '--local', :path, vendor_path], env: default_env, capture: false)
+        shell.execute([:bundle, :install], env: default_env, capture: false)
       end
     end
 
diff --git a/lib/license/finder/ext/cargo.rb b/lib/license/finder/ext/cargo.rb
index c957e0e..cc24c21 100644
--- a/lib/license/finder/ext/cargo.rb
+++ b/lib/license/finder/ext/cargo.rb
@@ -13,7 +13,7 @@ module LicenseFinder
 
       within_project_path do
         tool_box.install(tool: :rust)
-        shell.execute([:cargo, :fetch, '-vv'], env: default_env)
+        shell.execute([:cargo, :fetch, '-vv'], env: default_env, capture: false)
       end
     end
 
diff --git a/lib/license/finder/ext/composer.rb b/lib/license/finder/ext/composer.rb
index 993119c..6f00edb 100644
--- a/lib/license/finder/ext/composer.rb
+++ b/lib/license/finder/ext/composer.rb
@@ -17,7 +17,7 @@ module LicenseFinder
           '--no-progress',
           '--no-scripts',
           '--verbose'
-        ], env: default_env)
+        ], env: default_env, capture: false)
       end
     end
 
diff --git a/lib/license/finder/ext/conan.rb b/lib/license/finder/ext/conan.rb
index 780b205..90e7d9b 100644
--- a/lib/license/finder/ext/conan.rb
+++ b/lib/license/finder/ext/conan.rb
@@ -9,8 +9,8 @@ module LicenseFinder
     def prepare
       within_project_path do
         tool_box.install(tool: :python)
-        shell.execute([:conan, :install, '--build=missing', '.'], env: default_env)
-        shell.execute([:conan, :inspect, '.'], env: default_env)
+        shell.execute([:conan, :install, '--build=missing', '.'], env: default_env, capture: false)
+        shell.execute([:conan, :inspect, '.'], env: default_env, capture: false)
       end
     end
 
diff --git a/lib/license/finder/ext/dotnet.rb b/lib/license/finder/ext/dotnet.rb
index eebbbbd..e530ba4 100644
--- a/lib/license/finder/ext/dotnet.rb
+++ b/lib/license/finder/ext/dotnet.rb
@@ -24,7 +24,7 @@ module LicenseFinder
         '--no-cache',
         '--packages', vendor_path,
         '--verbosity', :normal
-      ])
+      ], capture: false)
     end
 
     def current_packages
diff --git a/lib/license/finder/ext/go_modules.rb b/lib/license/finder/ext/go_modules.rb
index a0fcb96..8927f2c 100644
--- a/lib/license/finder/ext/go_modules.rb
+++ b/lib/license/finder/ext/go_modules.rb
@@ -10,7 +10,7 @@ module LicenseFinder
 
       within_project_path do
         tool_box.install(tool: :golang)
-        shell.execute([:go, :mod, :download, '-json'])
+        shell.execute([:go, :mod, :download, '-json'], capture: false)
       end
     end
 
diff --git a/lib/license/finder/ext/npm.rb b/lib/license/finder/ext/npm.rb
index 18af4a7..59244c9 100644
--- a/lib/license/finder/ext/npm.rb
+++ b/lib/license/finder/ext/npm.rb
@@ -13,7 +13,7 @@ module LicenseFinder
         if lockfile?
           shell.execute([:npm, :ci, "--production"], env: default_env, capture: false)
         else
-          shell.execute([:npm, :install, '--no-save', "--production"], env: default_env)
+          shell.execute([:npm, :install, '--no-save', "--production"], env: default_env, capture: false)
         end
       end
     end
@@ -32,7 +32,7 @@ module LicenseFinder
 
     def npm_json
       stdout, _stderr, status = within_project_path do
-        shell.execute("npm list --json --long --production")
+        shell.execute([:npm, "list", "--json", "--long", "--production"])
       end
       status.success? ? JSON.parse(stdout) : {}
     end
diff --git a/lib/license/finder/ext/nuget.rb b/lib/license/finder/ext/nuget.rb
index f292392..53fb32e 100644
--- a/lib/license/finder/ext/nuget.rb
+++ b/lib/license/finder/ext/nuget.rb
@@ -7,7 +7,7 @@ module LicenseFinder
 
       within_project_path do
         tool_box.install(tool: :mono)
-        shell.execute([:cert_sync, shell.default_certificate_path])
+        shell.execute([:cert_sync, shell.default_certificate_path], capture: false)
         shell.execute([
           :mono,
           :nuget,
@@ -16,7 +16,7 @@ module LicenseFinder
           '-NoCache',
           '-PackagesDirectory', vendor_path,
           '-Verbosity', :normal
-        ])
+        ], capture: false)
       end
     end
 
diff --git a/lib/license/finder/ext/package_manager.rb b/lib/license/finder/ext/package_manager.rb
index f90a8eb..837c805 100644
--- a/lib/license/finder/ext/package_manager.rb
+++ b/lib/license/finder/ext/package_manager.rb
@@ -19,7 +19,7 @@ module LicenseFinder
       return unless prepare_command
 
       within_project_path do
-        shell.execute(prepare_command)
+        shell.execute(prepare_command, capture: false)
       end
     end
 
@@ -39,7 +39,7 @@ module LicenseFinder
     end
 
     def create_vendor_path
-      shell.execute([:mkdir, '-p', vendor_path]) unless vendor_path.exist?
+      shell.execute([:mkdir, '-p', vendor_path], capture: false) unless vendor_path.exist?
     end
 
     def within_project_path
diff --git a/lib/license/finder/ext/pipenv.rb b/lib/license/finder/ext/pipenv.rb
index 2dfad64..4641614 100644
--- a/lib/license/finder/ext/pipenv.rb
+++ b/lib/license/finder/ext/pipenv.rb
@@ -8,8 +8,8 @@ module LicenseFinder
         return unless pipfile?
 
         tool_box.install(tool: :python, version: python_version, env: default_env)
-        shell.execute([:asdf, :exec, :pipenv, '--python', python_version], env: default_env)
-        shell.execute([:asdf, :exec, :pipenv, :sync], env: default_env)
+        shell.execute([:asdf, :exec, :pipenv, '--python', python_version], env: default_env, capture: false)
+        shell.execute([:asdf, :exec, :pipenv, :sync], env: default_env, capture: false)
       end
     end
 
diff --git a/lib/license/finder/ext/yarn.rb b/lib/license/finder/ext/yarn.rb
index e56f7d1..7a18e35 100644
--- a/lib/license/finder/ext/yarn.rb
+++ b/lib/license/finder/ext/yarn.rb
@@ -16,7 +16,7 @@ module LicenseFinder
           :yarn, :install,
           '--ignore-engines', '--ignore-scripts',
           '--production'
-        ], env: default_env)
+        ], env: default_env, capture: false)
       end
     end