lib/rails-audit/runner.rb in rails-audit-0.50.0 vs lib/rails-audit/runner.rb in rails-audit-0.51.0

- old
+ new

@@ -2,13 +2,12 @@ module RailsAudit class Runner def initialize @config = { 'Concurrency' => true, 'Rails' => true } - if File.exist? 'config/audit.yml' - @config = @config.merge YAML.load_file('config/audit.yml') - end + return unless File.exist? 'config/audit.yml' + @config = @config.merge YAML.load_file('config/audit.yml') end def get_config(name) defaults = { 'Parameters' => '', 'Enabled' => true } config = defaults.merge(@config[name] || {}) @@ -34,12 +33,12 @@ def run_sequence failures = [] Audits::ALL.each do |audit| - success = audit.run get_config(audit.get_name) - failures << audit.get_name unless success + success = audit.run get_config(audit.name) + failures << audit.name unless success end failures end @@ -47,15 +46,15 @@ failures = [] mutex = Mutex.new threads = Audits::ALL.map do |audit| Thread.new do - success = audit.run get_config(audit.get_name) - mutex.synchronize { failures << audit.get_name unless success } + success = audit.run get_config(audit.name) + mutex.synchronize { failures << audit.name unless success } end end - threads.each { |t| t.join } + threads.each(&:join) failures end end end