cheffish 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 338276289ac7fab89d006bc453e20266560948b7
-  data.tar.gz: 60ac99761729f96b46b5d12f38101fcf930008cc
+  metadata.gz: 7de0b0a59e8705c145dce86b294d9ec4ab0e43c4
+  data.tar.gz: 6239ca45f2db3ae775172f41666283c48ba78d39
 SHA512:
-  metadata.gz: d2fbe1a958c572c4c885d8bea5c2453bbd0cfbb9cd0fbba63a15cf47eb7266b946f66a900549b1a9f6b45186f378a01312c573accdadfc84c520b5a288a99753
-  data.tar.gz: 0676d6791b22f25d28ce7977b4e905e10bb8ab2cf44059af0b1cc6175ae6dcad98cebc73024dbb352829405a7237575f862559032105d13c4e95a0aa4270d7f7
+  metadata.gz: ac3f5b8b7a9f8d79846a9784225b1bc3babc07ec08c96d4c42ac61ee36ac65e8bb68ff36f0bb6f2d2ee6e9bbdd0441beb95f90b7b6db11e9e7b795b378d55bd1
+  data.tar.gz: 32907291f4a2ddfb3cdddaf69b44e4a5380eff0aeb0b7975a51fc450374f0747962f6eb19989e5c317fc1e1cf59395cd5e0bc6c840fe438fd8913a1f25831993

data/lib/cheffish/chef_provider_base.rb

@@ -31,8 +31,8 @@ module Cheffish
         if new_resource.complete
           result = normalize(resource_to_json(new_resource))
         else
-          # If resource is incomplete, use current json to fill any holes
-          result = Chef::Mixin::DeepMerge.hash_only_merge(current_json, resource_to_json(new_resource))
+          # If the resource is incomplete, we use the current json to fill any holes
+          result = current_json.merge(resource_to_json(new_resource))
         end
         augment_new_json(result)
       end
@@ -131,7 +131,18 @@ module Cheffish
       modifiers.each do |path, value|
         path = [path] if !path.kind_of?(Array)
         path = path.map { |path_part| path_part.to_s }
-        parent = path[0..-2].inject(json) { |hash, path_part| hash ? hash[path_part] : nil }
+        parent = 0.upto(path.size-2).inject(json) do |hash, index|
+          if hash.nil?
+            nil
+          elsif !hash.is_a?(Hash)
+            raise "Attempt to set #{path} to #{value} when #{path[0..index-1]} is not a hash"
+          else
+            hash[path[index]]
+          end
+        end
+        if !parent.nil? && !parent.is_a?(Hash)
+          raise "Attempt to set #{path} to #{value} when #{path[0..-2]} is not a hash"
+        end
         existing_value = parent ? parent[path[-1]] : nil
 
         if value.is_a?(Proc)
@@ -139,14 +150,11 @@ module Cheffish
         end
         if value == :delete
           parent.delete(path[-1]) if parent
-          # TODO clean up parent chain if hash is completely emptied
         else
-          if !parent
-            # Create parent if necessary
-            parent = path[0..-2].inject(json) do |hash, path_part|
-              hash[path_part] = {} if !hash[path_part]
-              hash[path_part]
-            end
+          # Create parent if necessary, overwriting values
+          parent = path[0..-2].inject(json) do |hash, path_part|
+            hash[path_part] = {} if !hash[path_part]
+            hash[path_part]
           end
           parent[path[-1]] = value
         end

data/lib/cheffish/version.rb

@@ -1,3 +1,3 @@
 module Cheffish
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/integration/chef_node_spec.rb

@@ -109,88 +109,676 @@ describe Chef::Resource::ChefNode do
       end
     end
 
