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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 12 insertions, 2 deletions

diff --git a/gem_prelude.rb b/gem_prelude.rb
index 4eb0e4e304..b5da35e186 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -42,7 +42,7 @@ if defined?(Gem) then
     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 @@ if defined?(Gem) then
     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  ||= []