Merge branch 'master' of https://github.com/capotej/guard into capotej-master

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ## Improvements
 
+- Pull request [#94](https://github.com/guard/guard/pull/94): Show backtrace in terminal when a problem with a watch action occurs. ([@capotej][])
 - Pull request [#88](https://github.com/guard/guard/pull/88): Write exception trace in the terminal when a supervised task fail. ([@mcmire][])
 - Color in red the "ERROR:" flag when using `UI.error`. ([@rymai][])
 - Issue [#79](https://github.com/guard/guard/issues/79) and Pull request [#82](https://github.com/guard/guard/pull/82): Improve INotify support on Linux. ([@Gazer][] & [@yannlugrin][])

spec/guard/watcher_spec.rb

@@ -143,8 +143,13 @@ describe Guard::Watcher do
     context "with an exception that is raised" do
       before(:all) { @guard.watchers = [Guard::Watcher.new('evil.rb', lambda { raise "EVIL" })] }
 
-      it "displays the error" do
-        Guard::UI.should_receive(:error).with("Problem with watch action!")
+      it "displays the error and backtrace" do
+        Guard::UI.should_receive(:error) { |msg|
+          msg.should include("Problem with watch action!")
+          msg.should include("EVIL")
+          
+        }
+
         Guard::Watcher.match_files(@guard, ['evil.rb'])
       end
     end