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

[rubygems/rubygems] Load "bundler/setup" in lib/rubygems.rb

Browse Source 
Ruby interpreter loads some special gems at startup: did_you_mean,
error_highlight, and syntax_suggest. These gems are loaded before
`bundler/setup` is loaded by `RUBYOPT=-rbundler/setup`.
So, the versions of the gems are not controllable by Gemfile.

This change will `require "bundler/setup"` in rubygems.rb (i.e., before
the special gems are loaded). Now `bundle exec` sets an environment
variable `BUNDLER_SETUP`, and rubygems requires the variable if defined.

See also: https://bugs.ruby-lang.org/issues/19089

https://github.com/rubygems/rubygems/commit/963cb65a2d
This commit is contained in:
Yusuke Endoh 2022-10-29 01:19:36 +09:00 committed by git
parent 06e17d7659
commit b5f809c496
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/bundler/environment_preserver.rb
View File

@ -7,6 +7,7 @@ module Bundler
BUNDLE_BIN_PATH BUNDLE_BIN_PATH
BUNDLE_GEMFILE BUNDLE_GEMFILE
BUNDLER_VERSION BUNDLER_VERSION
BUNDLER_SETUP
GEM_HOME GEM_HOME
GEM_PATH GEM_PATH
MANPATH MANPATH

1
lib/bundler/shared_helpers.rb
View File

@ -284,6 +284,7 @@ module Bundler
Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file
Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s
Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION
Bundler::SharedHelpers.set_env "BUNDLER_SETUP", File.expand_path("setup", __dir__)
end end
def set_path def set_path

2
lib/rubygems.rb
View File

@ -1348,3 +1348,5 @@ Gem::Specification.load_defaults
require_relative "rubygems/core_ext/kernel_gem" require_relative "rubygems/core_ext/kernel_gem"
require_relative "rubygems/core_ext/kernel_require" require_relative "rubygems/core_ext/kernel_require"
require_relative "rubygems/core_ext/kernel_warn" require_relative "rubygems/core_ext/kernel_warn"
require ENV["BUNDLER_SETUP"] if ENV["BUNDLER_SETUP"]

7
spec/bundler/bundler/shared_helpers_spec.rb
View File

@ -246,6 +246,13 @@ RSpec.describe Bundler::SharedHelpers do
end end
end end
shared_examples_for "ENV['BUNDLER_SETUP'] gets set correctly" do
it "ensures bundler/setup is set in ENV['BUNDLE_SETUP']" do
subject.set_bundle_environment
expect(ENV["BUNDLER_SETUP"]).to eq("#{source_lib_dir}/bundler/setup")
end
end
shared_examples_for "ENV['RUBYLIB'] gets set correctly" do shared_examples_for "ENV['RUBYLIB'] gets set correctly" do
let(:ruby_lib_path) { "stubbed_ruby_lib_dir" } let(:ruby_lib_path) { "stubbed_ruby_lib_dir" }