diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-01 06:40:55 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-01 06:40:55 +0000 |
commit | 19a8b5cbdc71383e4143d69c9fdb8e97928023d5 (patch) | |
tree | 16614f0723d292be83e3289e47bcf86b0fb471c6 | |
parent | f964813967d3fe89b35996dfeeb868710062e513 (diff) | |
download | ruby-19a8b5cbdc71383e4143d69c9fdb8e97928023d5.tar.gz |
* tool/rbinstall.rb (gem): fix for rubygems change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | tool/rbinstall.rb | 12 |
2 files changed, 8 insertions, 8 deletions
@@ -1,3 +1,7 @@ +Wed Jun 1 15:40:46 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/rbinstall.rb (gem): fix for rubygems change. + Wed Jun 1 14:07:57 2011 Ryan Davis <ryand-ruby@zenspider.com> * lib/minitest/*: MOSTLY Imported minitest 2.2.1 (r6277)... One diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 6234f6fe47..f0a08b8ebd 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -532,14 +532,10 @@ install?(:local, :comm, :man) do end install?(:ext, :comm, :gem) do - directories = [] - IO.foreach(File.join(srcdir, "lib/rubygems.rb")) do |line| - if /^\s*DIRECTORIES\s*=\s*%w\[(.*?)\]/ =~ line - directories = $1.split - break - end - end - gpath = CONFIG["sitelibdir"].sub(%r'/site_ruby/(?=[^/]+)', '/gems/') + $:.unshift(File.join(srcdir, "lib")) + require("rubygems.rb") + gpath = Gem.default_dir + directories = Gem.ensure_gem_subdirectories(gpath) prepare "default gems", gpath, directories destdir = File.join(gpath, directories.grep(/^spec/)[0]) |