From ddd42d6472b42335d6dc196a2b5282a6e96cd4b4 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 6 Oct 2017 00:15:08 +0000 Subject: No more ubygems in trunk [Fix GH-1711] Author: MSP-Greg git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rubygems/ext/rake_builder.rb | 2 +- spec/bundler/support/helpers.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rubygems/ext/rake_builder.rb b/lib/rubygems/ext/rake_builder.rb index ec904e6c11..4b3534bf35 100644 --- a/lib/rubygems/ext/rake_builder.rb +++ b/lib/rubygems/ext/rake_builder.rb @@ -20,7 +20,7 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder rake = ENV['rake'] rake ||= begin - "#{Gem.ruby} -rubygems #{Gem.bin_path('rake', 'rake')}" + "#{Gem.ruby} -rrubygems #{Gem.bin_path('rake', 'rake')}" rescue Gem::Exception end diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb index 691e7381ff..192747da05 100644 --- a/spec/bundler/support/helpers.rb +++ b/spec/bundler/support/helpers.rb @@ -157,7 +157,7 @@ module Spec args = args.gsub(/(?=")/, "\\") args = %("#{args}") end - gem = ENV['BUNDLE_GEM'] || "#{Gem.ruby} -rubygems -S gem --backtrace" + gem = ENV['BUNDLE_GEM'] || "#{Gem.ruby} -rrubygems -S gem --backtrace" sys_exec("#{gem} #{command} #{args}") end bang :gem_command -- cgit v1.2.3