* lib/rubygems.rb: Bump version to 2.0.1 for upcoming bugfix release

* lib/rubygems/ext/ext_conf_builder.rb:  Restore ruby 1.8 compatibility
  for [Bug #9698]
* test/rubygems/test_gem_installer.rb:  Ditto.

* lib/rubygems/package.rb:  Restore ruby 1.8 compatibility.

* test/rubygems/test_gem_dependency_installer.rb:  Fix warnings


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

6 files changed, 56 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index c4c9007b14..46a4777f6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Mar  5 12:30:55 2013  Eric Hodel  <[email protected]>
+
+	* lib/rubygems.rb:  Bump version to 2.0.1 for upcoming bugfix release
+
+	* lib/rubygems/ext/ext_conf_builder.rb:  Restore ruby 1.8 compatibility
+	  for [Bug #9698]
+	* test/rubygems/test_gem_installer.rb:  Ditto.
+
+	* lib/rubygems/package.rb:  Restore ruby 1.8 compatibility.
+
+	* test/rubygems/test_gem_dependency_installer.rb:  Fix warnings
+
 Tue Mar  5 12:24:23 2013  Eric Hodel  <[email protected]>
 
 	* enumerator.c (enumerator_with_index):  Restore handling of a nil memo
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index f85117d673..226ff69db5 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index 3df7637581..39d772326a 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -13,41 +13,45 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
   FileEntry = FileUtils::Entry_ # :nodoc:
 
   def self.build(extension, directory, dest_path, results, args=[])
-    tmp_dest = (Dir.mktmpdir(".gem.", ".") if File.identical?(dest_path, "."))
+    tmp_dest = Dir.mktmpdir(".gem.", ".") if File.identical?(dest_path, ".")
 
-    siteconf = Tempfile.open(%w"siteconf .rb", ".") do |f|
-      f.puts "require 'rbconfig'"
-      f.puts "dest_path = #{(tmp_dest || dest_path).dump}"
+    Tempfile.open %w"siteconf .rb", "." do |siteconf|
+      siteconf.puts "require 'rbconfig'"
+      siteconf.puts "dest_path = #{(tmp_dest || dest_path).dump}"
       %w[sitearchdir sitelibdir].each do |dir|
-        f.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
-        f.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
+        siteconf.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
+        siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
       end
-      f
-    end
 
-    rubyopt = ENV["RUBYOPT"]
-    ENV["RUBYOPT"] = ["-r#{siteconf.path}", rubyopt].compact.join(' ')
-    cmd = [Gem.ruby, File.basename(extension), *args].join ' '
+      siteconf.flush
+
+      rubyopt = ENV["RUBYOPT"]
+      destdir = ENV["DESTDIR"]
+
+      begin
+        ENV["RUBYOPT"] = ["-r#{siteconf.path}", rubyopt].compact.join(' ')
+        cmd = [Gem.ruby, File.basename(extension), *args].join ' '
 
-    run cmd, results
+        run cmd, results
 
-    destdir = ENV["DESTDIR"]
-    ENV["DESTDIR"] = nil
+        ENV["DESTDIR"] = nil
 
-    make dest_path, results
+        make dest_path, results
 
-    if tmp_dest
-      FileEntry.new(tmp_dest).traverse do |ent|
-        destent = ent.class.new(dest_path, ent.rel)
-        destent.exist? or File.rename(ent.path, destent.path)
+        if tmp_dest
+          FileEntry.new(tmp_dest).traverse do |ent|
+            destent = ent.class.new(dest_path, ent.rel)
+            destent.exist? or File.rename(ent.path, destent.path)
+          end
+        end
+
+        results
+      ensure
+        ENV["RUBYOPT"] = rubyopt
+        ENV["DESTDIR"] = destdir
       end
     end
-
-    results
   ensure
-    ENV["RUBYOPT"] = rubyopt
-    ENV["DESTDIR"] = destdir
-    siteconf.close(true) if siteconf
     FileUtils.rm_rf tmp_dest if tmp_dest
   end
 
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
index 301eef48cc..7e2458c3b6 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -387,8 +387,9 @@ EOM
       @spec = Gem::Specification.from_yaml entry.read
     when 'metadata.gz' then
       args = [entry]
-      args << { :external_encoding => Encoding::UTF_8 } unless
-        Zlib::GzipReader.method(:wrap).arity == 1
+      args << { :external_encoding => Encoding::UTF_8 } if
+        Object.const_defined?(:Encoding) &&
+          Zlib::GzipReader.method(:wrap).arity != 1
 
       Zlib::GzipReader.wrap(*args) do |gzio|
         @spec = Gem::Specification.from_yaml gzio.read
diff --git a/test/rubygems/test_gem_dependency_installer.rb b/test/rubygems/test_gem_dependency_installer.rb
index bfebc6f63b..2b95597d4b 100644
--- a/test/rubygems/test_gem_dependency_installer.rb
+++ b/test/rubygems/test_gem_dependency_installer.rb
@@ -37,7 +37,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
   def test_available_set_for_name
     util_setup_gems
-    p1a, gem = util_gem 'a', '10.a'
+    p1a, = util_gem 'a', '10.a'
     util_setup_spec_fetcher p1a, @a1, @a1_pre
 
     inst = Gem::DependencyInstaller.new
@@ -49,7 +49,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
   def test_available_set_for_name_prerelease
     util_setup_gems
-    p1a, gem = util_gem 'a', '10.a'
+    p1a, = util_gem 'a', '10.a'
     util_setup_spec_fetcher p1a, @a1, @a1_pre
 
     inst = Gem::DependencyInstaller.new :prerelease => true
@@ -62,7 +62,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
   def test_available_set_for_dep
     util_setup_gems
-    p1a, gem = util_gem 'a', '10.a'
+    p1a, = util_gem 'a', '10.a'
     util_setup_spec_fetcher p1a, @a1, @a1_pre
 
     inst = Gem::DependencyInstaller.new
@@ -76,7 +76,7 @@ class TestGemDependencyInstaller < Gem::TestCase
 
   def test_available_set_for_dep_prerelease
     util_setup_gems
-    p1a, gem = util_gem 'a', '10.a'
+    p1a, = util_gem 'a', '10.a'
     util_setup_spec_fetcher p1a, @a1, @a1_pre
 
     inst = Gem::DependencyInstaller.new :prerelease => true
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index cf35a534b9..3f3d4c5a00 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -1060,6 +1060,7 @@ gem 'other', version
   end
 
   def test_install_extension_flat
+    skip '1.8 mkmf.rb does not create TOUCH' if RUBY_VERSION < '1.9'
     @spec.require_paths = ["."]
 
     @spec.extensions << "extconf.rb"
@@ -1089,6 +1090,13 @@ gem 'other', version
       @installer.install
     end
     assert File.exist?(so)
+  rescue
+    puts '-' * 78
+    puts File.read File.join(@gemhome, 'gems', 'a-2', 'Makefile')
+    puts '-' * 78
+    puts File.read File.join(@gemhome, 'gems', 'a-2', 'gem_make.out')
+    puts '-' * 78
+    raise
   end
 
   def test_installation_satisfies_dependency_eh