Merge pull request #344 from presidentbeef/allow_empty_config_file

Allow empty Brakeman config file

lib/brakeman.rb

@@ -91,11 +91,17 @@ module Brakeman
     #Load configuration file
     if config = config_file(custom_location)
       options = YAML.load_file config
-      options.each { |k, v| options[k] = Set.new v if v.is_a? Array }
-      
-      # notify if options[:quiet] and quiet is nil||false
-      notify "[Notice] Using configuration in #{config}" unless (options[:quiet] || quiet)
-      options
+
+      if options
+        options.each { |k, v| options[k] = Set.new v if v.is_a? Array }
+
+        # notify if options[:quiet] and quiet is nil||false
+        notify "[Notice] Using configuration in #{config}" unless (options[:quiet] || quiet)
+        options
+      else
+        notify "[Notice] Empty configuration file: #{config}" unless quiet
+        {}
+      end
     else
       {}
     end

test/tests/rails3.rb

 abort "Please run using test/test.rb" unless defined? BrakemanTester
 
-Rails3 = BrakemanTester.run_scan "rails3", "Rails 3", :rails3 => true
+Rails3 = BrakemanTester.run_scan "rails3", "Rails 3", :rails3 => true,
+  :config_file => File.join(TEST_PATH, "apps", "rails3", "config", "brakeman.yml")
 
 class Rails3Tests < Test::Unit::TestCase
   include BrakemanTester::FindWarning