1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/rubygems: Update to RubyGems master baa965b. Notable changes:

Browse Source 
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
This commit is contained in:
drbrain 2013-12-01 20:52:57 +00:00
parent 46e44fb628
commit 673efdceef
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> Mon Dec 2 02:03:47 2013 Shota Fukumori <her@sorah.jp>
* test/ruby/test_case.rb (test_nomethoderror): * test/ruby/test_case.rb (test_nomethoderror):

8
lib/rubygems/ext/ext_conf_builder.rb
View File

@ -43,13 +43,15 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
make dest_path, results make dest_path, results
if tmp_dest if tmp_dest
FileEntry.new(tmp_dest).traverse do |ent|
# TODO remove in RubyGems 3 # TODO remove in RubyGems 3
if lib_dir then if lib_dir then
libent = ent.class.new lib_dir, ent.rel FileUtils.mkdir_p lib_dir
libent.exist? or ent.copy libent.path entries = Dir.entries(tmp_dest) - %w[. ..]
entries = entries.map { |entry| File.join tmp_dest, entry }
FileUtils.cp_r entries, lib_dir
end end
FileEntry.new(tmp_dest).traverse do |ent|
destent = ent.class.new(dest_path, ent.rel) destent = ent.class.new(dest_path, ent.rel)
destent.exist? or File.rename(ent.path, destent.path) destent.exist? or File.rename(ent.path, destent.path)
end end

3
test/rubygems/test_gem_ext_builder.rb
View File

@ -117,6 +117,8 @@ install:
ext_lib_dir = File.join ext_dir, 'lib' ext_lib_dir = File.join ext_dir, 'lib'
FileUtils.mkdir ext_lib_dir FileUtils.mkdir ext_lib_dir
FileUtils.touch File.join ext_lib_dir, 'a.rb' 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 use_ui @ui do
@builder.build_extensions @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, 'gem_make.out'
assert_path_exists File.join @spec.extension_install_dir, 'a.rb' 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.rb'
assert_path_exists File.join @spec.gem_dir, 'lib', 'a', 'b.rb'
end end
def test_build_extensions_none def test_build_extensions_none