Merge release version of bundler-1.16.1 from upstream.

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

2 files changed, 7 insertions, 1 deletions

diff --git a/spec/bundler/support/hax.rb b/spec/bundler/support/hax.rb
index aee55a0ac9..b14e4a5943 100644
--- a/spec/bundler/support/hax.rb
+++ b/spec/bundler/support/hax.rb
@@ -12,6 +12,12 @@ module Gem
     @local = new(ENV["BUNDLER_SPEC_PLATFORM"]) if ENV["BUNDLER_SPEC_PLATFORM"]
   end
   @platforms = [Gem::Platform::RUBY, Gem::Platform.local]
+
+  if defined?(@path_to_default_spec_map) && !ENV["BUNDLER_SPEC_KEEP_DEFAULT_BUNDLER_GEM"]
+    @path_to_default_spec_map.delete_if do |_path, spec|
+      spec.name == "bundler"
+    end
+  end
 end
 
 if ENV["BUNDLER_SPEC_VERSION"]
diff --git a/spec/bundler/support/helpers.rb b/spec/bundler/support/helpers.rb
index 01ddb49977..5f77ce6be9 100644
--- a/spec/bundler/support/helpers.rb
+++ b/spec/bundler/support/helpers.rb
@@ -220,7 +220,7 @@ module Spec
 
     def rake
       if ENV['BUNDLE_RUBY'] && ENV['BUNDLE_GEM']
-        "#{ENV['BUNDLE_RUBY']} #{ENV['GEM_PATH']}/bin/rake"
+        "'#{ENV['BUNDLE_RUBY']}' -S '#{ENV['GEM_PATH']}/bin/rake'"
       else
         'rake'
       end