diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-24 22:16:11 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-24 22:16:11 +0000 |
| commit | d6e3ee55ba441ee76d57cb69e8d2b16d20591a02 (patch) | |
| tree | b476a5c233d6703e210840699e1591f24eac2771 /lib | |
| parent | 714428154d5c64ae10a4d8d80f1cf1b05dc15f24 (diff) | |
* lib/rubygems: Import RubyGems from master as of commit 4ff70cc
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rubygems/remote_fetcher.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/test_case.rb | 13 |
2 files changed, 10 insertions, 5 deletions
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 |