Update the bundler version with master branch

13 files changed, 32 insertions, 32 deletions

diff --git a/spec/bundler/support/artifice/compact_index.rb b/spec/bundler/support/artifice/compact_index.rb
index 72abf26224..67fd05f9a2 100644
--- a/spec/bundler/support/artifice/compact_index.rb
+++ b/spec/bundler/support/artifice/compact_index.rb
@@ -100,7 +100,7 @@ class CompactIndexAPI < Endpoint
   get "/versions" do
     etag_response do
       file = tmp("versions.list")
-      file.delete if file.file?
+      FileUtils.rm_f(file)
       file = CompactIndex::VersionsFile.new(file.to_s)
       file.create(gems)
       file.contents
diff --git a/spec/bundler/support/artifice/compact_index_concurrent_download.rb b/spec/bundler/support/artifice/compact_index_concurrent_download.rb
index 7f989a3f37..14c31f35a4 100644
--- a/spec/bundler/support/artifice/compact_index_concurrent_download.rb
+++ b/spec/bundler/support/artifice/compact_index_concurrent_download.rb
@@ -10,7 +10,7 @@ class CompactIndexConcurrentDownload < CompactIndexAPI
       "localgemserver.test.80.dd34752a738ee965a2a4298dc16db6c5", "versions")
 
     # Verify the original (empty) content hasn't been deleted, e.g. on a retry
-    File.read(versions) == "" || raise("Original file should be present and empty")
+    File.binread(versions) == "" || raise("Original file should be present and empty")
 
     # Verify this is only requested once for a partial download
     env["HTTP_RANGE"] || raise("Missing Range header for expected partial download")
@@ -21,7 +21,7 @@ class CompactIndexConcurrentDownload < CompactIndexAPI
 
     etag_response do
       file = tmp("versions.list")
-      file.delete if file.file?
+      FileUtils.rm_f(file)
       file = CompactIndex::VersionsFile.new(file.to_s)
       file.create(gems)
       file.contents
diff --git a/spec/bundler/support/artifice/compact_index_creds_diff_host.rb b/spec/bundler/support/artifice/compact_index_creds_diff_host.rb
index 6c3442e14b..cfe22c7f51 100644
--- a/spec/bundler/support/artifice/compact_index_creds_diff_host.rb
+++ b/spec/bundler/support/artifice/compact_index_creds_diff_host.rb
@@ -31,7 +31,7 @@ class CompactIndexCredsDiffHost < CompactIndexAPI
 
   get "/no/creds/:id" do
     if request.host.include?("diffhost") && !auth.provided?
-      File.read("#{gem_repo1}/gems/#{params[:id]}")
+      File.binread("#{gem_repo1}/gems/#{params[:id]}")
     end
   end
 end
diff --git a/spec/bundler/support/artifice/compact_index_extra.rb b/spec/bundler/support/artifice/compact_index_extra.rb
index 3a09afd06f..cec368276a 100644
--- a/spec/bundler/support/artifice/compact_index_extra.rb
+++ b/spec/bundler/support/artifice/compact_index_extra.rb
@@ -14,11 +14,11 @@ class CompactIndexExtra < CompactIndexAPI
   end
 
   get "/extra/specs.4.8.gz" do
-    File.read("#{gem_repo2}/specs.4.8.gz")
+    File.binread("#{gem_repo2}/specs.4.8.gz")
   end
 
   get "/extra/prerelease_specs.4.8.gz" do
-    File.read("#{gem_repo2}/prerelease_specs.4.8.gz")
+    File.binread("#{gem_repo2}/prerelease_specs.4.8.gz")
   end
 
   get "/extra/quick/Marshal.4.8/:id" do
@@ -26,11 +26,11 @@ class CompactIndexExtra < CompactIndexAPI
   end
 
   get "/extra/fetch/actual/gem/:id" do
-    File.read("#{gem_repo2}/quick/Marshal.4.8/#{params[:id]}")
+    File.binread("#{gem_repo2}/quick/Marshal.4.8/#{params[:id]}")
   end
 
   get "/extra/gems/:id" do
-    File.read("#{gem_repo2}/gems/#{params[:id]}")
+    File.binread("#{gem_repo2}/gems/#{params[:id]}")
   end
 end
 
diff --git a/spec/bundler/support/artifice/compact_index_extra_api.rb b/spec/bundler/support/artifice/compact_index_extra_api.rb
index 3c716763c0..5cc13421a8 100644
--- a/spec/bundler/support/artifice/compact_index_extra_api.rb
+++ b/spec/bundler/support/artifice/compact_index_extra_api.rb
@@ -14,7 +14,7 @@ class CompactIndexExtraApi < CompactIndexAPI
   get "/extra/versions" do
     etag_response do
       file = tmp("versions.list")
-      file.delete if file.file?
+      FileUtils.rm_f(file)
       file = CompactIndex::VersionsFile.new(file.to_s)
       file.create(gems(gem_repo4))
       file.contents
