yugui	2009-07-30 23:12:42 +0900 (Thu, 30 Jul 2009)

  New Revision: 24328

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

  Log:
    * gem_prelude.rb (Gem.path): uses Gem.default_path as a default value
      so that ruby finds gems in ~/.gem/.
      (Gem.user_home): reduced version of lib/rubygems.rb's.
      Gem.default_path needs it.

  Modified files:
    trunk/ChangeLog
    trunk/gem_prelude.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24327)
+++ ChangeLog	(revision 24328)
@@ -1,3 +1,10 @@
+Thu Jul 30 23:04:32 2009  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* gem_prelude.rb (Gem.path): uses Gem.default_path as a default value
+	  so that ruby finds gems in ~/.gem/.
+	  (Gem.user_home): reduced version of lib/rubygems.rb's.
+	  Gem.default_path needs it.
+
 Thu Jul 30 22:28:04 2009  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* tool/compile_prelude.rb: replaces "require" with in-place evaluation
Index: gem_prelude.rb
===================================================================
--- gem_prelude.rb	(revision 24327)
+++ gem_prelude.rb	(revision 24328)
@@ -42,7 +42,7 @@
     def self.path
       @gem_path ||= nil
       unless @gem_path
-        paths = [ENV['GEM_PATH']]
+        paths = [ENV['GEM_PATH'] || default_path]
         paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
         set_paths(paths.compact.join(File::PATH_SEPARATOR))
       end
@@ -89,6 +89,16 @@
       @gem_path.uniq!
     end
 
+    def self.user_home
+      @user_home ||= File.expand_path("~")
+    rescue
+      if File::ALT_SEPARATOR then
+        "C:/"
+      else
+        "/"
+      end
+    end
+
     # begin rubygems/defaults
     # NOTE: this require will be replaced with in-place eval before compilation.
     require 'lib/rubygems/defaults.rb'

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