summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-01 20:52:57 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-01 20:52:57 +0000
commit673efdceef8ab206b4220dcbf5beb2df3dd2fa66 (patch)
treef96c5a8dae105e24e24cf8e661209e8ad0dc0275
parent46e44fb6289bf829331d9e35fc1d3084443b5bcf (diff)
* lib/rubygems: Update to RubyGems master baa965b. Notable changes:
Copy directories to lib/ when installing extensions. This completes the fix for [ruby-trunk - Bug #9106] * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--lib/rubygems/ext/ext_conf_builder.rb14
-rw-r--r--test/rubygems/test_gem_ext_builder.rb3
3 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7487299..ea69988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Dec 2 05:52:33 2013 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems: Update to RubyGems master baa965b. Notable changes:
+
+ Copy directories to lib/ when installing extensions. This completes
+ the fix for [ruby-trunk - Bug #9106]
+
+ * test/rubygems: ditto.
+
Mon Dec 2 02:03:47 2013 Shota Fukumori <her@sorah.jp>
* test/ruby/test_case.rb (test_nomethoderror):
diff --git a/lib/rubygems/ext/ext_conf_builder.rb b/lib/rubygems/ext/ext_conf_builder.rb
index 6e736d8..84d4609 100644
--- a/lib/rubygems/ext/ext_conf_builder.rb
+++ b/lib/rubygems/ext/ext_conf_builder.rb
@@ -43,13 +43,15 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
make dest_path, results
if tmp_dest
- FileEntry.new(tmp_dest).traverse do |ent|
- # TODO remove in RubyGems 3
- if lib_dir then
- libent = ent.class.new lib_dir, ent.rel
- libent.exist? or ent.copy libent.path
- end
+ # TODO remove in RubyGems 3
+ if lib_dir then
+ FileUtils.mkdir_p lib_dir
+ entries = Dir.entries(tmp_dest) - %w[. ..]
+ entries = entries.map { |entry| File.join tmp_dest, entry }
+ FileUtils.cp_r entries, lib_dir
+ end
+ 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
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb
index 3da9bc9..fc6bbe4 100644
--- a/test/rubygems/test_gem_ext_builder.rb
+++ b/test/rubygems/test_gem_ext_builder.rb
@@ -117,6 +117,8 @@ install:
ext_lib_dir = File.join ext_dir, 'lib'
FileUtils.mkdir ext_lib_dir
FileUtils.touch File.join ext_lib_dir, 'a.rb'
+ FileUtils.mkdir File.join ext_lib_dir, 'a'
+ FileUtils.touch File.join ext_lib_dir, 'a', 'b.rb'
use_ui @ui do
@builder.build_extensions
@@ -127,6 +129,7 @@ install:
assert_path_exists File.join @spec.extension_install_dir, 'gem_make.out'
assert_path_exists File.join @spec.extension_install_dir, 'a.rb'
assert_path_exists File.join @spec.gem_dir, 'lib', 'a.rb'
+ assert_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
end
def test_build_extensions_none