brakeman-min 0.5.1 → 0.5.2

data/bin/brakeman

@@ -288,6 +288,7 @@ if OPTIONS[:output_file]
   File.open OPTIONS[:output_file], "w" do |f|
     f.puts tracker.report.send(OPTIONS[:output_format])
   end
+  warn "Report saved in '#{OPTIONS[:output_file]}'"
 else
   puts tracker.report.send(OPTIONS[:output_format])
 end

data/lib/processor.rb

@@ -2,6 +2,7 @@
 Dir.glob("#{File.expand_path(File.dirname(__FILE__))}/processors/*.rb").each { |f| require f.match(/processors.*/)[0] }
 require 'tracker'
 require 'set'
+require 'pathname'
 
 #Makes calls to the appropriate processor.
 #

data/lib/report.rb

@@ -630,6 +630,8 @@ class Report
     output << "</table></div>"
   end
 
+  #Generated tab-separated output suitable for the Jenkins Brakeman Plugin:
+  #https://github.com/presidentbeef/brakeman-jenkins-plugin
   def to_tabs
     [[:warnings, "General"], [:controller_warnings, "Controller"],
       [:model_warnings, "Model"], [:template_warnings, "Template"]].map do |meth, category|
@@ -643,6 +645,31 @@ class Report
     end.join "\n"
   end
 
+  def to_test
+    report = { :errors => tracker.errors,
+               :controllers => tracker.controllers,
+               :models => tracker.models,
+               :templates => tracker.templates
+              }
+
+    [:warnings, :controller_warnings, :model_warnings, :template_warnings].each do |meth|
+      report[meth] = @checks.send(meth)
+      report[meth].each do |w|
+        w.message = w.format_message
+        if w.code
+          w.code = w.format_code
+        else
+          w.code = ""
+        end
+        w.context = context_for(w).join("\n")
+        w.file = file_for w
+      end
+    end
+      
+    report
+  end
+
+  #Loads Ruport library if available. Otherwise, alert user.
   def load_ruport
     require 'ruport'
   rescue LoadError => e

data/lib/scanner.rb

@@ -11,6 +11,7 @@ end
 
 #Scans the Rails application.
 class Scanner
+  RUBY_1_9 = !!(RUBY_VERSION =~ /^1\.9/)
 
   #Pass in path to the root of the Rails application
   def initialize path
@@ -136,6 +137,7 @@ class Scanner
       type = f.match(/.*\.(erb|haml|rhtml)$/)[1].to_sym
       type = :erb if type == :rhtml
       name = template_path_to_name f
+      text = File.read f
 
       begin
         if type == :erb
@@ -143,22 +145,23 @@ class Scanner
             initialize_erubis unless @initialized_erubis
             type = :erubis
             if OPTIONS[:rails3]
-              src = RailsXSSErubis.new(File.read(f)).src
+              src = RailsXSSErubis.new(text).src
             else
-              src = ErubisEscape.new(File.read(f)).src
+              src = ErubisEscape.new(text).src
             end
           elsif tracker.config[:erubis]
             initialize_erubis unless @initialized_erubis
-            src = ScannerErubis.new(File.read(f)).src
+            src = ScannerErubis.new(text).src
             type = :erubis
-            src = ScannerErubis.new(File.read(f)).src
+            src = ScannerErubis.new(text).src
           else
-            src = ERB.new(File.read(f), nil, "-").src
+            src = ERB.new(text, nil, "-").src
+            src.sub!(/^#.*\n/, '') if RUBY_1_9
           end
           parsed = RubyParser.new.parse src
         elsif type == :haml
           initialize_haml unless @initialized_haml
-          src = Haml::Engine.new(File.read(f),
+          src = Haml::Engine.new(text,
                                  :escape_html => !!tracker.config[:escape_html]).precompiled
           parsed = RubyParser.new.parse src
         else

data/lib/version.rb

@@ -1 +1 @@
-Version = "0.5.1"
+Version = "0.5.2"

data/lib/warning.rb

@@ -1,7 +1,9 @@
 #The Warning class stores information about warnings
 class Warning
-  attr_reader :called_from, :check, :class, :code, :confidence, :controller, :file, :line,
-    :message, :method, :model, :template, :warning_set, :warning_type
+  attr_reader :called_from, :check, :class, :confidence, :controller,
+    :line, :method, :model, :template, :warning_set, :warning_type
+
+  attr_accessor :code, :context, :file, :message
 
   #+options[:result]+ can be a result Sexp from FindCall. Otherwise, it can be +nil+.
   def initialize options = {}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Justin Collins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-17 00:00:00 -07:00
+date: 2011-06-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency