From b2387c674294642679fb9bb80c732a72ff9535b2 Mon Sep 17 00:00:00 2001 From: Andre Arko Date: Sat, 23 Jul 2011 18:14:44 -0700 Subject: correctly finger missing child deps in the error message --- lib/bundler/resolver.rb | 11 +++-------- spec/install/git_spec.rb | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index 76d1780363..0baf40f0d5 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -279,15 +279,10 @@ module Bundler end raise GemNotFound, message else - if @missing_gems[current] >= 5 - message = "Bundler could not find find gem #{current.required_by.last}," - message << "which is required by gem #{current}." - raise GemNotFound, message - end - @missing_gems[current] += 1 - - debug { " Could not find #{current} by #{current.required_by.last}" } @errors[current.name] = [nil, current] + message = "Bundler could not find gem '#{clean_req(current)}', " + message << "which is required by gem '#{clean_req(current.required_by.last)}.'" + raise GemNotFound, message end end diff --git a/spec/install/git_spec.rb b/spec/install/git_spec.rb index 62cb887d89..da2e886e78 100644 --- a/spec/install/git_spec.rb +++ b/spec/install/git_spec.rb @@ -403,7 +403,7 @@ describe "bundle install with git sources" do gem "has_submodule" end G - out.should =~ /Could not find gem 'submodule'/ + out.should =~ /could not find gem 'submodule'/i should_not_be_installed "has_submodule 1.0", :expect_err => true end -- cgit v1.2.1