[前][次][番号順一覧][スレッド一覧]

ruby-changes:19842

From: nobu <ko1@a...>
Date: Wed, 1 Jun 2011 15:41:00 +0900 (JST)
Subject: [ruby-changes:19842] nobu:r31889 (trunk): * tool/rbinstall.rb (gem): fix for rubygems change.

nobu	2011-06-01 15:40:55 +0900 (Wed, 01 Jun 2011)

  New Revision: 31889

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31889

  Log:
    * tool/rbinstall.rb (gem): fix for rubygems change.

  Modified files:
    trunk/ChangeLog
    trunk/tool/rbinstall.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31888)
+++ ChangeLog	(revision 31889)
@@ -1,3 +1,7 @@
+Wed Jun  1 15:40:46 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* tool/rbinstall.rb (gem): fix for rubygems change.
+
 Wed Jun  1 14:07:57 2011  Ryan Davis  <ryand-ruby@z...>
 
 	* lib/minitest/*: MOSTLY Imported minitest 2.2.1 (r6277)... One
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 31888)
+++ tool/rbinstall.rb	(revision 31889)
@@ -532,14 +532,10 @@
 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])

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]