yugui	2009-08-08 19:56:38 +0900 (Sat, 08 Aug 2009)

  New Revision: 24452

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

  Log:
    merges r24328 from trunk into ruby_1_9_1.
    --
    * 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:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/gem_prelude.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24451)
+++ ruby_1_9_1/ChangeLog	(revision 24452)
@@ -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 21:39:42 2009  Yusuke Endoh  <mame@t...>
 
 	* compile.c (iseq_compile_each): fix stack consistency error.
Index: ruby_1_9_1/gem_prelude.rb
===================================================================
--- ruby_1_9_1/gem_prelude.rb	(revision 24451)
+++ ruby_1_9_1/gem_prelude.rb	(revision 24452)
@@ -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
@@ -84,7 +84,17 @@
     def self.ensure_gem_subdirectories(path)
     end
 
-  
+    def self.user_home
+      @user_home ||= File.expand_path("~")
+    rescue
+      if File::ALT_SEPARATOR then
+        "C:/"
+      else
+        "/"
+      end
+    end
+
+
     @post_install_hooks   ||= []
     @post_uninstall_hooks ||= []
     @pre_uninstall_hooks  ||= []
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24451)
+++ ruby_1_9_1/version.h	(revision 24452)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 257
+#define RUBY_PATCHLEVEL 258
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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