Skip to content

Commit 60ee488

Browse files
Silence Bundler UI when deriving packager
1 parent 3f3a486 commit 60ee488

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

lib/ruby_wasm/cli.rb

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,13 +282,23 @@ def self.bundled_patches_path
282282
end
283283

284284
def derive_packager(options)
285-
__skip__ =
286-
if defined?(Bundler) && !options[:disable_gems]
285+
definition = nil
286+
__skip__ = if defined?(Bundler) && !options[:disable_gems]
287+
begin
288+
# Silence Bundler UI if --print-ruby-cache-key is specified not to bother the JSON output.
289+
level = options[:print_ruby_cache_key] ? :silent : Bundler.ui.level
290+
old_level = Bundler.ui.level
291+
Bundler.ui.level = level
287292
if options[:gemfile]
288293
Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", options[:gemfile]
294+
definition = Bundler.definition(true) # unlock=true to re-evaluate "BUNDLE_GEMFILE"
295+
else
296+
definition = Bundler.definition
289297
end
290-
definition = Bundler.definition(true) # unlock=true to re-evaluate "BUNDLE_GEMFILE"
298+
ensure
299+
Bundler.ui.level = old_level
291300
end
301+
end
292302
RubyWasm::Packager.new(root, build_config(options), definition)
293303
end
294304

0 commit comments

Comments
 (0)