lib/bundler.rb in bundler-1.6.0 vs lib/bundler.rb in bundler-1.6.1

@@ -163,11 +163,11 @@
         @locked_gems = nil
       end
     end
 
     def ruby_scope
-      "#{Bundler.rubygems.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
+      "#{Bundler.rubygems.ruby_engine}/#{Bundler.rubygems.config_map[:ruby_version]}"
     end
 
     def user_bundle_path
       Pathname.new(Bundler.rubygems.user_home).join(".bundler")
     end
@@ -201,11 +201,12 @@
     def app_cache(custom_path = nil)
       path = custom_path || root
       path.join("vendor/cache")
     end
 
-    def tmp
-      user_bundle_path.join("tmp", Process.pid.to_s)
+    def tmp(name = Process.pid.to_s)
+      @tmp ||= Pathname.new Dir.mktmpdir("bundler")
+      @tmp.join(name)
     end
 
     def settings
       @settings ||= begin
         Settings.new(app_config_path)