admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

utils/gems: install Bundler into vendor directory

Browse Source
This commit is contained in:
Bo Anderson 2022-10-08 16:01:16 +01:00
parent 77311e4045
commit c87c97e4d7
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/dev-cmd/tests.rb
View File

@ -208,12 +208,6 @@ module Homebrew
puts "Randomized with seed #{seed}" puts "Randomized with seed #{seed}"
# Let tests find `bundle` in the actual location.
ENV["HOMEBREW_TESTS_GEM_USER_DIR"] = gem_user_dir
# Let `bundle` in PATH find its gem.
ENV["GEM_PATH"] = "#{ENV.fetch("GEM_PATH")}:#{gem_user_dir}"
# Submit test flakiness information using BuildPulse # Submit test flakiness information using BuildPulse
# BUILDPULSE used in spec_helper.rb # BUILDPULSE used in spec_helper.rb
if use_buildpulse? if use_buildpulse?

17
Library/Homebrew/utils/gems.rb
View File

@ -17,14 +17,6 @@ module Homebrew
"#{RbConfig::CONFIG["prefix"]}/bin" "#{RbConfig::CONFIG["prefix"]}/bin"
end end
def gem_user_dir
ENV.fetch("HOMEBREW_TESTS_GEM_USER_DIR", nil) || Gem.user_dir
end
def gem_user_bindir
"#{gem_user_dir}/bin"
end
def ohai_if_defined(message) def ohai_if_defined(message)
if defined?(ohai) if defined?(ohai)
$stderr.ohai message $stderr.ohai message
@ -50,9 +42,9 @@ module Homebrew
end end
end end
def setup_gem_environment!(gem_home: nil, gem_bindir: nil, setup_path: true) def setup_gem_environment!(setup_path: true)
# Match where our bundler gems are. # Match where our bundler gems are.
gem_home ||= "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}" gem_home = "#{HOMEBREW_LIBRARY_PATH}/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}"
Gem.paths = { Gem.paths = {
"GEM_HOME" => gem_home, "GEM_HOME" => gem_home,
"GEM_PATH" => gem_home, "GEM_PATH" => gem_home,
@ -65,10 +57,9 @@ module Homebrew
return unless setup_path return unless setup_path
# Add necessary Ruby and Gem binary directories to `PATH`. # Add necessary Ruby and Gem binary directories to `PATH`.
gem_bindir ||= Gem.bindir
paths = ENV.fetch("PATH").split(":") paths = ENV.fetch("PATH").split(":")
paths.unshift(gem_bindir) unless paths.include?(gem_bindir)
paths.unshift(ruby_bindir) unless paths.include?(ruby_bindir) paths.unshift(ruby_bindir) unless paths.include?(ruby_bindir)
paths.unshift(Gem.bindir) unless paths.include?(Gem.bindir)
ENV["PATH"] = paths.compact.join(":") ENV["PATH"] = paths.compact.join(":")
# Set envs so the above binaries can be invoked. # Set envs so the above binaries can be invoked.
@ -123,7 +114,7 @@ module Homebrew
raise "Installing and using Bundler is currently only supported on Ruby 2.6." raise "Installing and using Bundler is currently only supported on Ruby 2.6."
end end
setup_gem_environment!(gem_home: gem_user_dir, gem_bindir: gem_user_bindir) setup_gem_environment!
install_gem_setup_path!( install_gem_setup_path!(
"bundler", "bundler",
version: HOMEBREW_BUNDLER_VERSION, version: HOMEBREW_BUNDLER_VERSION,