From cd9f9e471977447a991ced4ea38efb2309459ef5 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 9 Jul 2013 22:34:58 +0000
Subject: * 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                                      | 12 ++++++++++++
 lib/rubygems/ext/ext_conf_builder.rb           |  1 +
 lib/rubygems/psych_tree.rb                     |  4 ++++
 test/rubygems/test_gem_ext_ext_conf_builder.rb |  1 +
 test/rubygems/test_gem_package.rb              |  1 +
 5 files changed, 19 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5c4037fcaf..0f1bd4f9db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Jul 10 07:34:34 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* 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@dotrb.org>
 
 	* ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index d09cb5266f..70b57bd47b 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -37,6 +37,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         run cmd, results
 
         ENV["DESTDIR"] = nil
+        siteconf.unlink
 
         make dest_path, results
 
diff --git a/lib/rubygems/psych_tree.rb b/lib/rubygems/psych_tree.rb
index eca8249383..e3f1d1a08a 100644
--- a/lib/rubygems/psych_tree.rb
+++ b/lib/rubygems/psych_tree.rb
@@ -1,6 +1,10 @@
 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
 
diff --git a/test/rubygems/test_gem_ext_ext_conf_builder.rb b/test/rubygems/test_gem_ext_ext_conf_builder.rb
index 7c55626248..3703e6b63b 100644
--- a/test/rubygems/test_gem_ext_ext_conf_builder.rb
+++ b/test/rubygems/test_gem_ext_ext_conf_builder.rb
@@ -34,6 +34,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     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
diff --git a/test/rubygems/test_gem_package.rb b/test/rubygems/test_gem_package.rb
index 7b3f638aee..bb78829bf9 100644
--- a/test/rubygems/test_gem_package.rb
+++ b/test/rubygems/test_gem_package.rb
@@ -335,6 +335,7 @@ class TestGemPackage < Gem::Package::TarTestCase
   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'
-- 
cgit v1.2.3