rails-audit 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ebe33368db8592206d864e1adad4c064cbfced5
-  data.tar.gz: 400e669053370859962fbb743b1fd46aaaed9581
+  metadata.gz: ce161897640c1b85ccf195cbe50a7ba9161838bf
+  data.tar.gz: baa9a8d48250e0f74dbd7edf6e27de5bd8b36e88
 SHA512:
-  metadata.gz: cd3e0a173f10f2e4206b659e5b986286eb5ee438393148bca42f149e183c352a55825a29d00b40a7b89264d37614bafe3017582bd141e427c28cb9a64f070401
-  data.tar.gz: 3533575bd1af7bf32c92bffbcacd6dd9dece6dbfa67fa86eb8a7abe359a4a4db2dc190bdccf0e9526f47f612d653c0c7b6c882dcec3f94e227ae6a32d512abb0
+  metadata.gz: 21d98c3f941b471a3d3b4fdb75b035e93d84cebcd466e654d1818f7f0015199c48a2a0c498e3b62f5b367b6132810013bee67b40e6fbe87f089f00dcf7f18cef
+  data.tar.gz: 6759d164a1f578f6ab4f42f504398bb03bfbf8e177d9e2b49fb3651c6555f3fe6801c43c21b3a5c907d4de23ea51aa6419a4adcf74bef26aac6726beb31fe636

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.15.0
+
+* New rubocop version 0.15.0
+
 ## 0.14.0
 
 * New brakeman version 2.2

data/bin/rails-audit

@@ -2,4 +2,4 @@
 
 require 'rails-audit'
 
-exit(1) unless RailsAudit.run
+exit(1) unless RailsAudit::Runner.new.run

data/lib/rails-audit/audit.rb

@@ -1,6 +1,5 @@
 module RailsAudit
   class Audit
-
     def self.command(rails)
       self::COMMAND
     end
@@ -13,6 +12,5 @@ module RailsAudit
     def self.get_name
       name.split('::')[-1]
     end
-
   end
 end

data/lib/rails-audit/runner.rb

@@ -1,58 +1,62 @@
 require 'yaml'
 
 module RailsAudit
-  def self.load_config
-    File.exist?('config/audit.yml') && YAML.load_file('config/audit.yml') || {}
-  end
+  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
+    end
 
-  def self.get_config(config, name)
-    c = config[name]
-    {
-      rails: config['Rails'].nil? && true || config['Rails'],
-      params: c && c['Parameters'] || '',
-      enabled: (c.nil? || c['Enabled'].nil?) && true || c['Enabled']
-    }
-  end
+    def get_config(name)
+      defaults = { 'Parameters' => '', 'Enabled' => true }
+      config = defaults.merge(@config[name] || {})
+      {
+        rails: @config['Rails'],
+        params: config['Parameters'],
+        enabled: config['Enabled']
+      }
+    end
 
-  def self.run
-    config = load_config
+    def run
+      concurrency = @config['Concurrency']
 
-    concurrency = config['Concurrency'].nil? && true || config['Concurrency']
+      failures = concurrency && run_threads || run_sequence
 
-    failures = concurrency && run_threads(config) || run_sequence(config)
+      if failures.any?
+        puts 'Failed tests:'
+        failures.each { |f| puts f }
+      end
 
-    if failures.any?
-      puts 'Failed tests:'
-      failures.each { |f| puts f }
+      failures.none?
     end
 
-    failures.none?
-  end
+    def run_sequence
+      failures = []
 
-  def self.run_sequence(config)
-    failures = []
+      Audits::ALL.each do |audit|
+        success = audit.run get_config(audit.get_name)
+        failures << audit.get_name unless success
+      end
 
-    Audits::ALL.each do |audit|
-      success = audit.run get_config(config, audit.get_name)
-      failures << audit.get_name unless success
+      failures
     end
 
-    failures
-  end
-
-  def self.run_threads(config)
-    failures = []
-    mutex = Mutex.new
+    def run_threads
+      failures = []
+      mutex = Mutex.new
 
-    threads = Audits::ALL.map do |audit|
-      Thread.new do
-        success = audit.run get_config(config, audit.get_name)
-        mutex.synchronize { failures << audit.get_name unless success }
+      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 }
+        end
       end
-    end
 
-    threads.each { |t| t.join }
+      threads.each { |t| t.join }
 
-    failures
+      failures
+    end
   end
 end

data/lib/rails-audit/version.rb

@@ -1,7 +1,7 @@
 module RailsAudit
   class Version
     MAJOR = 0
-    MINOR = 14
+    MINOR = 15
     PATCH = 0
 
     def self.to_s

data/rails-audit.gemspec

@@ -33,5 +33,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'consistency_fail'
   s.add_runtime_dependency 'license_finder'
   s.add_runtime_dependency 'rails_best_practices', '~> 1.14.0'
-  s.add_runtime_dependency 'rubocop', '0.14.1'
+  s.add_runtime_dependency 'rubocop', '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-audit
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Christopher Schramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
 description: "\n    Runs multiple audit and review tools to ensure quality and security
   of\n    Rails projects\n  "
 email: cschramm@shakaweb.org