@@ -29,11 +29,11 @@ class CompactIndexExtraApi < CompactIndexAPI
   end
 
   get "/extra/specs.4.8.gz" do
-    File.read("#{gem_repo4}/specs.4.8.gz")
+    File.binread("#{gem_repo4}/specs.4.8.gz")
   end
 
   get "/extra/prerelease_specs.4.8.gz" do
-    File.read("#{gem_repo4}/prerelease_specs.4.8.gz")
+    File.binread("#{gem_repo4}/prerelease_specs.4.8.gz")
   end
 
   get "/extra/quick/Marshal.4.8/:id" do
@@ -41,11 +41,11 @@ class CompactIndexExtraApi < CompactIndexAPI
   end
 
   get "/extra/fetch/actual/gem/:id" do
-    File.read("#{gem_repo4}/quick/Marshal.4.8/#{params[:id]}")
+    File.binread("#{gem_repo4}/quick/Marshal.4.8/#{params[:id]}")
   end
 
   get "/extra/gems/:id" do
-    File.read("#{gem_repo4}/gems/#{params[:id]}")
+    File.binread("#{gem_repo4}/gems/#{params[:id]}")
   end
 end
 
diff --git a/spec/bundler/support/artifice/compact_index_partial_update.rb b/spec/bundler/support/artifice/compact_index_partial_update.rb
index 6e7c05d423..cb1c7b9481 100644
--- a/spec/bundler/support/artifice/compact_index_partial_update.rb
+++ b/spec/bundler/support/artifice/compact_index_partial_update.rb
@@ -18,19 +18,19 @@ class CompactIndexPartialUpdate < CompactIndexAPI
     )
 
     # Verify a cached copy of the versions file exists
-    unless File.read(cached_versions_path).start_with?("created_at: ")
+    unless File.binread(cached_versions_path).start_with?("created_at: ")
       raise("Cached versions file should be present and have content")
     end
 
     # Verify that a partial request is made, starting from the index of the
     # final byte of the cached file.
-    unless env["HTTP_RANGE"] == "bytes=#{File.read(cached_versions_path).bytesize - 1}-"
+    unless env["HTTP_RANGE"] == "bytes=#{File.binread(cached_versions_path).bytesize - 1}-"
       raise("Range header should be present, and start from the index of the final byte of the cache.")
     end
 
     etag_response do
       # Return the exact contents of the cache.
-      File.read(cached_versions_path)
+      File.binread(cached_versions_path)
     end
   end
 end
diff --git a/spec/bundler/support/artifice/compact_index_range_not_satisfiable.rb b/spec/bundler/support/artifice/compact_index_range_not_satisfiable.rb
index 788f9d6f99..bb616125bb 100644
--- a/spec/bundler/support/artifice/compact_index_range_not_satisfiable.rb
+++ b/spec/bundler/support/artifice/compact_index_range_not_satisfiable.rb
@@ -11,7 +11,7 @@ class CompactIndexRangeNotSatisfiable < CompactIndexAPI
     else
       etag_response do
         file = tmp("versions.list")
-        file.delete if file.file?
+        FileUtils.rm_f(file)
         file = CompactIndex::VersionsFile.new(file.to_s)
         file.create(gems)
         file.contents
diff --git a/spec/bundler/support/artifice/endpoint.rb b/spec/bundler/support/artifice/endpoint.rb
index 7f4cafc239..3ed9a3f0f7 100644
--- a/spec/bundler/support/artifice/endpoint.rb
+++ b/spec/bundler/support/artifice/endpoint.rb
@@ -77,11 +77,11 @@ class Endpoint < Sinatra::Base
   end
 
   get "/fetch/actual/gem/:id" do
-    File.read("#{GEM_REPO}/quick/Marshal.4.8/#{params[:id]}")
+    File.binread("#{GEM_REPO}/quick/Marshal.4.8/#{params[:id]}")
   end
 
   get "/gems/:id" do
-    File.read("#{GEM_REPO}/gems/#{params[:id]}")
+    File.binread("#{GEM_REPO}/gems/#{params[:id]}")
   end
 
   get "/api/v1/dependencies" do
@@ -89,11 +89,11 @@ class Endpoint < Sinatra::Base
   end
 
   get "/specs.4.8.gz" do
-    File.read("#{GEM_REPO}/specs.4.8.gz")
+    File.binread("#{GEM_REPO}/specs.4.8.gz")
   end
 
   get "/prerelease_specs.4.8.gz" do
-    File.read("#{GEM_REPO}/prerelease_specs.4.8.gz")
+    File.binread("#{GEM_REPO}/prerelease_specs.4.8.gz")
   end
 end
 
