health_inspector 0.1.0 → 0.2.0

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 0.2.0 ( 2012-09-25 )
+
+* Add a better diff output.
+* Add diff output to data bag items.
+* Switch to yajl-ruby to fix JSON parsing issues (Chef uses this also).
+
 ## 0.1.0 ( 2012-09-24 )
 
 * Bump Chef dependency version up to 10.14

data/health_inspector.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "minitest"
   s.add_development_dependency "mocha"
+
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "chef", "~> 10.14"
+  s.add_runtime_dependency "yajl-ruby"
 end

data/lib/health_inspector/checklists/base.rb

@@ -69,7 +69,7 @@ module HealthInspector
               if original[key].kind_of?(Hash) && other[key].kind_of?(Hash)
                 memo[key] = diff(original[key], other[key])
               else
-                memo[key] = [original[key], other[key]]
+                memo[key] = {"server" => original[key],"local" => other[key]}
               end
             end
             memo
@@ -97,10 +97,42 @@ module HealthInspector
         puts color('bright fail', "- #{subject}")
 
         failures.each do |message|
-          puts color('bright yellow', "  #{message}")
+          if message.kind_of? Hash
+            puts color('bright yellow',"  has the following values mismatched on the server and repo\n")
+            print_failures_from_hash(message)
+          else
+            puts color('bright yellow', "  #{message}")
+          end
+        end
+      end
+
+      def print_failures_from_hash(message, depth=2)
+        message.keys.each do |key|
+          print_key(key,depth)
+
+          if message[key].include? "server"
+            print_value_diff(message[key],depth)
+            message[key].delete_if { |k,v| k == "server" || "local" }
+            print_failures_from_hash(message[key], depth + 1) unless message[key].empty?
+          else
+            print_failures_from_hash(message[key], depth + 1)
+          end
         end
       end
 
+      def print_key(key, depth)
+        puts indent( color('bright yellow',"#{key} : "), depth )
+      end
+
+      def print_value_diff(value, depth)
+        print indent( color('bright fail',"server value = "), depth + 1 )
+        print value["server"]
+        print "\n"
+        print indent( color('bright fail',"local value  = "), depth + 1 )
+        print value["local"] 
+        print "\n\n"
+      end
+
       def load_ruby_or_json_from_local(chef_class, folder, name)
         path_template = "#{@context.repo_path}/#{folder}/#{name}.%s"
         ruby_pathname = Pathname.new(path_template % "rb")
@@ -111,9 +143,9 @@ module HealthInspector
           instance = chef_class.new
           instance.from_file(ruby_pathname.to_s)
         elsif json_pathname.exist?
-          instance = chef_class.json_create( JSON.parse( json_pathname.read ) )
+          instance = chef_class.json_create( Yajl::Parser.parse( json_pathname.read ) )
         elsif js_pathname.exist?
-          instance = chef_class.json_create( JSON.parse( js_pathname.read ) )
+          instance = chef_class.json_create( Yajl::Parser.parse( js_pathname.read ) )
         end
 
         instance ? instance.to_hash : nil
@@ -121,6 +153,10 @@ module HealthInspector
         nil
       end
 
+      def indent(string, depth)
+        string.prepend(' ' * 2 * depth)
+      end
+
     end
   end
 end

data/lib/health_inspector/checklists/cookbooks.rb

@@ -62,7 +62,7 @@ module HealthInspector
       end
 
       def cookbooks_on_server
-        JSON.parse( @context.knife_command("cookbook list -Fj") ).inject({}) do |hsh, c|
+        Yajl::Parser.parse( @context.knife_command("cookbook list -Fj") ).inject({}) do |hsh, c|
           name, version = c.split
           hsh[name] = version
           hsh

data/lib/health_inspector/checklists/data_bag_items.rb

@@ -15,7 +15,8 @@ module HealthInspector
 
       add_check "items are the same" do
         if item.server && item.local
-          failure "#{item.server}\n  is not equal to\n  #{item.local}" unless item.server == item.local
+          item_diff = diff(item.server, item.local)
+          failure item_diff unless item_diff.empty?
         end
       end
 
@@ -61,7 +62,7 @@ module HealthInspector
       end
 
       def load_item_from_local(name)
-        JSON.parse( File.read("#{@context.repo_path}/data_bags/#{name}.json") )
+        Yajl::Parser.parse( File.read("#{@context.repo_path}/data_bags/#{name}.json") )
       rescue IOError, Errno::ENOENT
         nil
       end

data/lib/health_inspector/checklists/environments.rb

@@ -15,8 +15,8 @@ module HealthInspector
 
       add_check "items are the same" do
         if item.server && item.local
-          environment_diff = diff(item.server,item.local)
-          failure "#{environment_diff}\n" unless environment_diff.empty?
+          item_diff = diff(item.server, item.local)
+          failure item_diff unless item_diff.empty?
         end
       end
 

data/lib/health_inspector/checklists/roles.rb

@@ -17,7 +17,8 @@ module HealthInspector
 
       add_check "items are the same" do
         if item.server && item.local
-          failure "#{item.server}\n  is not equal to\n  #{item.local}" unless item.server == item.local
+          item_diff = diff(item.server, item.local)
+          failure item_diff unless item_diff.empty?
         end
       end
 

data/lib/health_inspector/version.rb

@@ -1,3 +1,3 @@
 module HealthInspector
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_inspector
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70344534419540 !ruby/object:Gem::Requirement
+  requirement: &70104583098760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344534419540
+  version_requirements: *70104583098760
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70344534418600 !ruby/object:Gem::Requirement
+  requirement: &70104583097840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70344534418600
+  version_requirements: *70104583097840
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70344534418140 !ruby/object:Gem::Requirement
+  requirement: &70104583097300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70344534418140
+  version_requirements: *70104583097300
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70344534417520 !ruby/object:Gem::Requirement
+  requirement: &70104583096760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,18 @@ dependencies:
         version: '10.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70344534417520
+  version_requirements: *70104583096760
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70104583096340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70104583096340
 description: A tool to inspect your chef repo as is compares to what is on your chef
   server
 email: