knife-inspect 0.6.0 → 0.6.2

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.6.2 ( 2013-02-27 )
+
+* Be indifferent about symbols and strings for hash keys when diff'ing
+
 ## 0.6.0 ( 2012-11-1 )
 
 * Add knife plugins for all existing functionality:

data/README.md

@@ -1,14 +1,14 @@
-[![Build Status](https://secure.travis-ci.org/bmarini/health_inspector.png)](http://travis-ci.org/bmarini/health_inspector)
+[![Build Status](https://secure.travis-ci.org/bmarini/knife-inspect.png)](http://travis-ci.org/bmarini/knife-inspect)
 
 ## Summary
 
-`health_inspector` is a knife plugin that inspects your chef repo as it
+`knife-inspect` is a knife plugin that inspects your chef repo as it
 compares to what is on your chef server. You can inspect your entire repo,
 or individual components.
 
 ## Usage
 
-    $ gem install health_inspector
+    $ gem install knife-inspect
     $ cd [chef repo]
 
 ## Knife Commands

data/lib/health_inspector/pairing.rb

@@ -37,13 +37,36 @@ module HealthInspector
       self.methods.grep(/^validate_/).each { |meth| send(meth) }
     end
 
+
     def hash_diff(original, other)
+      recursive_diff(stringify_hash_keys(original), stringify_hash_keys(other))
+    end
+    
+    def stringify_hash_keys(original)
+      original.keys.inject({}) do |original_strkey, key|
+        original_strkey[key.to_s] = stringify_item(original[key])
+        original_strkey
+      end
+    end
+    
+    def stringify_item(item)
+      if item.kind_of?(Hash)
+        stringify_hash_keys(item)
+      elsif item.kind_of?(Array)
+        item.map {|array_item| stringify_item(array_item) }
+      else # must be a string
+        item
+      end
+    end
+    
+    def recursive_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] = hash_diff(original[key], other[key])
+            diff = recursive_diff(original[key], other[key])
+            memo[key] = diff unless diff.empty?
           else
-            memo[key] = {"server" => original[key],"local" => other[key]}
+            memo[key] = {"server" => original[key], "local" => other[key]}
           end
         end
         memo

data/lib/health_inspector/version.rb

@@ -1,3 +1,3 @@
 module HealthInspector
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end

data/spec/spec_helper.rb

@@ -41,16 +41,64 @@ shared_examples "a chef model that can be respresented in json" do
     pairing.server = {"foo" => "bar"}
     pairing.local  = {"foo" => "baz"}
     pairing.validate
-
+  
     pairing.errors.should_not be_empty
     pairing.errors.first.should == {"foo"=>{"server"=>"bar", "local"=>"baz"}}
   end
-
+  
   it "should detect if an item is the same" do
     pairing.server = {"foo" => "bar"}
     pairing.local  = {"foo" => "bar"}
     pairing.validate
-
+  
+    pairing.errors.should be_empty
+  end
+  
+  it "should detect if an string and symbol keys convert to the same values" do
+    pairing.server = {"foo" => "bar"}
+    pairing.local  = {:foo => "bar"}
+    pairing.validate
+  
+    pairing.errors.should be_empty
+  end
+  
+  it "should detect if matching hashes are the same" do
+    pairing.server = {"foo" => {"bar" => "fizz"}}
+    pairing.local  = {"foo" => {"bar" => "fizz"}}
+    pairing.validate
+  
+    pairing.errors.should be_empty
+  end
+  
+  it "should detect if matching hashes with mismatched symbols and keys are the same" do
+    pairing.server = {"foo" => {"bar" => "fizz"}}
+    pairing.local  = {:foo => {:bar => "fizz"}}
+    pairing.validate
+  
+    pairing.errors.should be_empty
+  end
+  
+  it "should detect if matching arrays are the same" do
+    pairing.server = {"foo" => ["bar", "fizz"]}
+    pairing.local  = {"foo" => ["bar", "fizz"]}
+    pairing.validate
+  
+    pairing.errors.should be_empty
+  end
+  
+  it "should detect if matching arrays with hashes are the same" do
+    pairing.server = {"foo" => ["bar", {"fizz" => "buzz"}]}
+    pairing.local  = {"foo" => ["bar", {"fizz" => "buzz"}]}
+    pairing.validate
+  
+    pairing.errors.should be_empty
+  end
+  
+  it "should detect if matching arrays with hashes containing symbols/strings are the same" do
+    pairing.server = {"foo" => ["bar", {"fizz" => "buzz"}]}
+    pairing.local  = {"foo" => ["bar", {:fizz => "buzz"}]}
+    pairing.validate
+  
     pairing.errors.should be_empty
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-inspect
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70274490577920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274490577920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70274490573900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274490573900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70274490581800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274490581800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &70274490608360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '10.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70274490608360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.14'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70274490625560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274490625560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Inspect your chef repo as is compares to what is on your chef server
 email:
 - bmarini@gmail.com
@@ -125,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: knife-inspect
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Inspect your chef repo as is compares to what is on your chef server
@@ -138,3 +163,4 @@ test_files:
 - spec/environment_spec.rb
 - spec/role_spec.rb
 - spec/spec_helper.rb
+has_rdoc: