1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed ensure scope

Browse Source
This commit is contained in:
Hiroshi SHIBATA 2024-09-12 14:30:22 +09:00
parent 6c9f0be647
commit 86fcfcb3c0
Notes: git 2024-09-12 07:28:19 +00:00 
Merged: https://github.com/ruby/ruby/pull/11601
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
prelude.rb
View File

@ -14,11 +14,6 @@ class Binding
Bundler.reset! Bundler.reset!
orig_ui = Bundler.ui
ui = Bundler::UI::Shell.new
ui.level = "silent"
Bundler.ui = ui
builder = Bundler::Dsl.new builder = Bundler::Dsl.new
if Bundler.definition.gemfiles.empty? # bundler/inline if Bundler.definition.gemfiles.empty? # bundler/inline
Bundler.definition.locked_gems.specs.each{|spec| builder.gem spec.name, spec.version.to_s } Bundler.definition.locked_gems.specs.each{|spec| builder.gem spec.name, spec.version.to_s }
@ -29,12 +24,21 @@ class Binding
definition = builder.to_definition(nil, true) definition = builder.to_definition(nil, true)
definition.validate_runtime! definition.validate_runtime!
orig_no_lock = Bundler::Definition.no_lock
Bundler::Definition.no_lock = true begin
Bundler::Runtime.new(nil, definition).setup orig_ui = Bundler.ui
ensure orig_no_lock = Bundler::Definition.no_lock
Bundler.ui = orig_ui
Bundler::Definition.no_lock = orig_no_lock ui = Bundler::UI::Shell.new
ui.level = "silent"
Bundler.ui = ui
Bundler::Definition.no_lock = true
Bundler::Runtime.new(nil, definition).setup
ensure
Bundler.ui = orig_ui
Bundler::Definition.no_lock = orig_no_lock
end
end end
end end