diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | lib/rubygems.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_installer.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_rdoc.rb | 11 |
4 files changed, 22 insertions, 3 deletions
@@ -1,3 +1,13 @@ +Mon Dec 17 07:59:40 2012 Eric Hodel <drbrain@segment7.net> + + * lib/rubygems.rb: Updated VERSION + + * test/rubygems/test_gem_installer.rb: Fixed ambiguous first argument + warning. + + * test/rubygems/test_gem_rdoc.rb: RDoc generation depends on installed + version of RDoc. + Sun Dec 16 02:04:41 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * signal.c (rb_sigaltstack_size): cast sysconf() return value diff --git a/lib/rubygems.rb b/lib/rubygems.rb index d39a68ca09..29bbb586b5 100644 --- a/lib/rubygems.rb +++ b/lib/rubygems.rb @@ -98,7 +98,7 @@ require 'rbconfig' module Gem - VERSION = '2.0.0.preview2.1' + VERSION = '2.0.0.preview2.2' end # Must be first since it unloads the prelude from 1.9.2 diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 6645194021..0683001f33 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -180,7 +180,7 @@ load Gem.bin_path('a', 'executable', version) end conflicted = File.join @gemhome, 'bin', 'executable' - assert_match /\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z/, + assert_match %r%\A"executable" from a conflicts with (?:#{Regexp.quote(conflicted)}|installed executable from conflict)\z%, e.message end ensure diff --git a/test/rubygems/test_gem_rdoc.rb b/test/rubygems/test_gem_rdoc.rb index bece6a1782..0285a2fede 100644 --- a/test/rubygems/test_gem_rdoc.rb +++ b/test/rubygems/test_gem_rdoc.rb @@ -34,6 +34,11 @@ class TestGemRDoc < Gem::TestCase # RDoc 4 ships with its own Gem::RDoc which overrides this one which is # shipped for backwards compatibility. + def rdoc_4? + Gem::Requirement.new('>= 4.0.0.preview2').satisfied_by? \ + @hook.class.rdoc_version + end + def rdoc_3? Gem::Requirement.new('~> 3.0').satisfied_by? @hook.class.rdoc_version end @@ -43,7 +48,11 @@ class TestGemRDoc < Gem::TestCase end def test_initialize - refute @hook.generate_rdoc + if rdoc_4? then + refute @hook.generate_rdoc + else + assert @hook.generate_rdoc + end assert @hook.generate_ri rdoc = Gem::RDoc.new @a, false, false |