-    context 'has a node named "blah" with everything in it' do
-      node 'blah', {
-        'chef_environment' => 'blah',
-        'run_list'  => [ 'recipe[bjork]' ],
-        'normal'    => { 'foo' => 'bar', 'tags' => [ 'a', 'b' ] },
-        'default'   => { 'foo2' => 'bar2' },
-        'automatic' => { 'foo3' => 'bar3' },
-        'override'  => { 'foo4' => 'bar4' }
-      }
+    describe '#complete' do
+      context 'when the Chef server has a node named "blah" with everything in it' do
+        node 'blah', {
+          'chef_environment' => 'blah',
+          'run_list'  => [ 'recipe[bjork]' ],
+          'normal'    => { 'foo' => 'bar', 'tags' => [ 'a', 'b' ] },
+          'default'   => { 'foo2' => 'bar2' },
+          'automatic' => { 'foo3' => 'bar3' },
+          'override'  => { 'foo4' => 'bar4' }
+        }
+
+        it 'chef_node with no attributes modifies nothing' do
+          run_recipe do
+            chef_node 'blah'
+          end
+          expect(get('nodes/blah')).to include(
+            'name' => 'blah',
+            'chef_environment' => 'blah',
+            'run_list'  => [ 'recipe[bjork]' ],
+            'normal'    => { 'foo' => 'bar', 'tags' => [ 'a', 'b' ] },
+            'default'   => { 'foo2' => 'bar2' },
+            'automatic' => { 'foo3' => 'bar3' },
+            'override'  => { 'foo4' => 'bar4' }
+          )
+        end
 
-      context 'with chef_node "blah"' do
-        with_converge do
-          chef_node 'blah'
+        it 'chef_node with complete true removes everything except default, automatic and override' do
+          run_recipe do
+            chef_node 'blah' do
+              complete true
+            end
+          end
+          expect(get('nodes/blah')).to include(
+            'name' => 'blah',
+            'chef_environment' => '_default',
+            'run_list'  => [ ],
+            'normal'    => { 'tags' => [ 'a', 'b' ] },
+            'default'   => { 'foo2' => 'bar2' },
+            'automatic' => { 'foo3' => 'bar3' },
+            'override'  => { 'foo4' => 'bar4' }
+          )
+        end
+
+        it 'chef_node with complete true sets the given attributes' do
+          run_recipe do
+            chef_node 'blah' do
+              chef_environment 'x'
+              run_list [ 'recipe[y]' ]
+              attributes 'a' => 'b'
+              tags 'c', 'd'
+              complete true
+            end
+          end
+          expect(get('nodes/blah')).to include(
+            'name' => 'blah',
+            'chef_environment' => 'x',
+            'run_list'  => [ 'recipe[y]' ],
+            'normal'    => { 'a' => 'b', 'tags' => [ 'c', 'd' ] },
+            'default'   => { 'foo2' => 'bar2' },
+            'automatic' => { 'foo3' => 'bar3' },
+            'override'  => { 'foo4' => 'bar4' }
+          )
         end
 
-        it 'nothing gets updated' do
-          expect(chef_run).not_to have_updated 'chef_node[blah]', :create
+        it 'chef_node with complete true and partial attributes sets the given attributes' do
+          run_recipe do
+            chef_node 'blah' do
+              chef_environment 'x'
+              recipe 'y'
+              attribute 'a', 'b'
+              tags 'c', 'd'
+              complete true
+            end
+          end
+          expect(get('nodes/blah')).to include(
+            'name' => 'blah',
+            'chef_environment' => 'x',
+            'run_list'  => [ 'recipe[y]' ],
+            'normal'    => { 'a' => 'b', 'tags' => [ 'c', 'd' ] },
+            'default'   => { 'foo2' => 'bar2' },
+            'automatic' => { 'foo3' => 'bar3' },
+            'override'  => { 'foo4' => 'bar4' }
+          )
         end
       end
+    end
 
-      context 'with chef_node "blah" and an updated normal attribute value' do
-        with_converge do
-          chef_node 'blah' do
-            attributes 'foo' => 'fum'
+    describe '#attributes' do
+      context 'with a node with normal attributes a => b and c => { d => e }' do
+        node 'blah', {
+          'normal' => {
+            'a' => 'b',
+            'c' => { 'd' => 'e' },
+            'tags' => [ 'a', 'b' ]
+          },
+          'automatic' => {
+            'x' => 'y'
+          },
+          'chef_environment' => 'desert'
+        }
+
+        it 'chef_node with attributes {} removes all normal attributes but leaves tags, automatic and environment alone' do
+          run_recipe do
+            chef_node 'blah' do
+              attributes({})
+            end
           end
