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

Added Homebrew.install_gem!

Browse Source 
Useful when gem does not install with executable
This commit is contained in:
Alexander Mancevice 2018-03-22 10:13:34 -04:00
parent 8307347987
commit 57e1e16fc4
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Library/Homebrew/utils.rb
View File

@ -199,7 +199,7 @@ module Homebrew
_system(cmd, *args) _system(cmd, *args)
end end
def install_gem_setup_path!(name, version = nil, executable = name) def install_gem!(name, version = nil)
# Match where our bundler gems are. # Match where our bundler gems are.
ENV["GEM_HOME"] = "#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}" ENV["GEM_HOME"] = "#{ENV["HOMEBREW_LIBRARY"]}/Homebrew/vendor/bundle/ruby/#{RbConfig::CONFIG["ruby_version"]}"
ENV["GEM_PATH"] = ENV["GEM_HOME"] ENV["GEM_PATH"] = ENV["GEM_HOME"]
@ -214,24 +214,28 @@ module Homebrew
path.prepend(Gem.bindir) path.prepend(Gem.bindir)
ENV["PATH"] = path ENV["PATH"] = path
if Gem::Specification.find_all_by_name(name, version).empty? return unless Gem::Specification.find_all_by_name(name, version).empty?
ohai "Installing or updating '#{name}' gem"
install_args = %W[--no-ri --no-rdoc #{name}]
install_args << "--version" << version if version
# Do `gem install [...]` without having to spawn a separate process or ohai "Installing or updating '#{name}' gem"
# having to find the right `gem` binary for the running Ruby interpreter. install_args = %W[--no-ri --no-rdoc #{name}]
require "rubygems/commands/install_command" install_args << "--version" << version if version
install_cmd = Gem::Commands::InstallCommand.new
install_cmd.handle_options(install_args) # Do `gem install [...]` without having to spawn a separate process or
exit_code = 1 # Should not matter as `install_cmd.execute` always throws. # having to find the right `gem` binary for the running Ruby interpreter.
begin require "rubygems/commands/install_command"
install_cmd.execute install_cmd = Gem::Commands::InstallCommand.new
rescue Gem::SystemExitException => e install_cmd.handle_options(install_args)
exit_code = e.exit_code exit_code = 1 # Should not matter as `install_cmd.execute` always throws.
end begin
odie "Failed to install/update the '#{name}' gem." if exit_code.nonzero? install_cmd.execute
rescue Gem::SystemExitException => e
exit_code = e.exit_code
end end
odie "Failed to install/update the '#{name}' gem." if exit_code.nonzero?
end
def install_gem_setup_path!(name, version = nil, executable = name)
install_gem!(name, version)
return if which(executable) return if which(executable)
odie <<~EOS odie <<~EOS