guard-brakeman 0.1.2 → 0.1.3

data/lib/guard/brakeman.rb

@@ -1,7 +1,7 @@
 require 'guard'
 require 'guard/guard'
 require 'brakeman'
-require 'brakeman/tracker'
+require 'brakeman/scanner'
 
 module Guard
 
@@ -9,10 +9,6 @@ module Guard
   # Guard events: `start`, `stop`, `reload`, `run_all` and `run_on_change`.
   #
   class Brakeman < Guard
-
-    autoload :Runner, 'guard/brakeman/runner'
-    autoload :Inspector, 'guard/brakeman/inspector'
-
     # Initialize Guard::Brakeman.
     #
     # @param [Array<Guard::Watcher>] watchers the watchers in the Guard block
@@ -20,12 +16,11 @@ module Guard
     # @option options [Boolean] :notification show notifications
     # @option options [Boolean] :format use a different brakeman format when running individual features - not implemented
     # @option options [Boolean] :output specify the output file - not implemented
-    # @option options [Array<String>] :disabled specify tests to skip (comma separated) - not implemented"
+    # @option options [Array<String>] :disabled specify tests to skip (comma separated) - not implemented
     #
     def initialize(watchers = [], options = { })
       super
       @last_failed  = false
-      @failed_paths = []
     end
 
     # Gets called once when Guard starts.
@@ -33,8 +28,9 @@ module Guard
     # @raise [:task_has_failed] when stop has failed
     #
     def start
-      @tracker = ::Brakeman.run :app_path => '.'
-      print_failed @tracker
+      options = ::Brakeman::set_options(:app_path => '.')
+      @scanner = ::Brakeman::Scanner.new(options)
+      @tracker = @scanner.process
     end
 
     # Gets called when all checks should be run.
@@ -43,29 +39,9 @@ module Guard
     #
     def run_all
       puts 'running all'
-      @tracker = ::Brakeman.run :app_path => '.'
-      
-      passed = clean_report?(@tracker)
-
-      print_failed @tracker
-
-      if passed
-        @failed_paths = []
-      else
-        @failed_paths = get_failed_paths(@tracker)
-      end
-
-      @last_failed = !passed
-
-      throw :task_has_failed unless passed
-    end
-
-    # Gets called when the Guard should reload itself.
-    #
-    # @raise [:task_has_failed] when stop has failed
-    #
-    def reload
-      @failed_paths = []
+      @tracker.run_checks
+      print_failed(@tracker.checks)
+      throw :task_has_failed if @tracker.checks.all_warnings.empty?
     end
 
     # Gets called when watched paths and files have changes.
@@ -74,25 +50,18 @@ module Guard
     # @raise [:task_has_failed] when stop has failed
     #
     def run_on_change(paths)
-      report = Runner.run(paths, @tracker, options)
-      print_failed report
-
-      passed = !report.all_warnings.any?
-
-      throw :task_has_failed unless passed
+      report = ::Brakeman::rescan(@tracker, paths)
+      print_failed(report)
+      throw :task_has_failed if report.any_warnings?
     end
 
     private
 
-    def print_failed tracker
-      checks = tracker.is_a?(::Brakeman::Tracker) ? tracker.checks.all_warnings : tracker.all_warnings
-      checks.each do |w|
+    def print_failed report
+      puts "\n------ brakeman warnings --------\n"
+      report.all_warnings.each do |w|
         puts w.to_row
       end
     end
-
-    def clean_report? tracker
-      tracker.checks.all_warnings.empty? && tracker.errors.empty?
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-brakeman
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+date: 2012-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70245169581980 !ruby/object:Gem::Requirement
+  requirement: &70314479970140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70245169581980
+  version_requirements: *70314479970140
 - !ruby/object:Gem::Dependency
   name: brakeman
-  requirement: &70245169581500 !ruby/object:Gem::Requirement
+  requirement: &70314479969620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70245169581500
+  version_requirements: *70314479969620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70245169581040 !ruby/object:Gem::Requirement
+  requirement: &70314479969160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70245169581040
+  version_requirements: *70314479969160
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70245169580540 !ruby/object:Gem::Requirement
+  requirement: &70314479968680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70245169580540
+  version_requirements: *70314479968680
 description: Guard::Brakeman automatically scans your Rails app for vulnerabilities
 email:
 - neil@matatall.com
@@ -62,8 +62,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/guard/brakeman/inspector.rb
-- lib/guard/brakeman/runner.rb
 - lib/guard/brakeman/templates/Guardfile
 - lib/guard/brakeman.rb
 - LICENSE

data/lib/guard/brakeman/inspector.rb

@@ -1,15 +0,0 @@
-module Guard
-  class Brakeman
-
-    # The inspector verifies of the changed paths are valid
-    # for Guard::Cucumber.
-    #
-    module Inspector
-      class << self
-        def clean paths
-          return paths
-        end
-      end
-    end
-  end
-end

data/lib/guard/brakeman/runner.rb

@@ -1,31 +0,0 @@
-require 'brakeman'
-
-module Guard
-  class Brakeman
-
-    # The Cucumber runner handles the execution of the cucumber binary.
-    #
-    module Runner
-      class << self
-
-        # Run the supplied features.
-        #
-        # @param [Array<String>] paths the feature files or directories
-        # @param [Hash] options the options for the execution
-        # @option options [Boolean] :bundler use bundler or not
-        # @option options [Array<String>] :rvm a list of rvm version to use for the test
-        # @option options [Boolean] :notification show notifications
-        # @return [Boolean] the status of the execution
-        #
-        def run(paths, tracker, options = { })
-          return false if paths.empty?
-
-          message = options[:message] || (paths == ['.'] ? 'Run brakeman on the whole project' : "Run brakeman checks #{ paths.join(' ') }")
-          UI.info message, :reset => true
-
-          ::Brakeman.rescan(tracker, paths)
-        end
-      end
-    end
-  end
-end