diff --git a/spec/bundler/support/artifice/endpoint_creds_diff_host.rb b/spec/bundler/support/artifice/endpoint_creds_diff_host.rb
index f20ef74ac6..8b8972cedd 100644
--- a/spec/bundler/support/artifice/endpoint_creds_diff_host.rb
+++ b/spec/bundler/support/artifice/endpoint_creds_diff_host.rb
@@ -31,7 +31,7 @@ class EndpointCredsDiffHost < Endpoint
 
   get "/no/creds/:id" do
     if request.host.include?("diffhost") && !auth.provided?
-      File.read("#{gem_repo1}/gems/#{params[:id]}")
+      File.binread("#{gem_repo1}/gems/#{params[:id]}")
     end
   end
 end
diff --git a/spec/bundler/support/artifice/endpoint_extra.rb b/spec/bundler/support/artifice/endpoint_extra.rb
index 31f6822161..942c4352b7 100644
--- a/spec/bundler/support/artifice/endpoint_extra.rb
+++ b/spec/bundler/support/artifice/endpoint_extra.rb
@@ -10,11 +10,11 @@ class EndpointExtra < Endpoint
   end
 
   get "/extra/specs.4.8.gz" do
-    File.read("#{gem_repo2}/specs.4.8.gz")
+    File.binread("#{gem_repo2}/specs.4.8.gz")
   end
 
   get "/extra/prerelease_specs.4.8.gz" do
-    File.read("#{gem_repo2}/prerelease_specs.4.8.gz")
+    File.binread("#{gem_repo2}/prerelease_specs.4.8.gz")
   end
 
   get "/extra/quick/Marshal.4.8/:id" do
@@ -22,11 +22,11 @@ class EndpointExtra < Endpoint
   end
 
   get "/extra/fetch/actual/gem/:id" do
-    File.read("#{gem_repo2}/quick/Marshal.4.8/#{params[:id]}")
+    File.binread("#{gem_repo2}/quick/Marshal.4.8/#{params[:id]}")
   end
 
   get "/extra/gems/:id" do
-    File.read("#{gem_repo2}/gems/#{params[:id]}")
+    File.binread("#{gem_repo2}/gems/#{params[:id]}")
   end
 end
 
diff --git a/spec/bundler/support/artifice/endpoint_extra_api.rb b/spec/bundler/support/artifice/endpoint_extra_api.rb
index 213b8e5895..1cfef7a7fc 100644
--- a/spec/bundler/support/artifice/endpoint_extra_api.rb
+++ b/spec/bundler/support/artifice/endpoint_extra_api.rb
@@ -11,11 +11,11 @@ class EndpointExtraApi < Endpoint
   end
 
   get "/extra/specs.4.8.gz" do
-    File.read("#{gem_repo4}/specs.4.8.gz")
+    File.binread("#{gem_repo4}/specs.4.8.gz")
   end
 
   get "/extra/prerelease_specs.4.8.gz" do
-    File.read("#{gem_repo4}/prerelease_specs.4.8.gz")
+    File.binread("#{gem_repo4}/prerelease_specs.4.8.gz")
   end
 
   get "/extra/quick/Marshal.4.8/:id" do
@@ -23,11 +23,11 @@ class EndpointExtraApi < Endpoint
   end
 
   get "/extra/fetch/actual/gem/:id" do
-    File.read("#{gem_repo4}/quick/Marshal.4.8/#{params[:id]}")
+    File.binread("#{gem_repo4}/quick/Marshal.4.8/#{params[:id]}")
   end
 
   get "/extra/gems/:id" do
-    File.read("#{gem_repo4}/gems/#{params[:id]}")
+    File.binread("#{gem_repo4}/gems/#{params[:id]}")
   end
 end
 
diff --git a/spec/bundler/support/artifice/endpoint_mirror_source.rb b/spec/bundler/support/artifice/endpoint_mirror_source.rb
index 318866e420..788a9027f3 100644
--- a/spec/bundler/support/artifice/endpoint_mirror_source.rb
+++ b/spec/bundler/support/artifice/endpoint_mirror_source.rb
@@ -5,7 +5,7 @@ require_relative "endpoint"
 class EndpointMirrorSource < Endpoint
   get "/gems/:id" do
     if request.env["HTTP_X_GEMFILE_SOURCE"] == "https://server.example.org/"
-      File.read("#{gem_repo1}/gems/#{params[:id]}")
+      File.binread("#{gem_repo1}/gems/#{params[:id]}")
     else
       halt 500
     end
diff --git a/spec/bundler/support/artifice/vcr.rb b/spec/bundler/support/artifice/vcr.rb
index a46f8e9391..150436f0e3 100644
--- a/spec/bundler/support/artifice/vcr.rb
+++ b/spec/bundler/support/artifice/vcr.rb
@@ -79,7 +79,7 @@ class BundlerVCRHTTP < Net::HTTP
     end
 
     def read_stored_request(path)
-      contents = File.read(path)
+      contents = File.binread(path)
       headers = {}
       method = nil
       path = nil