drbrain	2013-12-20 07:09:19 +0900 (Fri, 20 Dec 2013)

  New Revision: 44290

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

  Log:
    * lib/rubygems:  Update to RubyGems master 03d6ae7.  Changes include:
    
      * Fixed typos.
    
      * Relaxed Gem.ruby test for ruby packagers that do not use `ruby`.
    
    * test/rubygems:  ditto.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/specification.rb
    trunk/lib/rubygems/syck_hack.rb
    trunk/test/rubygems/test_gem_ext_builder.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 44289)
+++ ChangeLog	(revision 44290)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Dec 20 07:07:35 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems:  Update to RubyGems master 03d6ae7.  Changes include:
+
+	  * Fixed typos.
+
+	  * Relaxed Gem.ruby test for ruby packagers that do not use `ruby`.
+
+	* test/rubygems:  ditto.
+
 Thu Dec 19 14:03:04 2013  Koichi Sasada  <ko1@a...>
 
 	* gc.c (heap_get_freeobj): improve hot path performance.
Index: lib/rubygems/syck_hack.rb
===================================================================
--- lib/rubygems/syck_hack.rb	(revision 44289)
+++ lib/rubygems/syck_hack.rb	(revision 44290)
@@ -12,7 +12,7 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems/syck_hack.rb#L12
 
 module YAML # :nodoc:
   # In newer 1.9.2, there is a Syck toplevel constant instead of it
-  # being underneith YAML. If so, reference it back under YAML as
+  # being underneath YAML. If so, reference it back under YAML as
   # well.
   if defined? ::Syck
     # for tests that change YAML::ENGINE
Index: lib/rubygems/specification.rb
===================================================================
--- lib/rubygems/specification.rb	(revision 44289)
+++ lib/rubygems/specification.rb	(revision 44290)
@@ -1275,7 +1275,7 @@ class Gem::Specification < Gem::BasicSpe https://github.com/ruby/ruby/blob/trunk/lib/rubygems/specification.rb#L1275
 
   ##
   # Activate all unambiguously resolved runtime dependencies of this
-  # spec. Add any ambigous dependencies to the unresolved list to be
+  # spec. Add any ambiguous dependencies to the unresolved list to be
   # resolved later, as needed.
 
   def activate_dependencies
Index: test/rubygems/test_gem_ext_builder.rb
===================================================================
--- test/rubygems/test_gem_ext_builder.rb	(revision 44289)
+++ test/rubygems/test_gem_ext_builder.rb	(revision 44290)
@@ -228,10 +228,16 @@ install: https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_builder.rb#L228
 
     assert_match %r%#{Regexp.escape Gem.ruby} extconf\.rb%,
                  File.read(gem_make_out)
-    assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
+    assert_match /: No such file/,
                  File.read(gem_make_out)
 
     refute_path_exists @spec.gem_build_complete_path
+
+    skip "Gem.ruby is not the name of the binary being run in the end" \
+      unless File.read(gem_make_out).include? "#{Regexp.escape Gem.ruby}:"
+
+    assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
+                 File.read(gem_make_out)
   end
 
   def test_build_extensions_unsupported

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