drbrain	2012-12-17 08:00:04 +0900 (Mon, 17 Dec 2012)

  New Revision: 38416

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38416

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems.rb
    trunk/test/rubygems/test_gem_installer.rb
    trunk/test/rubygems/test_gem_rdoc.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38415)
+++ ChangeLog	(revision 38416)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Dec 17 07:59:40 2012  Eric Hodel  <drbrain@s...>
+
+	* 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@g...>
 
 	* signal.c (rb_sigaltstack_size): cast sysconf() return value
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 38415)
+++ lib/rubygems.rb	(revision 38416)
@@ -98,7 +98,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L98
 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
Index: test/rubygems/test_gem_rdoc.rb
===================================================================
--- test/rubygems/test_gem_rdoc.rb	(revision 38415)
+++ test/rubygems/test_gem_rdoc.rb	(revision 38416)
@@ -34,6 +34,11 @@ class TestGemRDoc < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_rdoc.rb#L34
   # 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 https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_rdoc.rb#L48
   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
Index: test/rubygems/test_gem_installer.rb
===================================================================
--- test/rubygems/test_gem_installer.rb	(revision 38415)
+++ test/rubygems/test_gem_installer.rb	(revision 38416)
@@ -180,7 +180,7 @@ load Gem.bin_path('a', 'executable', ver https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_installer.rb#L180
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/