cfn-nag 0.3.26 → 0.3.29

data/lib/cfn-nag/jmes_path_evaluator.rb

@@ -51,4 +51,4 @@ class JmesPathEvaluator
     end
     hash
   end
-end
+end

data/lib/cfn-nag/profile.rb

@@ -14,4 +14,4 @@ class Profile
   def execute_rule?(rule_id)
     @rule_ids.include? rule_id
   end
-end
+end

data/lib/cfn-nag/profile_loader.rb

@@ -1,14 +1,12 @@
 require_relative 'profile'
 
 class ProfileLoader
-
   def initialize(rules_registry)
     @rules_registry = rules_registry
   end
 
   def load(profile_definition:)
-
-    if profile_definition.nil? or profile_definition.strip == ''
+    if profile_definition.nil? || (profile_definition.strip == '')
       raise 'Empty profile'
     end
 

data/lib/cfn-nag/result_view/json_results.rb

@@ -2,11 +2,10 @@ require 'json'
 
 class JsonResults
   def render(results)
-
     hashified_results = results.each do |result|
-      result[:file_results][:violations] = result[:file_results][:violations].map { |violation| violation.to_h }
+      result[:file_results][:violations] = result[:file_results][:violations].map(&:to_h)
     end
 
     puts JSON.pretty_generate(hashified_results)
   end
-end
+end

data/lib/cfn-nag/result_view/rules_view.rb

@@ -1,9 +1,7 @@
 class RulesView
-
   def emit(rule_registry, profile)
-
     puts 'WARNING VIOLATIONS:'
-    rule_registry.warnings.sort {|left, right| sort_id(left, right) }.each do |warning|
+    rule_registry.warnings.sort { |left, right| sort_id(left, right) }.each do |warning|
       if profile.nil?
         puts "#{warning.id} #{warning.message}"
       else
@@ -12,7 +10,7 @@ class RulesView
     end
     puts
     puts 'FAILING VIOLATIONS:'
-    rule_registry.failings.sort {|left, right| sort_id(left, right) }.each do |failing|
+    rule_registry.failings.sort { |left, right| sort_id(left, right) }.each do |failing|
       if profile.nil?
         puts "#{failing.id} #{failing.message}"
       else
@@ -24,10 +22,10 @@ class RulesView
   private
 
   def sort_id(left, right)
-    if left.id.match /[FW][0-9]+/ and right.id.match /[FW][0-9]+/
+    if left.id.match(/[FW][0-9]+/) && right.id.match(/[FW][0-9]+/)
       left.id[1..-1].to_i <=> right.id[1..-1].to_i
     else
       left.id <=> right.id
     end
   end
-end
+end

data/lib/cfn-nag/result_view/simple_stdout_results.rb

@@ -1,12 +1,11 @@
 require 'cfn-nag/violation'
 
 class SimpleStdoutResults
-
   def render(results)
     results.each do |result|
-      (1..60).each { print '-' }
+      60.times { print '-' }
       puts "\n" + result[:filename]
-      (1..60).each { print '-' }
+      60.times { print '-' }
 
       result[:file_results][:violations].each do |violation|
         message message_type: "#{violation.type} #{violation.id}",
@@ -24,11 +23,9 @@ class SimpleStdoutResults
               message:,
               logical_resource_ids: nil)
 
-    if logical_resource_ids == []
-      logical_resource_ids = nil
-    end
+    logical_resource_ids = nil if logical_resource_ids == []
 
-    (1..60).each { print '-' }
+    60.times { print '-' }
     puts
     puts "| #{message_type.upcase}"
     puts '|'
@@ -40,4 +37,4 @@ class SimpleStdoutResults
   def indent_multiline_string_with_prefix(prefix, multiline_string)
     prefix + ' ' + multiline_string.gsub(/\n/, "\n#{prefix} ")
   end
-end
+end

data/lib/cfn-nag/rule_definition.rb

@@ -1,6 +1,6 @@
 class RuleDefinition