+          expect(chef_run).to have_updated('chef_node[blah]', :create)
+          expect(get('nodes/blah')).to include(
+            'normal' => { 'tags' => [ 'a', 'b' ] },
+            'automatic' => { 'x' => 'y' },
+            'chef_environment' => 'desert'
+          )
         end
 
-        it 'new normal attribute is added' do
-          expect(chef_run).to have_updated 'chef_node[blah]', :create
-          node = get('nodes/blah')
-          expect(node['normal']).to eq({ 'foo' => 'fum', 'tags' => [ 'a', 'b' ] })
+        it 'chef_node with attributes { c => d } replaces normal but not tags/automatic/environment' do
+          run_recipe do
+            chef_node 'blah' do
+              attributes 'c' => 'd'
+            end
+          end
+          expect(chef_run).to have_updated('chef_node[blah]', :create)
+          expect(get('nodes/blah')).to include(
+            'normal' => { 'c' => 'd', 'tags' => [ 'a', 'b' ] },
+            'automatic' => { 'x' => 'y' },
+            'chef_environment' => 'desert'
+          )
         end
-      end
 
-      context 'with chef_node "blah" and a new normal attribute' do
-        with_converge do
-          chef_node 'blah' do
-            attributes 'foe' => 'fum'
+        it 'chef_node with attributes { c => f => g, y => z } replaces normal but not tags/automatic/environment' do
+          run_recipe do
+            chef_node 'blah' do
+              attributes 'c' => { 'f' => 'g' }, 'y' => 'z'
+            end
           end
+          expect(chef_run).to have_updated('chef_node[blah]', :create)
+          expect(get('nodes/blah')).to include(
+            'normal' => { 'c' => { 'f' => 'g' }, 'y' => 'z', 'tags' => [ 'a', 'b' ] },
+            'automatic' => { 'x' => 'y' },
+            'chef_environment' => 'desert'
+          )
         end
 
-        it 'new normal attribute is added' do
-          expect(chef_run).to have_updated 'chef_node[blah]', :create
-          node = get('nodes/blah')
-          expect(node['normal']).to eq({ 'foe' => 'fum', 'foo' => 'bar', 'tags' => [ 'a', 'b' ] })
+        it 'chef_node with attributes { tags => [ "x" ] } replaces normal and tags but not automatic/environment' do
+          run_recipe do
+            chef_node 'blah' do
+              attributes 'tags' => [ 'x' ]
+            end
+          end
+          expect(chef_run).to have_updated('chef_node[blah]', :create)
+          expect(get('nodes/blah')).to include(
+            'normal' => { 'tags' => [ 'x' ] },
+            'automatic' => { 'x' => 'y' },
+            'chef_environment' => 'desert'
+          )
+        end
+
+        it 'chef_node with tags "x" and attributes { "tags" => [ "y" ] } sets tags to "x"' do
+          run_recipe do
+            chef_node 'blah' do
+              tags 'x'
+              attributes 'tags' => [ 'y' ]
+            end
+          end
+          expect(chef_run).to have_updated('chef_node[blah]', :create)
+          expect(get('nodes/blah')).to include(
+            'normal' => {
+              'tags' => [ 'x' ]
+            },
+            'automatic' => { 'x' => 'y' },
+            'chef_environment' => 'desert'
+          )
         end
       end
+    end
 
