Fixing the keys method to include auto_attrs

Author: adamhjk

chef/lib/chef/node.rb

@@ -300,7 +300,6 @@ def each_attribute(&block)
     def method_missing(symbol, *args)
       attrs = Chef::Node::Attribute.new(@normal_attrs, @default_attrs, @override_attrs, @automatic_attrs)
       attrs.set_type = :normal
-      attrs.auto_vivify_on_read = true 
       attrs.send(symbol, *args)
     end
 

chef/lib/chef/node/attribute.rb

@@ -236,18 +236,12 @@ def get_keys
       end
 
       def keys
-        tkeys = []
-        if current_override
-          tkeys = current_override.keys
-        end
-        if current_normal
-          current_normal.keys.each do |key|
-            tkeys << key unless tkeys.include?(key)
-          end
-        end
-        if current_default
-          current_default.keys.each do |key|
-            tkeys << key unless tkeys.include?(key)
+        tkeys = current_automatic ? current_automatic.keys : []
+        [ current_override, current_normal, current_default ].each do |attr_hash|
+          if attr_hash 
+            attr_hash.keys.each do |key|
+              tkeys << key unless tkeys.include?(key)
+            end
           end
         end
         tkeys

chef/spec/unit/client_spec.rb

@@ -127,6 +127,7 @@
       :hostname => "foo"
     }
     @mock_ohai.stub!(:refresh_plugins).and_return(true)
+    @mock_ohai.stub!(:data).and_return(@mock_ohai)
     Ohai::System.stub!(:new).and_return(@mock_ohai)
     @node = Chef::Node.new
     @mock_rest.stub!(:get_rest).and_return(@node)