Import rubygems 1.8.5 (released @ 137c80f)

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

1 files changed, 30 insertions, 14 deletions

diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
index 63ccd85e2a..714dc4fb2f 100644
--- a/lib/rubygems/defaults.rb
+++ b/lib/rubygems/defaults.rb
@@ -6,6 +6,8 @@
 
 module Gem
 
+  # TODO: move this whole file back into rubygems.rb
+
   @post_install_hooks   ||= []
   @post_uninstall_hooks ||= []
   @pre_uninstall_hooks  ||= []
@@ -23,16 +25,28 @@ module Gem
   # specified in the environment
 
   def self.default_dir
-    if defined? RUBY_FRAMEWORK_VERSION then
-      File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
-                ConfigMap[:ruby_version]
-    elsif ConfigMap[:rubylibprefix] then
-      File.join(ConfigMap[:rubylibprefix], 'gems',
-                ConfigMap[:ruby_version])
-    else
-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-                ConfigMap[:ruby_version])
-    end
+    path = if defined? RUBY_FRAMEWORK_VERSION then
+             [
+               File.dirname(ConfigMap[:sitedir]),
+               'Gems',
+               ConfigMap[:ruby_version]
+             ]
+           elsif ConfigMap[:rubylibprefix] then
+             [
+              ConfigMap[:rubylibprefix],
+              'gems',
+              ConfigMap[:ruby_version]
+             ]
+           else
+             [
+               ConfigMap[:libdir],
+               ruby_engine,
+               'gems',
+               ConfigMap[:ruby_version]
+             ]
+           end
+
+    @default_dir ||= File.join(*path)
   end
 
   ##
@@ -82,14 +96,18 @@ module Gem
   # The default system-wide source info cache directory
 
   def self.default_system_source_cache_dir
-    File.join Gem.dir, 'source_cache'
+    File.join(Gem.dir, 'source_cache')
   end
 
   ##
   # The default user-specific source info cache directory
 
   def self.default_user_source_cache_dir
-    File.join Gem.user_home, '.gem', 'source_cache'
+    #
+    # NOTE Probably an argument for moving this to per-ruby supported dirs like
+    # user_dir
+    #
+    File.join(Gem.user_home, '.gem', 'source_cache')
   end
 
   ##
@@ -102,6 +120,4 @@ module Gem
       'ruby'
     end
   end
-
 end
-