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

[rubygems/rubygems] Load hax.rb before anything when BUNDLER_IGNORE_DEFAULT_GEM set

Browse Source 
https://github.com/rubygems/rubygems/commit/111bd11c36
This commit is contained in:
David Rodríguez 2023-11-10 19:39:48 +01:00 committed by Hiroshi SHIBATA
parent 8d1a203664
commit 7d5d2eef78
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spec/bundler/support/helpers.rb
View File

@ -116,7 +116,7 @@ module Spec
end end
end.join end.join
ruby_cmd = build_ruby_cmd({ load_path: load_path, requires: requires }) ruby_cmd = build_ruby_cmd({ load_path: load_path, requires: requires, env: env })
cmd = "#{ruby_cmd} #{bundle_bin} #{cmd}#{args}" cmd = "#{ruby_cmd} #{bundle_bin} #{cmd}#{args}"
sys_exec(cmd, { env: env, dir: dir, raise_on_error: raise_on_error }, &block) sys_exec(cmd, { env: env, dir: dir, raise_on_error: raise_on_error }, &block)
end end
@ -147,7 +147,13 @@ module Spec
lib_option = libs ? "-I#{libs.join(File::PATH_SEPARATOR)}" : [] lib_option = libs ? "-I#{libs.join(File::PATH_SEPARATOR)}" : []
requires = options.delete(:requires) || [] requires = options.delete(:requires) || []
requires << "#{Path.spec_dir}/support/hax.rb"
hax_path = "#{Path.spec_dir}/support/hax.rb"
# For specs that need to ignore the default Bundler gem, load hax before
# anything else since other stuff may actually load bundler and not skip
# the default version
options[:env]&.include?("BUNDLER_IGNORE_DEFAULT_GEM") ? requires.prepend(hax_path) : requires.append(hax_path)
require_option = requires.map {|r| "-r#{r}" } require_option = requires.map {|r| "-r#{r}" }
[Gem.ruby, *lib_option, *require_option].compact.join(" ") [Gem.ruby, *lib_option, *require_option].compact.join(" ")