knife-inspect 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e648a13d315a3c1c9da0ec48d1560d7c4a4dabd
-  data.tar.gz: 9ef1e150143ffff406ba9d667b01791215d91bb8
+  metadata.gz: c914c55c5bab76001d767fb579b224e41b440476
+  data.tar.gz: 837f0149b53a1c26a4966eace58a4be204e65992
 SHA512:
-  metadata.gz: 0db7de2d55926ada9f92bc65571f8fa31310389d88abee342bec923f8b4545324a5b4a8b80ca997cb2ff96993259ecc7a5e60dda06a45369d6d912edf8ec248d
-  data.tar.gz: 8c9a7d1fe7166a465b741e729c740da9bb4c761fcd2fb0dd681b2da2b7120ce9402c41984f41a4f4036226a8ee6a0d9b4b2fbf5bce77f9e69e2ba3653733fead
+  metadata.gz: 60e89b16ba9c72e8ebd04415fc6f7f582af5c7d939bfb6cec4a22ab1fe79d4b7b9cdcb90389403a8b69d6e3fb75aca0d82c9d0fd968011c5271b08840dbd0304
+  data.tar.gz: 0cd0462d49ac645f86f5c51c481779e6404f4a0de981b51fb54b884828f1a036a18b40ad0c93dee51bc38170c3c450f710906449b3d8d294f0b27fb84f4d49bf

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.1.2
+  - 2.1
 env:
   - CHEF_VERSION=10.32.2
   - CHEF_VERSION=11.14.2

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 0.11.0 ( 2014-10-27 )
+
+* Bug fix: recursive diff would stop if two keys were identical between local
+  and server ([#23][#23])
+
+
 ## 0.10.0 ( 2014-10-13 )
 
 * Feature: Support cookbooks that only have a `metadata.json` file but no
@@ -157,3 +163,4 @@ instead.
 [#25]: https://github.com/bmarini/knife-inspect/issues/25
 [#5]: https://github.com/bmarini/knife-inspect/issues/5
 [#27]: https://github.com/bmarini/knife-inspect/issues/27
+[#23]: https://github.com/bmarini/knife-inspect/issues/23

data/lib/health_inspector/checklists/base.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'pathname'
+require 'yajl'
 require 'parallel'
 
 module HealthInspector

data/lib/health_inspector/checklists/data_bag_items.rb

@@ -1,4 +1,5 @@
 require 'chef/data_bag'
+require 'yajl'
 
 module HealthInspector
   module Checklists

data/lib/health_inspector/checklists/roles.rb

@@ -1,5 +1,4 @@
 require 'chef/role'
-require 'yajl'
 
 module HealthInspector
   module Checklists

data/lib/health_inspector/pairing.rb

@@ -53,13 +53,13 @@ module HealthInspector
 
     def recursive_diff(original, other)
       (original.keys + other.keys).uniq.reduce({}) do |memo, key|
-        return memo if original[key] == other[key]
-
-        if original[key].is_a?(Hash) && other[key].is_a?(Hash)
-          diff = recursive_diff(original[key], other[key])
-          memo[key] = diff unless diff.empty?
-        else
-          memo[key] = { 'server' => original[key], 'local' => other[key] }
+        unless original[key] == other[key]
+          if original[key].is_a?(Hash) && other[key].is_a?(Hash)
+            diff = recursive_diff(original[key], other[key])
+            memo[key] = diff unless diff.empty?
+          else
+            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.10.0'
+  VERSION = '0.11.0'
 end

data/spec/spec_helper.rb

@@ -97,6 +97,21 @@ RSpec.shared_examples 'a chef model that can be represented in json' do
     expect(pairing.errors.first).to eq(expected_errors)
   end
 
+  it 'detects differences when the other keys are identical' do
+    pairing.server = { 'name' => 'bar', 'foo' => { 'bar' => { 'fizz' => 'buzz' } } }
+    pairing.local  = { 'name' => 'bar', 'foo' => { 'baz' => { 'fizz' => 'buzz' } } }
+    pairing.validate
+
+    expect(pairing.errors).not_to be_empty
+    expected_errors = {
+      'foo' => {
+        'bar' => { 'server' => { 'fizz' => 'buzz' }, 'local' => nil },
+        'baz' => { 'server' => nil, 'local' => { 'fizz' => 'buzz' } }
+      }
+    }
+    expect(pairing.errors.first).to eq(expected_errors)
+  end
+
   it 'detects if an item is the same' do
     pairing.server = { 'foo' => 'bar' }
     pairing.local  = { 'foo' => 'bar' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-inspect
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Greg Karékinian
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake