1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Revert r35370 due to bad source branch

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2012-04-17 21:17:56 +00:00
parent 02dc9ae773
commit 0ebe38eedd
36 changed files with 153 additions and 1062 deletions

View file

@ -243,7 +243,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
##
# Builds and installs the Gem::Specification +spec+
def install_gem spec, options = {}
def install_gem spec
require 'rubygems/installer'
use_ui Gem::MockGemUi.new do
@ -254,14 +254,26 @@ class Gem::TestCase < MiniTest::Unit::TestCase
gem = File.join(@tempdir, File.basename(spec.cache_file)).untaint
Gem::Installer.new(gem, options.merge({:wrappers => true})).install
Gem::Installer.new(gem, :wrappers => true).install
end
##
# Builds and installs the Gem::Specification +spec+ into the user dir
def install_gem_user spec
install_gem spec, :user_install => true
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
end
##
@ -487,11 +499,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase
if deps then
block = proc do |s|
# 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')
deps.each do |n, req|
s.add_dependency n, (req || '>= 0')
end
end
end
@ -511,11 +520,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase
if deps then
block = proc do |s|
# 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')
deps.each do |n, req|
s.add_dependency n, (req || '>= 0')
end
end
end
@ -868,3 +874,4 @@ Also, a list:
end
end