aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--lib/rubygems/ext/ext_conf_builder.rb30
-rw-r--r--test/rubygems/test_gem_installer.rb11
3 files changed, 30 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 85488b2716..cd90ae0aff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 4 15:33:40 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+ fix for unusal cases again. install to a temporary directory once
+ and move instaled files to the destination directory, if it is same
+ as the current directory. [Bug #7698]
+
Mon Mar 4 14:13:36 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index 7babf409a0..2977cf0207 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -10,26 +10,14 @@ require 'fileutils'
require 'tempfile'
class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
-
- def self.hack_for_obsolete_style_gems(directory)
- return unless directory and File.identical?(directory, ".")
- mf = Gem.read_binary 'Makefile'
- changed = false
- changed |= mf.gsub!(/^(install-rb-default:)(.*)/) {
- "#$1#{$2.gsub(/(?:^|\s+)\$\(RUBY(?:ARCH|LIB)DIR\)\/\S+(?=\s|$)/, '')}"
- }
- changed |= mf.gsub!(/^(install-so:.*DLLIB.*\n)((?:\t.*\n)+)/) {
- "#$1#{$2.gsub(/.*INSTALL.*DLLIB.*\n/, '')}"
- }
- if changed
- File.open('Makefile', 'wb') {|f| f.print mf}
- end
- end
+ FileEntry = FileUtils::Entry_ # :nodoc:
def self.build(extension, directory, dest_path, results, args=[])
+ 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 = #{dest_path.dump}"
+ f.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"
@@ -43,14 +31,20 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
run cmd, results
- hack_for_obsolete_style_gems directory
-
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)
+ end
+ end
+
results
ensure
ENV["RUBYOPT"] = rubyopt
siteconf.close(true) if siteconf
+ FileUtils.rm_rf tmp_dest if tmp_dest
end
end
diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb
index fcbe081593..cf35a534b9 100644
--- a/test/rubygems/test_gem_installer.rb
+++ b/test/rubygems/test_gem_installer.rb
@@ -1038,7 +1038,17 @@ gem 'other', version
RUBY
end
+ Dir.mkdir(File.join("lib", @spec.name))
+ rb2 = File.join("lib", @spec.name, "#{@spec.name}.rb")
+ @spec.files << rb2
+ write_file File.join(@tempdir, rb2) do |io|
+ io.write <<-RUBY
+ # #{@spec.name}/#{@spec.name}.rb
+ RUBY
+ end
+
assert !File.exist?(File.join(@spec.gem_dir, rb))
+ assert !File.exist?(File.join(@spec.gem_dir, rb2))
use_ui @ui do
path = Gem::Package.build @spec
@@ -1046,6 +1056,7 @@ gem 'other', version
@installer.install
end
assert File.exist?(File.join(@spec.gem_dir, rb))
+ assert File.exist?(File.join(@spec.gem_dir, rb2))
end
def test_install_extension_flat