rubygems-update 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23d91223aab36769e7bd55ec6a42800a4b8d9f40
-  data.tar.gz: b5190f2902a2fe929a7c27a0864a2f0d087e749f
+  metadata.gz: 59a635b46def21cb6f0373fc28dd5bcbfdb0d9ab
+  data.tar.gz: cd146aab140604eadf8eb49c7e64889e42e8b57f
 SHA512:
-  metadata.gz: f96281ae469f202368eab4524a800b4d9f0dc389b6628afc5c0a3d70981dac6c069d0a4e058dddfe10a1c6e753ed3d69c69bb4ffc22f1575673b89eb393d4d28
-  data.tar.gz: cb3f3ff170c6d6b680f72cfe9b296f335f3dc5d5564ffeba7df037808fa4696892754c107fbaf94b8698b37253f2d7106f3378e34c018c9dd9647e6f185d32dc
+  metadata.gz: 3a2fba3840318877dbc31c8bb63b219dc7110e022007b61dda8cd13c677e655e77d11e37a585e44e7f4116049c150c92755852d8de881e87ea08a3b6b152b440
+  data.tar.gz: 1c3f8e06b1f41ff2f46b949b1922965854726cd0812d737734613737bc316a9184d621cb915aac5ce5c055db53982a48f2c5efa6ce8258bf699832ec7a438c0e

data/History.txt

@@ -1,5 +1,12 @@
 # coding: UTF-8
 
+=== 2.0.5 / 2013-07-11
+
+Bug fixes:
+
+* Fixed building of extensions that run ruby in their makefiles.  Bug #589 by
+  Zachary Salzbank.
+
 === 2.0.4 / 2013-07-09
 
 Bug fixes:

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.0.4'
+  VERSION = '2.0.5'
 end
 
 # Must be first since it unloads the prelude from 1.9.2

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -15,7 +15,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
   def self.build(extension, directory, dest_path, results, args=[])
     tmp_dest = Dir.mktmpdir(".gem.", ".")
 
+    t = nil
     Tempfile.open %w"siteconf .rb", "." do |siteconf|
+      t = siteconf
       siteconf.puts "require 'rbconfig'"
       siteconf.puts "dest_path = #{(tmp_dest || dest_path).dump}"
       %w[sitearchdir sitelibdir].each do |dir|
@@ -37,6 +39,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         run cmd, results
 
         ENV["DESTDIR"] = nil
+        ENV["RUBYOPT"] = rubyopt
         siteconf.unlink
 
         make dest_path, results
@@ -54,6 +57,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         ENV["DESTDIR"] = destdir
       end
     end
+    t.unlink if t and t.path
   ensure
     FileUtils.rm_rf tmp_dest if tmp_dest
   end

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -108,6 +108,42 @@ checking for main\(\) in .*?nonexistent/m, error.message)
     assert_equal("#{Gem.ruby} extconf.rb", output[0])
   end
 
+  def test_class_build_unconventional
+    if vc_windows? && !nmake_found?
+      skip("test_class_build skipped - nmake not found")
+    end
+
+    File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
+      extconf.puts <<-'EXTCONF'
+include RbConfig
+
+ruby_exe = "#{CONFIG['RUBY_INSTALL_NAME']}#{CONFIG['EXEEXT']}"
+ruby = File.join CONFIG['bindir'], ruby_exe
+
+open 'Makefile', 'w' do |io|
+  io.write <<-Makefile
+all: ruby
+install: ruby
+
+ruby:
+\t#{ruby} -e0
+
+  Makefile
+end
+      EXTCONF
+    end
+
+    output = []
+
+    Dir.chdir @ext do
+      Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
+    end
+
+    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_make
     if vc_windows? && !nmake_found?
       skip("test_class_make skipped - nmake not found")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Jim Weirich
@@ -32,7 +32,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -433,7 +433,7 @@ post_install_message:
 rdoc_options:
 - --main
 - README.rdoc
-- --title=RubyGems 2.0.4 Documentation
+- --title=RubyGems 2.0.5 Documentation
 require_paths:
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -448,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubygems
-rubygems_version: 2.0.3
+rubygems_version: 2.0.4
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby