health_inspector 0.0.6 → 0.1.0

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+!.gitkeep

data/HISTORY.md

@@ -1,4 +1,11 @@
-## 0.0.6 ( 2012-05-23)
+## 0.1.0 ( 2012-09-24 )
+
+* Bump Chef dependency version up to 10.14
+* Add support for JSON environments
+* Add support for JSON roles
+* Display the diff between JSONs when JSON data doesn't match.
+
+## 0.0.6 ( 2012-05-23 )
 
 * Depend on Chef 0.10.8, since it depends on a later version of the json gem.
   An earlier version of the json gem was throwing incorrect parse errors.

data/health_inspector.gemspec

@@ -21,5 +21,5 @@ 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", "~> 0.10.8"
+  s.add_runtime_dependency "chef", "~> 10.14"
 end

data/lib/health_inspector/checklists/base.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+require "pathname"
 
 module HealthInspector
   module Checklists
@@ -49,7 +50,7 @@ module HealthInspector
       end
 
       class CheckContext
-        include Check
+        include Check, Color
         attr_accessor :item, :context
 
         def initialize(check, item, context)
@@ -61,6 +62,19 @@ module HealthInspector
         def call
           instance_eval(&@check)
         end
+
+        def diff(original, other)
+          (original.keys + other.keys).uniq.inject({}) do |memo, key|
+            unless original[key] == other[key]
+              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]]
+              end
+            end
+            memo
+          end
+        end
       end
 
       def run_check(check, item)
@@ -87,6 +101,26 @@ module HealthInspector
         end
       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")
+        json_pathname = Pathname.new(path_template % "json")
+        js_pathname   = Pathname.new(path_template % "js")
+
+        if ruby_pathname.exist?
+          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 ) )
+        elsif js_pathname.exist?
+          instance = chef_class.json_create( JSON.parse( js_pathname.read ) )
+        end
+
+        instance ? instance.to_hash : nil
+      rescue IOError
+        nil
+      end
+
     end
   end
 end

data/lib/health_inspector/checklists/environments.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
+          environment_diff = diff(item.server,item.local)
+          failure "#{environment_diff}\n" unless environment_diff.empty?
         end
       end
 
@@ -41,7 +42,7 @@ module HealthInspector
 
       def items_in_repo
         Dir.chdir("#{@context.repo_path}/environments") do
-          Dir["*.rb"].map { |e| e.gsub('.rb', '') }
+          Dir["*.{rb,json,js}"].map { |e| e.gsub(/\.(rb|json|js)/,"") }
         end
       end
 
@@ -53,11 +54,7 @@ module HealthInspector
       end
 
       def load_item_from_local(name)
-        env = Chef::Environment.new
-        env.from_file( "#{@context.repo_path}/environments/#{name}.rb" )
-        env.to_hash
-      rescue IOError
-        nil
+        load_ruby_or_json_from_local(Chef::Environment, "environments", name)
       end
     end
 

data/lib/health_inspector/checklists/roles.rb

@@ -5,6 +5,8 @@ module HealthInspector
     class Roles < Base
       title "roles"
 
+      require 'yajl'
+
       add_check "local copy exists" do
         failure "exists on server but not locally" unless item.local
       end
@@ -41,7 +43,7 @@ module HealthInspector
 
       def items_in_repo
         Dir.chdir("#{@context.repo_path}/roles") do
-          Dir["*.rb"].map { |e| e.gsub('.rb', '') }
+          Dir["*.{rb,json,js}"].map { |e| e.gsub(/\.(rb|json|js)/, '') }
         end
       end
 
@@ -53,11 +55,7 @@ module HealthInspector
       end
 
       def load_item_from_local(name)
-        role = Chef::Role.new
-        role.from_file( "#{@context.repo_path}/roles/#{name}.rb" )
-        role.to_hash
-      rescue IOError
-        nil
+        load_ruby_or_json_from_local(Chef::Role, "roles", name)
       end
     end
 

data/lib/health_inspector/inspector.rb

@@ -5,7 +5,7 @@ module HealthInspector
     end
 
     def initialize(repo_path, config_path)
-      @context = Context.new( repo_path, File.join(repo_path, config_path) )
+      @context = Context.new( repo_path, config_path )
       @context.configure
     end
 

data/lib/health_inspector/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: health_inspector
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152269080 !ruby/object:Gem::Requirement
+  requirement: &70344534419540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152269080
+  version_requirements: *70344534419540
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152267660 !ruby/object:Gem::Requirement
+  requirement: &70344534418600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152267660
+  version_requirements: *70344534418600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152265580 !ruby/object:Gem::Requirement
+  requirement: &70344534418140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,18 +43,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152265580
+  version_requirements: *70344534418140
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &2152262860 !ruby/object:Gem::Requirement
+  requirement: &70344534417520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: '10.14'
   type: :runtime
   prerelease: false
-  version_requirements: *2152262860
+  version_requirements: *70344534417520
 description: A tool to inspect your chef repo as is compares to what is on your chef
   server
 email:
@@ -87,6 +87,7 @@ files:
 - lib/health_inspector/version.rb
 - spec/chef-repo/.chef/client.pem
 - spec/chef-repo/.chef/knife.rb
+- spec/chef-repo/data_bags/.gitkeep
 - spec/data_bag_item_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bmarini/health_inspector
@@ -116,5 +117,6 @@ summary: A tool to inspect your chef repo as is compares to what is on your chef
 test_files:
 - spec/chef-repo/.chef/client.pem
 - spec/chef-repo/.chef/knife.rb
+- spec/chef-repo/data_bags/.gitkeep
 - spec/data_bag_item_spec.rb
 - spec/spec_helper.rb