diff options
author | The Bundler Bot <bot@bundler.io> | 2016-12-24 20:30:09 +0000 |
---|---|---|
committer | The Bundler Bot <bot@bundler.io> | 2016-12-24 20:30:09 +0000 |
commit | 44dc252655d89f8ac601a4758f0571a3629bbfe0 (patch) | |
tree | 3a0d0bce05ca6ef4c87aef76535e90b7f0b8ab39 /lib/bundler | |
parent | 857168ed707027c8c4eb913c25425dad8a4b0e11 (diff) | |
parent | 235e5d3eca1f16886a16d06a7a26b7294e3a18e8 (diff) | |
download | bundler-44dc252655d89f8ac601a4758f0571a3629bbfe0.tar.gz |
Auto merge of #5023 - renuo:4854-gemnotfound-error, r=segiddins
4854 gemnotfound error
Fixes broken test
Wanting to help out, I was on the outlook for something easy to fix in bundler. I stumbled upon this issue #4854, which was already tackled by @b-ggs but somehow not merged yet. I went on to check whether I could do something. Here's what I've come up with:
@b-ggs' PR included everything to solve the issue, but introduced the use of `Bundler.app_cache` in the resolver. This works out just fine until you run `bundle plugin install`, which does not seem to require a Gemfile. `Bundler.app_cache` however calls `root`, which then again tries to find a Gemfile. This obviously fails and raises a `GemfileNotFound` exception. The error message "Could not locate Gemfile or .bundle/ directory" starts very similar to the one expected in the failing test ("Could not find"). This however, is a completely different error.
The solution is now is to rescue the GemfileNotFound error when it comes up to here.
All credit for solving the issue goes to @b-ggs and his PR here: https://github.com/bundler/bundler/pull/4865
Diffstat (limited to 'lib/bundler')
-rw-r--r-- | lib/bundler/resolver.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index b8016b37..bdb8f488 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -365,8 +365,13 @@ module Bundler "Source does not contain any versions of '#{requirement}'" end else + cache_message = begin + " or in gems cached in #{Bundler.settings.app_cache_path}" if Bundler.app_cache.exist? + rescue GemfileNotFound + nil + end message = "Could not find gem '#{requirement}' in any of the gem sources " \ - "listed in your Gemfile or available on this machine." + "listed in your Gemfile#{cache_message}." end raise GemNotFound, message end |