diff options
| author | Jessica Lynn Suttles <jlsuttles@gmail.com> | 2013-07-29 16:31:31 -0700 |
|---|---|---|
| committer | Jessica Lynn Suttles <jlsuttles@gmail.com> | 2013-08-05 14:16:01 -0700 |
| commit | 8d385e0dd7b4b41a2b421602f22c2bfd18670af4 (patch) | |
| tree | 719f7f49db23d097bba33f9792b1f4861eb15ce2 /lib/bundler/friendly_errors.rb | |
| parent | 0750d45b3933a5d1f28ebf4494c8505739a3a827 (diff) | |
| download | bundler-8d385e0dd7b4b41a2b421602f22c2bfd18670af4.tar.gz | |
trying to get specs to pass
overrides Thor#start in Bundler::CLI to ensure Bundler.ui is set to UI::Shell.new
fixes typo in friendly error message
only sets UI::Sell.new in Bundler::CLI#start if exception is raised
fixes typo in lib
adds more specs
rescues Thor::AmbiguousTaskError instead of ArgumentError
removes message from spec as it's not needed
Diffstat (limited to 'lib/bundler/friendly_errors.rb')
| -rw-r--r-- | lib/bundler/friendly_errors.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/bundler/friendly_errors.rb b/lib/bundler/friendly_errors.rb index 0cc29e8e36..32a9a056d3 100644 --- a/lib/bundler/friendly_errors.rb +++ b/lib/bundler/friendly_errors.rb @@ -7,6 +7,9 @@ module Bundler Bundler.ui.error e.message, :wrap => true Bundler.ui.trace e exit e.status_code + rescue Thor::AmbiguousTaskError => e + Bundler.ui.error e.message + exit 15 rescue Thor::UndefinedTaskError => e Bundler.ui.error e.message exit 15 @@ -23,11 +26,6 @@ module Bundler WARN Bundler.ui.trace e exit 1 - rescue ArgumentError => e - Bundler.ui.warn "caught argument #{e.message}" - raise e unless e.message =~ /Ambiguous task/ - Bundler.ui.error "\nA more hepful message" - exit e.status_code rescue Interrupt => e Bundler.ui.error "\nQuitting..." Bundler.ui.trace e |