guard-brakeman 0.1.7 → 0.1.8

data/README.md

@@ -1,6 +1,6 @@
 # Guard::Brakeman [![Build Status](https://secure.travis-ci.org/oreoshake/guard-brakeman.png)](http://travis-ci.org/oreoshake/guard-brakeman)
 
-Guard::Brakeman allows you to automatically run Brakeman tests when files are modified.
+Guard::Brakeman allows you to automatically run [Brakeman](http://brakemanscanner.org/) tests when files are modified.
 
 
 ## Install
@@ -46,7 +46,8 @@ Please read the [Guard documentation](http://github.com/guard/guard#readme) for
 ### List of available options
 
 ```ruby
-
+:notifications => false # display Growl notifications, defaults to true
+:run_on_start  => true  # run all checks on startup, defaults to false
 ```
 
 ## Brakeman configuration

data/lib/guard/brakeman.rb

@@ -12,7 +12,8 @@ module Guard
     def initialize(watchers = [], options = { })
       super
       @options = {
-          :notifications => true
+          :notifications => true,
+          :run_on_start => false
       }.update(options)
     end
 
@@ -21,9 +22,11 @@ module Guard
     # @raise [:task_has_failed] when stop has failed
     #
     def start
-      options = ::Brakeman::set_options(:app_path => '.')
-      @scanner = ::Brakeman::Scanner.new(options)
+      scanner_opts = ::Brakeman::set_options(:app_path => '.')
+      @scanner = ::Brakeman::Scanner.new(scanner_opts)
       @tracker = @scanner.process
+
+      run_all if @options[:run_on_start]
     end
 
     # Gets called when all checks should be run.
@@ -31,7 +34,7 @@ module Guard
     # @raise [:task_has_failed] when stop has failed
     #
     def run_all
-      puts 'running all'
+      UI.info 'running all'
       @tracker.run_checks
       print_failed(@tracker.checks)
       throw :task_has_failed if @tracker.checks.all_warnings.any?
@@ -45,7 +48,7 @@ module Guard
     def run_on_change(paths)
       return run_all unless @tracker.checks
 
-      puts "rescanning #{paths}, running all checks"
+      UI.info "rescanning #{paths}, running all checks"
       report = ::Brakeman::rescan(@tracker, paths)
       print_changed(report)
       throw :task_has_failed if report.any_warnings?
@@ -54,37 +57,43 @@ module Guard
     private
 
     def print_failed report
-      UI.warning "\n------ brakeman warnings --------\n"
+      UI.info "\n------ brakeman warnings --------\n"
 
-      Notifier.notify("#{report.all_warnings.count} brakeman findings", :title => "Brakeman results", :image => :pending) if @options[:notifications]
+      icon = report.all_warnings.count > 0 ? :success : :pending
+
+      Notifier.notify("#{report.all_warnings.count} brakeman findings", :title => "Brakeman results", :image => icon) if @options[:notifications]
       puts report.all_warnings.sort_by { |w| w.confidence }
     end
 
     def print_changed report
       UI.info "\n------ brakeman warnings --------\n"
+      
+      message = ""
 
       unless report.fixed_warnings.empty?
-        message = "#{report.fixed_warnings.length} fixed warning(s)"
-        Notifier.notify(message, :title => "Brakeman results", :image => :success) if @options[:notifications]
-        UI.info(message + ":")
+        message += "#{report.fixed_warnings.length} fixed warning(s)\n"
+        icon = :success
+        UI.info(UI.send(:color, message, 'green')) # janky
         puts report.fixed_warnings.sort_by { |w| w.confidence }
         puts
       end
 
       unless report.new_warnings.empty?
-        message = "#{report.new_warnings.length} new warning(s)"
-        Notifier.notify(message, :title => "Brakeman results", :image => :failed) if @options[:notifications]
-        UI.warning message + ":"
+        message += "#{report.new_warnings.length} new warning(s)\n"
+        icon = :failed
+        UI.error message
         puts report.new_warnings.sort_by { |w| w.confidence }
         puts
       end
 
       unless report.existing_warnings.empty?
-        message = "#{report.existing_warnings.length} previous warning(s)"
-        Notifier.notify(message, :title => "Brakeman results", :image => :pending) if @options[:notifications]
-        UI.warning message + ":"
+        icon ||= :pending
+        message += "#{report.existing_warnings.length} previous warning(s)\n"
+        UI.warning message
         puts report.existing_warnings.sort_by { |w| w.confidence }
       end
+
+      Notifier.notify(message.chomp, :title => "Brakeman results", :image => icon) if @options[:notifications]
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard-brakeman
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Neil Matatall
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 -08:00
+date: 2012-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency