Make diff output friendlier by not printing defaults and printing in a specific order

1 files changed, 13 insertions, 5 deletions

diff --git a/lib/chef/chef_fs/data_handler/data_handler_base.rb b/lib/chef/chef_fs/data_handler/data_handler_base.rb
index 21a3735add..66c3d9dbdc 100644
--- a/lib/chef/chef_fs/data_handler/data_handler_base.rb
+++ b/lib/chef/chef_fs/data_handler/data_handler_base.rb
@@ -5,7 +5,7 @@ class Chef
         def minimize(object, *keys)
           default_object = default({}, *keys)
           object.each_pair do |key, value|
-            if default_object[key] == key
+            if default_object[key] == value
               object.delete(key)
             end
           end
@@ -16,6 +16,18 @@ class Chef
           normalize({}, *keys)
         end
 
+        def normalize(object, defaults)
+          # Make a normalized result in the specified order for diffing
+          result = {}
+          defaults.each_pair do |key, default|
+            result[key] = object.has_key?(key) ? object[key] : default
+          end
+          object.each_pair do |key, value|
+            result[key] = value if !result.has_key?(key)
+          end
+          result
+        end
+
         def normalize_run_list(run_list)
           run_list.map{|item|
             case item
@@ -41,10 +53,6 @@ class Chef
           raise NotImplementedError
         end
 
-        def normalize(object, *keys)
-          raise NotImplementedError
-        end
-
         def chef_class
           raise NotImplementedError
         end