Merge branch '1-0-stable'

Conflicts:
	CHANGELOG.md

4 files changed, 13 insertions, 13 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc9db8b6c..9fc3dc5d2c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,7 +43,7 @@ Removed:
   - Removed bundle install --production
   - Removed bundle install --disable-shared-gems
 
-## 1.0.13 (April 30, 2011)
+## 1.0.13 (May 4, 2011)
 
 Features:
 
@@ -55,6 +55,8 @@ Features:
 Bugfixes:
 
   - Allow spaces in gem path names for gem tasks (@rslifka)
+  - Have cap run bundle install from release_path (@martinjagusch)
+  - Quote git refspec so zsh doesn't expand it (@goneflyin)
 
 ## 1.0.12 (April 8, 2011)
 
diff --git a/lib/bundler/deployment.rb b/lib/bundler/deployment.rb
index d51c628172..727f357e7e 100644
--- a/lib/bundler/deployment.rb
+++ b/lib/bundler/deployment.rb
@@ -45,7 +45,7 @@ module Bundler
           args << bundle_flags.to_s
           args << "--without #{bundle_without.join(" ")}" unless bundle_without.empty?
 
-          run "#{bundle_cmd} install #{args.join(' ')}"
+          run "cd #{context.fetch(:current_release)} && #{bundle_cmd} install #{args.join(' ')}"
         end
       end
     end
diff --git a/lib/bundler/rubygems_ext.rb b/lib/bundler/rubygems_ext.rb
index 21fe487dd9..111c26a121 100644
--- a/lib/bundler/rubygems_ext.rb
+++ b/lib/bundler/rubygems_ext.rb
@@ -39,6 +39,11 @@ module Gem
       end
     end
 
+    # RubyGems 1.8+ used only.
+    def gem_dir
+      full_gem_path
+    end
+
     def groups
       @groups ||= []
     end
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 59d9f61783..57ef1b9d81 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -14,7 +14,7 @@ module Bundler
     end
 
     def path(obj)
-      Gem::Path.path(obj)
+      obj.to_s
     end
 
     def platforms
@@ -58,8 +58,9 @@ module Bundler
     end
 
     def gem_path
-      # Convert Gem::FS from Rubygems >= 1.8 into strings
-      Gem.path.map{|p| p.to_s }
+      # Make sure that Gem.path is an array of Strings, not some
+      # internal Rubygems object
+      Gem.path.map { |x| x.to_s }
     end
 
     def marshal_spec_dir
@@ -251,10 +252,6 @@ module Bundler
         stub_source_index137(specs)
       end
 
-      def path(obj)
-        obj.to_s
-      end
-
       def all_specs
         Gem.source_index.all_gems.values
       end
@@ -268,10 +265,6 @@ module Bundler
       def stub_rubygems(specs)
         stub_source_index170(specs)
       end
-
-      def path(obj)
-        obj.to_s
-      end
     end
 
   end