diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-16 14:02:03 +0200 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-16 14:02:03 +0200 |
commit | 5531a18c1e0456ac1c1e8f648442c5f79b65c8e5 (patch) | |
tree | 8abf3a5673e8d6d7b3be0424cdc55007e6610b16 | |
parent | a05250c09d76ee3fca1eb2369ad9099918673244 (diff) | |
download | bundler-fix_bundle_doctor.tar.gz |
Fix `bundle doctor` commandfix_bundle_doctor
Previously `bundle doctor` would fail on any bundle that does not
include git gems or plugins. This is because the previously used
`Bundler.home` does not exist unless the bundle includes git gems or
plugins. For example, with `bundle config set path .bundle`, it points
to which does not exist unless this kind of gems exist in the Gemfile.
The name `Bundler.home` is really unfortunate, it should probably be
have more descriptive name, and be private. But for now I just want to
make `bundle doctor` usable.
-rw-r--r-- | lib/bundler/cli/doctor.rb | 2 | ||||
-rw-r--r-- | spec/commands/doctor_spec.rb | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/bundler/cli/doctor.rb b/lib/bundler/cli/doctor.rb index 1b3913a300..fcf139ed1e 100644 --- a/lib/bundler/cli/doctor.rb +++ b/lib/bundler/cli/doctor.rb @@ -100,7 +100,7 @@ module Bundler files_not_readable_or_writable = [] files_not_rw_and_owned_by_different_user = [] files_not_owned_by_current_user_but_still_rw = [] - Find.find(Bundler.home.to_s).each do |f| + Find.find(Bundler.bundle_path.to_s).each do |f| if !File.writable?(f) || !File.readable?(f) if File.stat(f).uid != Process.uid files_not_rw_and_owned_by_different_user << f diff --git a/spec/commands/doctor_spec.rb b/spec/commands/doctor_spec.rb index 4198678baa..d829f00092 100644 --- a/spec/commands/doctor_spec.rb +++ b/spec/commands/doctor_spec.rb @@ -22,11 +22,17 @@ RSpec.describe "bundle doctor" do end end + it "succeeds on a sane installation" do + bundle :doctor + + expect(exitstatus).to eq(0) + end + context "when all files in home are readable/writable" do before(:each) do stat = double("stat") unwritable_file = double("file") - allow(Find).to receive(:find).with(Bundler.home.to_s) { [unwritable_file] } + allow(Find).to receive(:find).with(Bundler.bundle_path.to_s) { [unwritable_file] } allow(File).to receive(:stat).with(unwritable_file) { stat } allow(stat).to receive(:uid) { Process.uid } allow(File).to receive(:writable?).with(unwritable_file) { true } @@ -66,7 +72,7 @@ RSpec.describe "bundle doctor" do before(:each) do @stat = double("stat") @unwritable_file = double("file") - allow(Find).to receive(:find).with(Bundler.home.to_s) { [@unwritable_file] } + allow(Find).to receive(:find).with(Bundler.bundle_path.to_s) { [@unwritable_file] } allow(File).to receive(:stat).with(@unwritable_file) { @stat } end |