cfn-nag 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 599ac76a7c5bb73f2e8ad348f408f1945c9556c8
-  data.tar.gz: 13521f759054aba5f2abcd434e71b46c36b95dc7
+  metadata.gz: e9bcf207078e6643d3d0f2c74b04813d27c1b2c6
+  data.tar.gz: 5fac3032cbfb69d9ec845115316df99c872bbccd
 SHA512:
-  metadata.gz: 02d05593b7c89b552b8b5ffe3c0cbb353b9a3d80f15c27a3920279b88a57f0639026b5eb220adaaff5b4ad8cbdd6172f0d2a38931789147e0f7fc73e2167bd26
-  data.tar.gz: 4ad062cf1e1040dd21549569d3ebc621dd8c63005851f6c9bdcb5858eb5294cdfdeec1ad0e235f93c3e111412c35e786ebc31e0c5ed3aa49f6fdfc801a242b8a
+  metadata.gz: cfb8b979362c846b61e30da5c1bbadd9464beedf061bf56f207e0b0e611faa843ba439b45244638f52e884cb55a51a410768369f93b08f162f58772aba9a368e
+  data.tar.gz: 911098c165973f8ff6300081201a180659d5bd2705fc87c15dc1df7f7b3b2cf13dcfe34d9e25b7132bb0dcfdb4b760fba141aee0a2469319465877f4870b842e

data/lib/cfn_nag.rb

@@ -5,6 +5,7 @@ require_relative 'profile_loader'
 require_relative 'model/cfn_model'
 require_relative 'result_view/simple_stdout_results'
 require_relative 'result_view/json_results'
+require_relative 'result_view/rules_view'
 require 'tempfile'
 
 class CfnNag
@@ -46,23 +47,7 @@ class CfnNag
       profile = ProfileLoader.new(@rule_registry).load(profile_definition: @profile_definition)
     end
 
-    puts 'WARNING VIOLATIONS:'
-    @rule_registry.warnings.sort {|left, right| left.id <=> right.id}.each do |warning|
-      if profile.nil?
-        puts "#{warning.id} #{warning.message}"
-      else
-        puts "#{warning.id} #{warning.message}" if profile.execute_rule?(warning.id)
-      end
-
-    end
-    puts 'FAILING VIOLATIONS:'
-    @rule_registry.failings.sort {|left, right| left.id <=> right.id}.each do |failing|
-      if profile.nil?
-        puts "#{failing.id} #{failing.message}"
-      else
-        puts "#{failing.id} #{failing.message}" if profile.execute_rule?(failing.id)
-      end
-    end
+    RulesView.new.emit(@rule_registry, profile)
   end
 
   def audit(input_json_path:,

data/lib/result_view/rules_view.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-nag
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - someguy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-16 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging
@@ -76,6 +76,7 @@ files:
 - lib/profile.rb
 - lib/profile_loader.rb
 - lib/result_view/json_results.rb
+- lib/result_view/rules_view.rb
 - lib/result_view/simple_stdout_results.rb
 - lib/rule.rb
 - lib/rule_registry.rb