Namespace the default bundle path to support with the ruby engine and…

… version.
ariejan · Feb 12, 2010 · 58b31d8 · 58b31d8
1 parent 4d8a76f
commit 58b31d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/bundler.rb b/lib/bundler.rb
@@ -56,7 +56,7 @@ def ui
 
     def bundle_path
       @bundle_path ||= begin
-        path = settings[:path] || "#{Gem.user_home}/.bundle"
+        path = settings[:path] || "#{Gem.user_home}/.bundle/#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
         Pathname.new(path).expand_path(root)
       end
     end

diff --git a/spec/install/gems_spec.rb b/spec/install/gems_spec.rb
@@ -16,6 +16,7 @@
       gem 'rack'
     G
 
+    home(".bundle/#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}/gems/rack-1.0.0").should exist
     should_be_installed("rack 1.0.0")
   end
 

diff --git a/spec/support/path.rb b/spec/support/path.rb
@@ -8,8 +8,8 @@ def tmp(*path)
       root.join("tmp", *path)
     end
 
-    def home
-      tmp.join("home")
+    def home(*path)
+      tmp.join("home", *path)
     end
 
     def bundled_app(*path)