-  WARNING = 'WARN'
-  FAILING_VIOLATION = 'FAIL'
+  WARNING = 'WARN'.freeze
+  FAILING_VIOLATION = 'FAIL'.freeze
 
   attr_reader :id, :type, :message
 
@@ -12,9 +12,7 @@ class RuleDefinition
     @message = message
 
     [@id, @type, @message].each do |required|
-      if required.nil?
-        raise 'No parameters to Violation constructor can be nil'
-      end
+      raise 'No parameters to Violation constructor can be nil' if required.nil?
     end
   end
 
@@ -33,4 +31,4 @@ class RuleDefinition
   def ==(other_violation)
     other_violation.class == self.class && other_violation.to_h == to_h
   end
-end
+end

data/lib/cfn-nag/rule_dumper.rb

@@ -20,4 +20,4 @@ class CfnNagRuleDumper
 
     RulesView.new.emit(rule_registry, profile)
   end
-end
+end

data/lib/cfn-nag/rule_registry.rb

@@ -40,4 +40,4 @@ class RuleRegistry
     @rules << violation_def
     violation_def
   end
-end
+end

data/lib/cfn-nag/template_discovery.rb

@@ -3,13 +3,13 @@ class TemplateDiscovery
     if ::File.directory? input_json_path
       templates = find_templates_in_directory(directory: input_json_path)
     elsif ::File.file? input_json_path
-      if input_json_path.is_a? File
-        templates = [input_json_path.path]
-      else
-        templates = [input_json_path]
-      end
+      templates = if input_json_path.is_a? File
+                    [input_json_path.path]
+                  else
+                    [input_json_path]
+                  end
     else
-      fail "#{input_json_path} is not a proper path"
+      raise "#{input_json_path} is not a proper path"
     end
     templates
   end
@@ -17,7 +17,7 @@ class TemplateDiscovery
   private
 
   def find_templates_in_directory(directory:,
-                                  cfn_extensions: %w(json yaml yml template))
+                                  cfn_extensions: %w[json yaml yml template])
 
     templates = []
     cfn_extensions.each do |cfn_extension|
@@ -25,4 +25,4 @@ class TemplateDiscovery
     end
     templates
   end
-end
+end

data/lib/cfn-nag/violation.rb

@@ -19,19 +19,19 @@ class Violation < RuleDefinition
   end
 
   def to_h
-    super.to_h.merge({
+    super.to_h.merge(
       logical_resource_ids: @logical_resource_ids
-    })
+    )
   end
 
   def self.count_warnings(violations)
     violations.inject(0) do |count, violation|
       if violation.type == Violation::WARNING
-        if empty?(violation.logical_resource_ids)
-          count += 1
-        else
-          count += violation.logical_resource_ids.size
-        end
+        count += if empty?(violation.logical_resource_ids)
+                   1
+                 else
+                   violation.logical_resource_ids.size
+                 end
       end
       count
     end
@@ -40,11 +40,11 @@ class Violation < RuleDefinition
   def self.count_failures(violations)
     violations.inject(0) do |count, violation|
       if violation.type == Violation::FAILING_VIOLATION
-        if empty?(violation.logical_resource_ids)
-          count += 1
-        else
-          count += violation.logical_resource_ids.size
-        end
+        count += if empty?(violation.logical_resource_ids)
+                   1
+                 else
+                   violation.logical_resource_ids.size
+                 end
       end
       count
     end
@@ -53,6 +53,6 @@ class Violation < RuleDefinition
   private
 
   def self.empty?(array)
-    array.nil? || array.size ==0
+    array.nil? || array.empty?
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.3.26
+  version: 0.3.29
 platform: ruby
 authors:
 - Eric Kascic
@@ -11,75 +11,75 @@ cert_chain: []
 date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logging
+  name: cfn-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 0.1.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 0.1.22
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: jmespath
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
-  name: cfn-model
+  name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.22
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
-  name: jmespath
+  name: netaddr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
-  name: netaddr
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.1.2
 description: Auditing tool for CloudFormation templates
 email: 
 executables: