guard-brakeman 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e707f45819e1f3ee11dd7daa955adf04cbbb0749
-  data.tar.gz: b384f8a6614bd3d3b76c414258a85b518f883d92
+SHA256:
+  metadata.gz: 2541290e9789eeffbcb3b044a6e00357a77bdfdd769a4e1535fe468d7e9d27a1
+  data.tar.gz: 8ec143521f641ea82fbee2f7b9d37e57225d2f44abbbd2d17f211ff7baa2ca0b
 SHA512:
-  metadata.gz: ca9b5f957b17c56371167d8c785be5ba266ab6bf105c6744ead6e1f5588ac67e815717ee323f9c47454abd63dbce40f86b573fcca7bba52ab885e66b57134fea
-  data.tar.gz: f206dd8671a1f42c3b0c5a68fc66d5135f4c01adba08e27b4a344c649f67d805eda04ee5f27766659fd5ab5b899e452125a713a7a2b427a65b956f34cbccab65
+  metadata.gz: 14fc831923193ff101f155b992565e3385675d450d151b4e65b5724c21d3bfa94703131828c0e1674530728dc6473fd85a3f2e894e389f7102e6f4bb03f8379b
+  data.tar.gz: 4fd83223a0e8e62003573010e1be2daf405cb62c130813afbc95e1e34ad4d783bdc863f03cb7e2d1526b4550929b73aa749bfe40cc658b030b03a32ee99ed6a0

data/README.md

@@ -34,7 +34,7 @@ Please read the [Guard usage documentation](https://github.com/guard/guard#readm
 Guard::Brakeman can be adapted to all kind of projects and comes with a default template that looks like this:
 
 ```ruby
-guard 'brakeman' do
+guard :brakeman, run_on_start: true do
   watch(%r{^app/.+\.(erb|haml|rhtml|rb)$})
   watch(%r{^config/.+\.rb$})
   watch(%r{^lib/.+\.rb$})

data/lib/guard/brakeman.rb

@@ -1,5 +1,5 @@
-require 'guard'
-require 'guard/plugin'
+# Don't require "guard/plugin" here or in any other plugin's files
+require 'guard/compat/plugin'
 
 require 'brakeman'
 require 'brakeman/scanner'
@@ -37,9 +37,10 @@ module Guard
         :notifications => true,
         :run_on_start => false,
         :chatty => false,
-        :min_confidence => 1,
+        :min_confidence => 2,
         :quiet => false
       }.merge!(options)
+      @scanner_opts = ::Brakeman::set_options({:app_path => '.'}.merge(@options))
     end
 
     # Gets called once when Guard starts.
@@ -54,7 +55,7 @@ module Guard
       if @options[:run_on_start]
         run_all
       elsif @options[:chatty]
-        ::Guard::Notifier.notify("Brakeman is ready to work!", :title => "Brakeman started", :image => :pending)
+        Guard::Compat::Notifier.notify("Brakeman is ready to work!", :title => "Brakeman started", :image => :pending)
       end
     end
 
@@ -63,6 +64,7 @@ module Guard
     # @raise [:task_has_failed] when stop has failed
     #
     def run_all
+      fail "no scanner opts (start not called?)!" if @scanner_opts.nil?
       @tracker.run_checks
       ::Brakeman.filter_warnings @tracker, @scanner_opts
       print_failed(@tracker)
@@ -76,7 +78,7 @@ module Guard
     #
     def run_on_changes paths
       return run_all unless @tracker.checks
-      info "\n\nrescanning #{paths}, running all checks"
+      info "\n\nrescanning #{paths}, running all checks" unless options[:quiet]
       report = ::Brakeman::rescan(@tracker, paths)
       print_changed(report)
       throw :task_has_failed if report.any_warnings?
@@ -85,7 +87,7 @@ module Guard
     private
 
     def print_failed tracker
-      info "\n------ brakeman warnings --------\n"
+      info "\n------ brakeman warnings --------\n" unless options[:quiet]
       all_warnings = tracker.filtered_warnings
       icon = all_warnings.count > 0 ? :failed : :success
       message = "#{all_warnings.count} brakeman findings"
@@ -96,7 +98,7 @@ module Guard
       end
 
       if @options[:chatty] && all_warnings.any?
-        ::Guard::Notifier.notify(message, :title => "Full Brakeman results", :image => icon)
+        Guard::Compat::UI.notify(message, :title => "Full Brakeman results", :image => icon)
       end
 
       info(message, 'yellow')
@@ -104,7 +106,7 @@ module Guard
     end
 
     def print_changed report
-      info "\n------ brakeman warnings --------\n"
+      info "\n------ brakeman warnings --------\n" unless options[:quiet]
 
       message = []
       should_alert = false
@@ -157,7 +159,7 @@ module Guard
       end
 
       if @options[:notifications] && should_alert
-        ::Guard::Notifier.notify(message.join(", ").chomp, :title => title, :image => icon)
+        Guard::Compat::UI.notify(message.join(", ").chomp, :title => title, :image => icon)
       end
     end
 
@@ -179,7 +181,7 @@ module Guard
     end
 
     def info(message, color = :white)
-      UI.info(UI.send(:color, message, color))
+      Guard::Compat::UI.info(Guard::Compat::UI.color(message, color))
     end
 
     def warning_info(warnings, color = :white)
@@ -198,16 +200,28 @@ module Guard
         :white
       end
 
-      output =  UI.send(:color, ::Brakeman::Warning::TEXT_CONFIDENCE[warning.confidence], color)
+      msg = ::Brakeman::Warning::TEXT_CONFIDENCE[warning.confidence], color
+      output =  Guard::Compat::UI.color(msg)
       output << " - #{warning.warning_type} - #{warning.message}"
       output << " near line #{warning.line}" if warning.line
-      if warning.file
-        # fix this ish or wait for brakeman to be fixed
-        filename = warning.file.gsub(@options[:app_path], '')
-        output << " in #{filename}"
+
+      if path = relative_warning_path(warning)
+        output << " in #{path}"
       end
+
       output << ": #{warning.format_code}" if warning.code
       output
     end
+
+    def relative_warning_path warning
+      case
+      when warning.file.nil? # This should never really happen
+        nil
+      when warning.respond_to?(:relative_path) # For Brakeman < 4.5.1
+        warning.relative_path
+      else # Must be new Brakeman::FilePath, Brakeman >= 4.5.1
+        warning.file.relative
+      end
+    end
   end
 end

data/lib/guard/brakeman/templates/Guardfile

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-brakeman
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Neil Matatall
@@ -9,34 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: guard-compat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.1
 description: Guard::Brakeman automatically scans your Rails app for vulnerabilities
@@ -46,34 +60,33 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/guard/brakeman/templates/Guardfile
-- lib/guard/brakeman.rb
 - LICENSE
 - README.md
+- lib/guard/brakeman.rb
+- lib/guard/brakeman/templates/Guardfile
 homepage: https://github.com/guard/guard-brakeman
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
-- --main=README.md
-- --exclude='(test|spec)|(Gem|Guard|Rake)file'
+- "--charset=UTF-8"
+- "--main=README.md"
+- "--exclude='(test|spec)|(Gem|Guard|Rake)file'"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: guard-brakeman
-rubygems_version: 2.0.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Guard gem for Brakeman