drbrain	2013-07-10 07:34:58 +0900 (Wed, 10 Jul 2013)

  New Revision: 41872

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

  Log:
    * lib/rubygems/ext/ext_conf_builder.rb:  Remove siteconf file after
      building the gem.
    * test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.
    
    * lib/rubygems/psych_tree.rb (module Gem):  Add backward compatibility
      for r41148
    
    * test/rubygems/test_gem_package.rb:  Add backward compatibility for
      double-slash elimination.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/ext/ext_conf_builder.rb
    trunk/lib/rubygems/psych_tree.rb
    trunk/test/rubygems/test_gem_ext_ext_conf_builder.rb
    trunk/test/rubygems/test_gem_package.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 41871)
+++ ChangeLog	(revision 41872)
@@ -1,3 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jul 10 07:34:34 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems/ext/ext_conf_builder.rb:  Remove siteconf file after
+	  building the gem.
+	* test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.
+
+	* lib/rubygems/psych_tree.rb (module Gem):  Add backward compatibility
+	  for r41148
+
+	* test/rubygems/test_gem_package.rb:  Add backward compatibility for
+	  double-slash elimination.
+
 Wed Jul 10 06:22:27 2013  Tadayoshi Funaba  <tadf@d...>
 
 	* ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].
Index: lib/rubygems/ext/ext_conf_builder.rb
===================================================================
--- lib/rubygems/ext/ext_conf_builder.rb	(revision 41871)
+++ lib/rubygems/ext/ext_conf_builder.rb	(revision 41872)
@@ -37,6 +37,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ex https://github.com/ruby/ruby/blob/trunk/lib/rubygems/ext/ext_conf_builder.rb#L37
         run cmd, results
 
         ENV["DESTDIR"] = nil
+        siteconf.unlink
 
         make dest_path, results
 
Index: lib/rubygems/psych_tree.rb
===================================================================
--- lib/rubygems/psych_tree.rb	(revision 41871)
+++ lib/rubygems/psych_tree.rb	(revision 41872)
@@ -1,6 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/lib/rubygems/psych_tree.rb#L1
 module Gem
   if defined? ::Psych::Visitors
     class NoAliasYAMLTree < Psych::Visitors::YAMLTree
+      def self.create
+        new({})
+      end unless respond_to? :create
+
       def visit_String(str)
         return super unless str == '=' # or whatever you want
 
Index: test/rubygems/test_gem_package.rb
===================================================================
--- test/rubygems/test_gem_package.rb	(revision 41871)
+++ test/rubygems/test_gem_package.rb	(revision 41872)
@@ -335,6 +335,7 @@ class TestGemPackage < Gem::Package::Tar https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_package.rb#L335
   end
 
   def test_install_location_extra_slash
+    skip 'no File.realpath on 1.8' if RUBY_VERSION < '1.9'
     package = Gem::Package.new @gem
 
     file = 'foo//file.rb'
Index: test/rubygems/test_gem_ext_ext_conf_builder.rb
===================================================================
--- test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 41871)
+++ test/rubygems/test_gem_ext_ext_conf_builder.rb	(revision 41872)
@@ -34,6 +34,7 @@ class TestGemExtExtConfBuilder < Gem::Te https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_ext_conf_builder.rb#L34
     assert_equal "creating Makefile\n", output[1]
     assert_contains_make_command '', output[2]
     assert_contains_make_command 'install', output[4]
+    assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
   end
 
   def test_class_build_rbconfig_make_prog

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