Update bundled bundler to 1.16.0.

  * lib/bundler, spec/bundler: Merge bundler-1.16.0.
  * common.mk: rspec examples of bundler-1.16.0 needs require option.

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

1 files changed, 5 insertions, 6 deletions

diff --git a/spec/bundler/commands/show_spec.rb b/spec/bundler/commands/show_spec.rb
index fc34831a72..adbf289fd0 100644
--- a/spec/bundler/commands/show_spec.rb
+++ b/spec/bundler/commands/show_spec.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
-require "spec_helper"
 
-RSpec.describe "bundle show" do
+RSpec.describe "bundle show", :bundler => "< 2" do
   context "with a standard Gemfile" do
     before :each do
       install_gemfile <<-G
@@ -32,15 +31,15 @@ RSpec.describe "bundle show" do
     end
 
     it "warns if path no longer exists on disk" do
-      FileUtils.rm_rf("#{system_gem_path}/gems/rails-2.3.2")
+      FileUtils.rm_rf(default_bundle_path("gems", "rails-2.3.2"))
 
       bundle "show rails"
 
-      expect(out).to match(/has been deleted/i)
-      expect(out).to include(default_bundle_path("gems", "rails-2.3.2").to_s)
+      expect(out).to match(/has been deleted/i).
+        and include(default_bundle_path("gems", "rails-2.3.2").to_s)
     end
 
-    it "prints the path to the running bundler" do
+    it "prints the path to the running bundler", :ruby_repo do
       bundle "show bundler"
       expect(out).to eq(root.to_s)
     end