-      context 'with chef_node "blah" with complete true' do
-        with_converge do
-          chef_node 'blah' do
-            complete true
+    describe '#attribute' do
+      context 'with a node with normal attributes a => b and c => { d => e }' do
+        node 'blah', {
+          'normal' => {
+            'a' => 'b',
+            'c' => { 'd' => 'e' },
+            'tags' => [ 'a', 'b' ]
+          },
+          'automatic' => {
+            'x' => 'y'
+          },
+          'chef_environment' => 'desert'
+        }
+
+        context 'basic scenarios' do
+          it 'chef_node with no attributes, leaves it alone' do
+            run_recipe do
+              chef_node 'blah'
+            end
+            expect(chef_run).not_to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute d, e adds the attribute' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'd', 'e'
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'e' },
+                'd' => 'e',
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute tags, [ "x" ] replaces tags' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'tags', [ 'x' ]
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'x' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute c, x replaces the attribute' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'c', 'x'
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => 'x',
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute c, { d => x } replaces the attribute' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'c', { 'd' => 'x' }
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'x' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute [ c, d ], x replaces the attribute' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute [ 'c', 'd' ], 'x'
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'x' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute [ a, b ], x raises an error' do
+            expect do
+              run_recipe do
+                chef_node 'blah' do
+                  attribute [ 'a', 'b' ], 'x'
+                end
+              end
+            end.to raise_error /Attempt to set \["a", "b"\] to x when \["a"\] is not a hash/
+          end
+
+          it 'chef_node with attribute [ a, b, c ], x raises an error' do
+            expect do
+              run_recipe do
+                chef_node 'blah' do
+                  attribute [ 'a', 'b', 'c' ], 'x'
+                end
+              end
+            end.to raise_error /Attempt to set \["a", "b", "c"\] to x when \["a"\] is not a hash/
+          end
+
+          it 'chef_node with attribute [ x, y ], z adds a new attribute' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute [ 'x', 'y' ], 'z'
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'e' },
+                'x' => { 'y' => 'z' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
           end
         end
 
-        it 'default, automatic and override attributes are left alone' do
-          expect(chef_run).to have_updated 'chef_node[blah]', :create
-          node = get('nodes/blah')
-          expect(node['chef_environment']).to eq('_default')
-          expect(node['run_list']).to eq([])
-          expect(node['normal']).to eq({ 'tags' => [ 'a', 'b' ] })
-          expect(node['default']).to eq({ 'foo2' => 'bar2' })
-          expect(node['automatic']).to eq({ 'foo3' => 'bar3' })
-          expect(node['override']).to eq({ 'foo4' => 'bar4' })
+        context 'delete' do
+          it 'chef_node with attribute a, :delete deletes the attribute' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'a', :delete
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute c, :delete deletes the attribute' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'c', :delete
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute [ c, d ], :delete deletes the attribute' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute [ 'c', 'd' ], :delete
+              end
+            end
+            expect(chef_run).to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => {},
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute xyz, :delete does nothing' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'xyz', :delete
+              end
+            end
+            expect(chef_run).not_to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute [ c, x ], :delete does nothing' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute [ 'c', 'x' ], :delete
+              end
+            end
+            expect(chef_run).not_to have_updated('chef_node[blah]', :create)
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
         end
-      end
 
-      context 'with chef_node "blah", complete true and a new normal attribute' do
-        with_converge do
-          chef_node 'blah' do
-            attributes 'foe' => 'fum'
-            complete true
+        context 'types' do
+          it 'chef_node with attribute a, true sets a to true' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'a', true
+              end
+            end
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => true,
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute a, 1 sets a to 1' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'a', 1
+              end
+            end
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 1,
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute a, "1" sets a to "1"' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'a', "1"
+              end
+            end
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => "1",
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute a, "" sets a to ""' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'a', ""
+              end
+            end
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => "",
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute a, nil sets a to nil' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'a', nil
+              end
+            end
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => nil,
+                'c' => { 'd' => 'e' },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
           end
         end
 
-        it 'normal foo attribute is replaced with new attribute' do
-          expect(chef_run).to have_updated 'chef_node[blah]', :create
-          node = get('nodes/blah')
-          expect(node['normal']).to eq({ 'foe' => 'fum', 'tags' => [ 'a', 'b' ] })
+        context 'multiple attribute definitions' do
+          it 'chef_node with attribute a, x and c, y replaces both attributes' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'a', 'x'
+                attribute 'c', 'y'
+              end
+            end
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'x',
+                'c' => 'y',
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute m, x and n, y adds both attributes' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute 'm', 'x'
+                attribute 'n', 'y'
+              end
+            end
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'e' },
+                'm' => 'x',
+                'n' => 'y',
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          it 'chef_node with attribute [x, y], z and [x, yy], zz adds both attributes' do
+            run_recipe do
+              chef_node 'blah' do
+                attribute [ 'x', 'y' ], 'z'
+                attribute [ 'x', 'yy' ], 'zz'
+              end
+            end
+            expect(get('nodes/blah')).to include(
+              'normal' => {
+                'a' => 'b',
+                'c' => { 'd' => 'e' },
+                'x' => {
+                  'y' => 'z',
+                  'yy' => 'zz'
+                },
+                'tags' => [ 'a', 'b' ]
+              },
+              'automatic' => { 'x' => 'y' },
+              'chef_environment' => 'desert'
+            )
+          end
+
+          describe 'precedence' do
+            it 'chef_node with attribute a, 1 and a, 2 sets a to 2' do
+              run_recipe do
+                chef_node 'blah' do
+                  attribute 'a', 1
+                  attribute 'a', 2
+                end
+              end
+              expect(get('nodes/blah')).to include(
+                'normal' => {
+                  'a' => 2,
+                  'c' => { 'd' => 'e' },
+                  'tags' => [ 'a', 'b' ]
+                },
+                'automatic' => { 'x' => 'y' },
+                'chef_environment' => 'desert'
+              )
+            end
+
+            it 'chef_node with attribute [ x, y ], 1 and [ x, y ], 2 sets [ x, y ], 2' do
+              run_recipe do
+                chef_node 'blah' do
+                  attribute [ 'x', 'y' ], 1
+                  attribute [ 'x', 'y' ], 2
+                end
+              end
+              expect(get('nodes/blah')).to include(
+                'normal' => {
+                  'a' => 'b',
+                  'c' => { 'd' => 'e' },
+                  'x' => { 'y' => 2 },
+                  'tags' => [ 'a', 'b' ]
+                },
+                'automatic' => { 'x' => 'y' },
+                'chef_environment' => 'desert'
+              )
+            end
+
+            it 'chef_node with attribute [ c, e ], { a => 1 }, [ c, e ], { b => 2 } sets b only' do
+              run_recipe do
+                chef_node 'blah' do
+                  attribute [ 'c', 'e' ], { 'a' => 1 }
+                  attribute [ 'c', 'e' ], { 'b' => 2 }
+                end
+              end
+              expect(get('nodes/blah')).to include(
+                'normal' => {
+                  'a' => 'b',
+                  'c' => { 'd' => 'e', 'e' => { 'b' => 2 } },
+                  'tags' => [ 'a', 'b' ]
+                },
+                'automatic' => { 'x' => 'y' },
+                'chef_environment' => 'desert'
+              )
+            end
+
+            it 'chef_node with attribute [ c, e ], { a => 1 }, [ c, e, b ], 2 sets both' do
+              run_recipe do
+                chef_node 'blah' do
+                  attribute [ 'c', 'e' ], { 'a' => 1 }
+                  attribute [ 'c', 'e', 'b' ], 2
+                end
+              end
+              expect(get('nodes/blah')).to include(
+                'normal' => {
+                  'a' => 'b',
+                  'c' => { 'd' => 'e', 'e' => { 'a' => 1, 'b' => 2 } },
+                  'tags' => [ 'a', 'b' ]
+                },
+                'automatic' => { 'x' => 'y' },
+                'chef_environment' => 'desert'
+              )
+            end
+
+            it 'chef_node with attribute [ c, e, b ], 2, [ c, e ], { a => 1 } sets a only' do
+              run_recipe do
+                chef_node 'blah' do
+                  attribute [ 'c', 'e', 'b' ], 2
+                  attribute [ 'c', 'e' ], { 'a' => 1 }
+                end
+              end
+              expect(get('nodes/blah')).to include(
+                'normal' => {
+                  'a' => 'b',
+                  'c' => { 'd' => 'e', 'e' => { 'a' => 1 } },
+                  'tags' => [ 'a', 'b' ]
+                },
+                'automatic' => { 'x' => 'y' },
+                'chef_environment' => 'desert'
+              )
+            end
+          end
         end
       end
-
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cheffish
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef