diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-12-18 14:53:19 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-12-18 14:53:19 +0900 |
commit | efbc0d499c0dc5b74698418c76e58098c6c113e1 (patch) | |
tree | 006ae0b7dc322164a0b74549bc263f67494c70f9 /lib/bundler/cli | |
parent | fa7fa5c86b0674eca233922045e4d3dd4ee49cb7 (diff) |
Merge bundler-2.1.1 from bundler/bundler
Diffstat (limited to 'lib/bundler/cli')
-rw-r--r-- | lib/bundler/cli/exec.rb | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb index 2bace6e77d..0a1edbdbbd 100644 --- a/lib/bundler/cli/exec.rb +++ b/lib/bundler/cli/exec.rb @@ -25,12 +25,12 @@ module Bundler SharedHelpers.set_bundle_environment if bin_path = Bundler.which(cmd) if !Bundler.settings[:disable_exec_load] && ruby_shebang?(bin_path) - return with_verbose_rubygems { kernel_load(bin_path, *args) } + return kernel_load(bin_path, *args) end - with_verbose_rubygems { kernel_exec(bin_path, *args) } + kernel_exec(bin_path, *args) else # exec using the given command - with_verbose_rubygems { kernel_exec(cmd, *args) } + kernel_exec(cmd, *args) end end @@ -89,14 +89,5 @@ module Bundler first_line = File.open(file, "rb") {|f| f.read(possibilities.map(&:size).max) } possibilities.any? {|shebang| first_line.start_with?(shebang) } end - - def with_verbose_rubygems - old_ui = Gem::DefaultUserInteraction.ui - Gem::DefaultUserInteraction.ui = nil - - yield - ensure - Gem::DefaultUserInteraction.ui = old_ui - end end end |