Merge branch 'no_output_option'

.gitignore

@@ -1 +1 @@
-Gemfile.lock
+Gemfile.locktmp/rspec_guard_result

lib/guard/brakeman.rb

@@ -29,8 +29,9 @@ def initialize(watchers = [], options = { })
         :notifications => true,
         :run_on_start => false,
         :chatty => false,
-        :min_confidence => 1
-      }.update(options)
+        :min_confidence => 1,
+        :quiet => true
+      }.merge!(options)
     end
 
     # Gets called once when Guard starts.
@@ -67,7 +68,7 @@ def run_all
     def run_on_changes paths
       return run_all unless @tracker.checks
 
-      UI.info "\n\nrescanning #{paths}, running all checks"
+      info "\n\nrescanning #{paths}, running all checks"
       report = ::Brakeman::rescan(@tracker, paths)
       print_changed(report)
       throw :task_has_failed if report.any_warnings?
@@ -76,7 +77,7 @@ def run_on_changes paths
     private
 
     def print_failed report
-      UI.info "\n------ brakeman warnings --------\n"
+      info "\n------ brakeman warnings --------\n"
 
       icon = report.all_warnings.count > 0 ? :failed : :success
 
@@ -98,7 +99,7 @@ def print_failed report
     end
 
     def print_changed report
-      UI.info "\n------ brakeman warnings --------\n"
+      info "\n------ brakeman warnings --------\n"
 
       message = []
       should_alert = false
@@ -169,7 +170,7 @@ def pluralize(count, singular, plural = nil)
     end
 
     def info(message, color = :white)
-      UI.info(UI.send(:color, message, color))
+      UI.info(UI.send(:color, message, color)) unless @options[:quiet]
     end
 
     def warning_info(warnings, color = :white)

tmp/aruba/default_app/Guardfile

@@ -1,4 +1,4 @@
-guard 'brakeman', :chatty => false,:notifications => true, :run_on_start => true, :min_confidence => 0 do
+guard 'brakeman', :chatty => false,:notifications => true, :run_on_start => true, :min_confidence => 0, :quiet => false do
   watch(%r{^app/.+\.(erb|haml|rhtml|rb)$})
   watch(%r{^config/.+\.rb$})
   watch(%r{^lib/.+\.rb$})

tmp/rspec_guard_result

@@ -0,0 +1 @@
+