summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-12-13 19:03:52 +0000
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-12-13 20:43:15 +0100
commitd1c4e5dc26468fb4127ae5dbdb2db4751b5970d3 (patch)
tree86bac0945b7ed483ca2f704b65e13dca30c009e2
parentfc867e3f1c58b0dc84d3b4446f62f73d8ab01af6 (diff)
downloadbundler-d1c4e5dc26468fb4127ae5dbdb2db4751b5970d3.tar.gz
Merge #7478
7478: Revert "Write & read dummy gems binarily" r=deivid-rodriguez a=deivid-rodriguez This reverts commit f11c4757a17bea029e1a83ad67c425ccf16133ff. ### What was the end-user problem that led to this PR? The problem was that since #7451, azure logs are flooded with messages like ``` The file will have its original line endings in your working directory warning: LF will be replaced by CRLF in foo.gemspec. ``` This makes it hard to scan for other potential errors. ### What was your diagnosis of the problem? My diagnosis was that some commit in that PR introduced this warnings. ### What is your fix for the problem, implemented in this PR? My fix is to revert the offending commit. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net> (cherry picked from commit f143253656981d64fac8b3c781172c716e3a3f4e)
-rw-r--r--spec/install/redownload_spec.rb2
-rw-r--r--spec/support/builders.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/install/redownload_spec.rb b/spec/install/redownload_spec.rb
index c880b8bb15..818c33bd61 100644
--- a/spec/install/redownload_spec.rb
+++ b/spec/install/redownload_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe "bundle install" do
bundle! :install, flag => true
expect(out).to include "Installing rack 1.0.0"
- expect(rack_lib.binread).to eq("RACK = '1.0.0'\n")
+ expect(rack_lib.open(&:read)).to eq("RACK = '1.0.0'\n")
expect(the_bundle).to include_gems "rack 1.0.0"
end
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index 331c0d11d2..c7f299487c 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -620,7 +620,7 @@ module Spec
@files.each do |file, source|
file = Pathname.new(path).join(file)
FileUtils.mkdir_p(file.dirname)
- File.open(file, "wb") {|f| f.puts source }
+ File.open(file, "w") {|f| f.puts source }
end
@spec.files = @files.keys
path