fix(bundler): Make parsing of dependency output more robust

When fetching e.g. GitHub dependencies, the console output is slightly different. Instead of adopting the lines to drop, suppress them completely. As now no leading text is printed, the concatenation of printed specs can also be simplified so that it produces no leading null character. Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · May 14, 2024 · 1e982e5 · 1e982e5
1 parent 5e34581
commit 1e982e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/plugins/package-managers/bundler/src/main/kotlin/Bundler.kt b/plugins/package-managers/bundler/src/main/kotlin/Bundler.kt
@@ -313,7 +313,7 @@ class Bundler(
 
         // The metadata produced by the "resolve_dependencies.rb" script separates specs for packages with the "\0"
         // character as delimiter.
-        val gemSpecs = stdout.split('\u0000').dropWhile { it.startsWith("Fetching gem metadata") }.map {
+        val gemSpecs = stdout.split('\u0000').map {
             GemSpec.createFromMetadata(yamlMapper.readTree(it))
         }.associateByTo(mutableMapOf()) {
             it.name

diff --git a/plugins/package-managers/bundler/src/main/resources/resolve_dependencies.rb b/plugins/package-managers/bundler/src/main/resources/resolve_dependencies.rb
@@ -33,9 +33,7 @@
 
 # This command tries to resolve dependencies that are specified in the Gemfile of the current working directory.
 # Explicitly enable resolution of remote `gem` or `git` dependencies. `path` dependencies are still resolved locally.
-Bundler.definition.resolve_remotely!
-
-Bundler.definition.specs.each do |spec|
-  puts("\0")
-  puts(spec.to_yaml)
-end
+puts Bundler.ui.silence {
+    Bundler.definition.resolve_remotely!
+    Bundler.definition.specs.map { |spec| spec.to_yaml }.join("\0")
+}