Fix `Bundler.settings.path`

- `File.expand_path`s may be unnecessary

2 files changed, 9 insertions, 5 deletions

diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index c7b0259a87..aca3a09286 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -160,11 +160,15 @@ module Bundler
     def path
       key  = key_for(:path)
       path = ENV[key] || @global_config[key]
-      return path if path && !@local_config.key?(key)
+
+      if path && !@local_config.key?(key)
+        path = "#{path}/#{Bundler.ruby_scope}" if path != Bundler.rubygems.gem_dir
+        return path
+      end
 
       if path = self[:path]
-        path == Bundler.rubygems.gem_dir ? path : "#{path}/#{Bundler.ruby_scope}"
-        path = File.expand_path(path)
+        path = "#{path}/#{Bundler.ruby_scope}" if path != Bundler.rubygems.gem_dir
+        File.expand_path(path)
       else
         File.join(@root, Bundler.ruby_scope)
       end
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 88bd92f1fb..d95f9181b5 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -126,7 +126,7 @@ module Bundler
             install_path = Bundler.tmp(spec.full_name)
             bin_path     = install_path.join("bin")
           else
-            install_path = Bundler.settings.path
+            install_path = File.expand_path(Bundler.settings.path)
             bin_path     = Bundler.system_bindir
           end
 
@@ -237,7 +237,7 @@ module Bundler
       end
 
       def loaded_from(spec)
-        "#{Bundler.settings.path}/specifications/#{spec.full_name}.gemspec"
+        "#{File.expand_path(Bundler.settings.path)}/specifications/#{spec.full_name}.gemspec"
       end
 
       def cached_gem(spec)