diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/rubygems/remote_fetcher.rb | 2 | ||||
-rw-r--r-- | lib/rubygems/test_case.rb | 13 | ||||
-rw-r--r-- | test/rubygems/test_gem_ext_ext_conf_builder.rb | 9 |
4 files changed, 22 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Thu Jul 25 07:15:58 2013 Eric Hodel <drbrain@segment7.net> + + * lib/rubygems: Import RubyGems from master as of commit 4ff70cc + * test/rubygems: ditto. + Wed Jul 24 20:57:44 2013 Koichi Sasada <ko1@atdot.net> * compile.c (iseq_set_arguments): use RARRAY_RAWPTR() instead of diff --git a/lib/rubygems/remote_fetcher.rb b/lib/rubygems/remote_fetcher.rb index 6abd6bd9db..f00555a1e2 100644 --- a/lib/rubygems/remote_fetcher.rb +++ b/lib/rubygems/remote_fetcher.rb @@ -325,7 +325,7 @@ class Gem::RemoteFetcher def request(uri, request_class, last_modified = nil) request = Gem::Request.new uri, request_class, last_modified, @proxy - + request.fetch do |req| yield req if block_given? end diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 9bb5c8e78b..2ae8ec9a2c 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -1,5 +1,11 @@ # TODO: $SAFE = 1 +begin + gem 'minitest', '~> 4.0' +rescue NoMethodError + # for ruby tests +end + if defined? Gem::QuickLoader Gem::QuickLoader.load_full_rubygems_library else @@ -220,8 +226,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase ENV["GEM_SPEC_CACHE"] = File.join @tempdir, 'spec_cache' @orig_ruby = if ENV['RUBY'] then - ruby = Gem.instance_variable_get :@ruby - Gem.instance_variable_set :@ruby, ENV['RUBY'] + ruby = Gem.ruby + Gem.ruby = ENV['RUBY'] ruby end @@ -310,8 +316,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase ENV['GEM_HOME'] = @orig_gem_home ENV['GEM_PATH'] = @orig_gem_path - _ = @orig_ruby - Gem.instance_variable_set :@ruby, @orig_ruby if @orig_ruby + Gem.ruby = @orig_ruby if @orig_ruby if @orig_ENV_HOME then ENV['HOME'] = @orig_ENV_HOME diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb index 33398ac6f3..dfbf3fe1b9 100644 --- a/test/rubygems/test_gem_ext_ext_conf_builder.rb +++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb @@ -120,8 +120,13 @@ checking for main\(\) in .*?nonexistent/m, error.message) extconf.puts <<-'EXTCONF' include RbConfig -ruby_exe = "#{CONFIG['RUBY_INSTALL_NAME']}#{CONFIG['EXEEXT']}" -ruby = File.join CONFIG['bindir'], ruby_exe +ruby = + if ENV['RUBY'] then + ENV['RUBY'] + else + ruby_exe = "#{CONFIG['RUBY_INSTALL_NAME']}#{CONFIG['EXEEXT']}" + File.join CONFIG['bindir'], ruby_exe + end open 'Makefile', 'w' do |io| io.write <<-Makefile |