archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 11:03:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Backport r35374 and r35375

Browse source 
* lib/rubygems:  Update to RubyGems 1.8.22 plus r33517 and r35337 which
  were ported to the rubygems git repository.

  See https://github.com/rubygems/rubygems/blob/1.8/History.txt for
  changes since 1.8.11.

* test/rubygems:  ditto.

* lib/rubygems/version.rb:  Fixed init_with warning by calling into
  yaml_initialize (for syck) from psych's init_with



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2012-04-19 22:43:16 +00:00
parent b51081308b
commit de280961df
37 changed files with 1190 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

33
lib/rubygems/test_case.rb
View file

@ -243,7 +243,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
##
# Builds and installs the Gem::Specification +spec+
def install_gem spec
def install_gem spec, options = {}
require 'rubygems/installer'
use_ui Gem::MockGemUi.new do
@ -254,26 +254,14 @@ class Gem::TestCase < MiniTest::Unit::TestCase
gem = File.join(@tempdir, File.basename(spec.cache_file)).untaint
Gem::Installer.new(gem, :wrappers => true).install
Gem::Installer.new(gem, options.merge({:wrappers => true})).install
end
##
# Builds and installs the Gem::Specification +spec+ into the user dir
def install_gem_user spec
require 'rubygems/installer'
use_ui Gem::MockGemUi.new do
Dir.chdir @tempdir do
Gem::Builder.new(spec).build
end
end
gem = File.join(@tempdir, File.basename(spec.cache_file)).untaint
i = Gem::Installer.new(gem, :wrappers => true, :user_install => true)
i.install
i.spec
install_gem spec, :user_install => true
end
##
@ -499,8 +487,11 @@ class Gem::TestCase < MiniTest::Unit::TestCase
if deps then
block = proc do |s|
deps.each do |n, req|
s.add_dependency n, (req || '>= 0')
# Since Hash#each is unordered in 1.8, sort
# the keys and iterate that way so the tests are
# deteriminstic on all implementations.
deps.keys.sort.each do |n|
s.add_dependency n, (deps[n] || '>= 0')
end
end
end
@ -520,8 +511,11 @@ class Gem::TestCase < MiniTest::Unit::TestCase
if deps then
block = proc do |s|
deps.each do |n, req|
s.add_dependency n, (req || '>= 0')
# Since Hash#each is unordered in 1.8, sort
# the keys and iterate that way so the tests are
# deteriminstic on all implementations.
deps.keys.sort.each do |n|
s.add_dependency n, (deps[n] || '>= 0')
end
end
end
@ -874,4 +868,3 @@ Also, a list:
end
end