cheffish 0.8 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 427284963b463df3766e864b509ef9744b4495c8
-  data.tar.gz: 86fa11bb31ad0bf98942c410e18868eb8967e903
+  metadata.gz: 338276289ac7fab89d006bc453e20266560948b7
+  data.tar.gz: 60ac99761729f96b46b5d12f38101fcf930008cc
 SHA512:
-  metadata.gz: c52954a4961bbb4f880a8dc23fa8a3aa8ee2d931d7139eff910081eb3fb0e7f1469b1eb0f700771d865265521abb3bbde41b29b36913c6a8cb054b6732145a92
-  data.tar.gz: 42b1fda6ca8590848118e253ebc82e43e5ae17abdea2be29882e9f5f120af4a36038a66b2c7add5644bcfeb120157c39dddaa36eb4b270207774e3e5568cd11b
+  metadata.gz: d2fbe1a958c572c4c885d8bea5c2453bbd0cfbb9cd0fbba63a15cf47eb7266b946f66a900549b1a9f6b45186f378a01312c573accdadfc84c520b5a288a99753
+  data.tar.gz: 0676d6791b22f25d28ce7977b4e905e10bb8ab2cf44059af0b1cc6175ae6dcad98cebc73024dbb352829405a7237575f862559032105d13c4e95a0aa4270d7f7

data/lib/chef/provider/chef_mirror.rb

@@ -12,11 +12,36 @@ class Chef::Provider::ChefMirror < Chef::Provider::LWRPBase
   end
 
   action :upload do
-    copy_to(local_fs, remote_fs)
+    with_modified_config do
+      copy_to(local_fs, remote_fs)
+    end
   end
 
   action :download do
-    copy_to(remote_fs, local_fs)
+    with_modified_config do
+      copy_to(remote_fs, local_fs)
+    end
+  end
+
+  def with_modified_config
+    # pre-Chef-12 ChefFS reads versioned_cookbooks out of Chef::Config instead of
+    # taking it as an input, so we need to modify it for the duration of copy_to
+    @old_versioned_cookbooks = Chef::Config.versioned_cookbooks
+    # If versioned_cookbooks is explicitly set, set it.
+    if !new_resource.versioned_cookbooks.nil?
+      Chef::Config.versioned_cookbooks = new_resource.versioned_cookbooks
+
+    # If new_resource.chef_repo_path is set, versioned_cookbooks defaults to true.
+    # Otherwise, it stays at its current Chef::Config value.
+    elsif new_resource.chef_repo_path
+      Chef::Config.versioned_cookbooks = true
+    end
+
+    begin
+      yield
+    ensure
+      Chef::Config.versioned_cookbooks = @old_versioned_cookbooks
+    end
   end
 
   def copy_to(src_root, dest_root)
@@ -84,7 +109,8 @@ class Chef::Provider::ChefMirror < Chef::Provider::LWRPBase
       :chef_server_url => new_resource.chef_server[:chef_server_url],
       :node_name => new_resource.chef_server[:options][:client_name],
       :client_key => new_resource.chef_server[:options][:client_key],
-      :repo_mode => repo_mode
+      :repo_mode => repo_mode,
+      :versioned_cookbooks => Chef::Config.versioned_cookbooks
     }
     Chef::ChefFS::FileSystem::ChefServerRootDir.new("remote", config)
   end

data/lib/chef/resource/chef_mirror.rb

@@ -23,8 +23,9 @@ class Chef::Resource::ChefMirror < Chef::Resource::LWRPBase
   # versioned_cookbooks defaults to true.
   attribute :chef_repo_path, :kind_of => [ String, Hash ]
 
-  # Whether the repo path contains / should contain cookbooks with versioned names,
+  # Whether the repo path should contain cookbooks with versioned names,
   # i.e. cookbooks/mysql-1.0.0, cookbooks/mysql-1.2.0, etc.
+  # Defaults to true if chef_repo_path is specified, or to Chef::Config.versioned_cookbooks otherwise.
   attribute :versioned_cookbooks, :kind_of => [ TrueClass, FalseClass ]
 
   # Chef server

data/lib/cheffish/chef_provider_base.rb

@@ -32,7 +32,7 @@ module Cheffish
           result = normalize(resource_to_json(new_resource))
         else
           # If resource is incomplete, use current json to fill any holes
-          result = current_json.merge(resource_to_json(new_resource))
+          result = Chef::Mixin::DeepMerge.hash_only_merge(current_json, resource_to_json(new_resource))
         end
         augment_new_json(result)
       end

data/lib/cheffish/recipe_dsl.rb

@@ -138,7 +138,7 @@ else
   class Chef
     class Util
       class PathHelper
-        def join(*args)
+        def self.join(*args)
           Chef::Config.path_join(*args)
         end
       end

data/lib/cheffish/version.rb

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

data/spec/integration/chef_client_spec.rb

@@ -8,7 +8,7 @@ repo_path = Dir.mktmpdir('chef_repo')
 describe Chef::Resource::ChefClient do
   extend SpecSupport
 
-  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+  when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'
 
     before :each do

data/spec/integration/chef_container_spec.rb

@@ -5,7 +5,7 @@ require 'chef/provider/chef_container'
 describe Chef::Resource::ChefContainer do
   extend SpecSupport
 
-  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+  when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'
 
     before :each do

data/spec/integration/chef_group_spec.rb

@@ -5,7 +5,7 @@ require 'chef/provider/chef_group'
 describe Chef::Resource::ChefGroup do
   extend SpecSupport
 
-  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+  when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'
 
     before :each do

data/spec/integration/chef_mirror_spec.rb

@@ -5,17 +5,20 @@ require 'chef/provider/chef_mirror'
 describe Chef::Resource::ChefMirror do
   extend SpecSupport
 
-  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+  when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'
 
     before :each do
       Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo').to_s
     end
 
-    context 'and is empty' do
+    describe 'basic download and upload' do
       when_the_repository 'is full of stuff' do
         file 'nodes/x.json', {}
         file 'roles/x.json', {}
+        directory 'cookbooks/x' do
+          file 'metadata.rb', 'name "x"; version "2.0.0"'
+        end
 
         it "Download grabs defaults" do
           run_recipe do
@@ -37,6 +40,7 @@ describe Chef::Resource::ChefMirror do
           expect(chef_run).to have_updated('chef_mirror[]', :upload)
           expect { get('nodes/x') }.not_to raise_error
           expect { get('roles/x') }.not_to raise_error
+          expect { get('cookbooks/x/2.0.0') }.not_to raise_error
         end
 
         it 'chef_mirror with concurrency 0 fails with a reasonable message' do
@@ -50,7 +54,96 @@ describe Chef::Resource::ChefMirror do
           }.to raise_error /chef_mirror.concurrency must be above 0/
         end
       end
+    end
+
+    context 'and the Chef server has a node and role in it' do
+      node 'x', {}
+      role 'x', {}
+
+      when_the_repository 'is empty' do
+        it "Download grabs the node and role" do
+          run_recipe do
+            chef_mirror '' do
+              action :download
+            end
+          end
+          expect(chef_run).to have_updated('chef_mirror[]', :download)
+          expect(File.exist?(path_to('nodes/x.json'))).to be true
+          expect(File.exist?(path_to('roles/x.json'))).to be true
+        end
+
+        it "Upload uploads nothing" do
+          run_recipe do
+            chef_mirror '' do
+              action :upload
+            end
+          end
+          expect(chef_run).not_to have_updated('chef_mirror[]', :upload)
+        end
+      end
+    end
+
+    context 'and the Chef server has nodes and roles named x' do
+      node 'x', {}
+      role 'x', {}
+
+      when_the_repository 'has nodes and roles named y' do
+        file 'nodes/y.json', {}
+        file 'roles/y.json', {}
+
+        it "Download grabs the x's" do
+          run_recipe do
+            chef_mirror '' do
+              action :download
+            end
+          end
+          expect(chef_run).to have_updated('chef_mirror[]', :download)
+          expect(File.exist?(path_to('nodes/x.json'))).to be true
+          expect(File.exist?(path_to('roles/x.json'))).to be true
+          expect(File.exist?(path_to('nodes/y.json'))).to be true
+          expect(File.exist?(path_to('roles/y.json'))).to be true
+        end
+
+        it "Upload uploads the y's" do
+          run_recipe do
+            chef_mirror '' do
+              action :upload
+            end
+          end
+          expect(chef_run).to have_updated('chef_mirror[]', :upload)
+          expect { get('nodes/x') }.not_to raise_error
+          expect { get('roles/x') }.not_to raise_error
+          expect { get('nodes/y') }.not_to raise_error
+          expect { get('roles/y') }.not_to raise_error
+        end
+
+        it "Download with purge grabs the x's and deletes the y's" do
+          run_recipe do
+            chef_mirror '' do
+              purge true
+              action :download
+            end
+          end
+          expect(chef_run).to have_updated('chef_mirror[]', :download)
+          expect(File.exist?(path_to('nodes/x.json'))).to be true
+          expect(File.exist?(path_to('roles/x.json'))).to be true
+        end
+
+        it "Upload with :purge uploads the y's and deletes the x's" do
+          run_recipe do
+            chef_mirror '*/*.json' do
+              purge true
+              action :upload
+            end
+          end
+          expect(chef_run).to have_updated('chef_mirror[*/*.json]', :upload)
+          expect { get('nodes/y') }.not_to raise_error
+          expect { get('roles/y') }.not_to raise_error
+        end
+      end
+    end
 
+    describe "chef_repo_path" do
       when_the_repository 'has stuff but no chef_repo_path' do
         file 'repo/nodes/x.json', {}
         file 'repo/roles/x.json', {}
@@ -153,92 +246,274 @@ describe Chef::Resource::ChefMirror do
       end
     end
 
-    context 'and has stuff' do
-      node 'x', {}
-      role 'x', {}
+    describe "cookbook upload, chef_repo_path and versioned_cookbooks" do
+      when_the_repository 'has cookbooks in non-versioned format' do
+        file 'cookbooks/x-1.0.0/metadata.rb', 'name "x-1.0.0"; version "2.0.0"'
+        file 'cookbooks/y-1.0.0/metadata.rb', 'name "y-3.0.0"; version "4.0.0"'
 
-      when_the_repository 'is empty' do
-        it "Download grabs stuff" do
+        it "chef_mirror :upload uploads everything" do
           run_recipe do
             chef_mirror '' do
-              action :download
+              action :upload
             end
           end
-          expect(chef_run).to have_updated('chef_mirror[]', :download)
-          expect(File.exist?(path_to('nodes/x.json'))).to be true
-          expect(File.exist?(path_to('roles/x.json'))).to be true
+          expect(chef_run).to have_updated('chef_mirror[]', :upload)
+          expect { get('cookbooks/x-1.0.0/2.0.0') }.not_to raise_error
+          expect { get('cookbooks/y-3.0.0/4.0.0') }.not_to raise_error
         end
 
-        it "Upload uploads nothing" do
-          run_recipe do
-            chef_mirror '' do
-              action :upload
+        context 'and Chef::Config.versioned_cookbooks is false' do
+          before do
+            Chef::Config.versioned_cookbooks false
+          end
+          it "chef_mirror :upload uploads everything" do
+            run_recipe do
+              chef_mirror '' do
+                action :upload
+              end
             end
+            expect(chef_run).to have_updated('chef_mirror[]', :upload)
+            expect { get('cookbooks/x-1.0.0/2.0.0') }.not_to raise_error
+            expect { get('cookbooks/y-3.0.0/4.0.0') }.not_to raise_error
           end
-          expect(chef_run).not_to have_updated('chef_mirror[]', :upload)
         end
-      end
-    end
 
-    context 'and has nodes and roles named x' do
-      node 'x', {}
-      role 'x', {}
+        context 'and Chef::Config.chef_repo_path is not set but versioned_cookbooks is false' do
+          before do
+            Chef::Config.delete(:chef_repo_path)
+            Chef::Config.versioned_cookbooks false
+          end
 
-      when_the_repository 'has nodes and roles named y' do
-        file 'nodes/y.json', {}
-        file 'roles/y.json', {}
+          it "chef_mirror :upload with chef_repo_path and versioned_cookbooks false uploads cookbooks with name including version" do
+            repository_dir = @repository_dir
+            run_recipe do
+              chef_mirror '' do
+                chef_repo_path repository_dir
+                versioned_cookbooks false
+                action :upload
+              end
+            end
+            expect(chef_run).to have_updated('chef_mirror[]', :upload)
+            expect { get('cookbooks/x-1.0.0/2.0.0') }.not_to raise_error
+            expect { get('cookbooks/y-3.0.0/4.0.0') }.not_to raise_error
+          end
+        end
+      end
 
-        it "Download grabs the x's" do
-          run_recipe do
-            chef_mirror '' do
-              action :download
+      when_the_repository 'has cookbooks in versioned_cookbook format' do
+        file 'cookbooks/x-1.0.0/metadata.rb', 'name "x"; version "1.0.0"'
+        file 'cookbooks/x-2.0.0/metadata.rb', 'name "x"; version "2.0.0"'
+
+        context 'and Chef::Config.versioned_cookbooks is true' do
+          before do
+            Chef::Config.versioned_cookbooks true
+          end
+          it "chef_mirror :upload uploads everything" do
+            run_recipe do
+              chef_mirror '' do
+                action :upload
+              end
             end
+            expect(chef_run).to have_updated('chef_mirror[]', :upload)
+            expect { get('cookbooks/x/1.0.0') }.not_to raise_error
+            expect { get('cookbooks/x/2.0.0') }.not_to raise_error
           end
-          expect(chef_run).to have_updated('chef_mirror[]', :download)
-          expect(File.exist?(path_to('nodes/x.json'))).to be true
-          expect(File.exist?(path_to('roles/x.json'))).to be true
-          expect(File.exist?(path_to('nodes/y.json'))).to be true
-          expect(File.exist?(path_to('roles/y.json'))).to be true
         end
 
-        it "Upload uploads the y's" do
-          run_recipe do
-            chef_mirror '' do
-              action :upload
+        context 'and Chef::Config.chef_repo_path set somewhere else' do
+          before do
+            Chef::Config.chef_repo_path = '/x/y/z'
+          end
+          it "chef_mirror :upload with chef_repo_path uploads cookbooks" do
+            repository_dir = @repository_dir
+            run_recipe do
+              chef_mirror '' do
+                chef_repo_path repository_dir
+                action :upload
+              end
             end
+            expect(chef_run).to have_updated('chef_mirror[]', :upload)
+            expect { get('cookbooks/x/1.0.0') }.not_to raise_error
+            expect { get('cookbooks/x/2.0.0') }.not_to raise_error
           end
-          expect(chef_run).to have_updated('chef_mirror[]', :upload)
-          expect { get('nodes/x') }.not_to raise_error
-          expect { get('roles/x') }.not_to raise_error
-          expect { get('nodes/y') }.not_to raise_error
-          expect { get('roles/y') }.not_to raise_error
         end
 
-        it "Download with purge grabs the x's and deletes the y's" do
-          run_recipe do
-            chef_mirror '' do
-              purge true
-              action :download
+        context 'and Chef::Config.chef_repo_path is not set but versioned_cookbooks is false' do
+          before do
+            Chef::Config.delete(:chef_repo_path)
+            Chef::Config.versioned_cookbooks false
+          end
+
+          it "chef_mirror :upload with chef_repo_path uploads cookbooks with name split from version" do
+            repository_dir = @repository_dir
+            run_recipe do
+              chef_mirror '' do
+                chef_repo_path repository_dir
+                action :upload
+              end
             end
+            expect(chef_run).to have_updated('chef_mirror[]', :upload)
+            expect { get('cookbooks/x/1.0.0') }.not_to raise_error
+            expect { get('cookbooks/x/2.0.0') }.not_to raise_error
+          end
+
+          it "chef_mirror :upload with chef_repo_path and versioned_cookbooks uploads cookbooks with name split from version" do
+            repository_dir = @repository_dir
+            run_recipe do
+              chef_mirror '' do
+                chef_repo_path repository_dir
+                versioned_cookbooks true
+                action :upload
+              end
+            end
+            expect(chef_run).to have_updated('chef_mirror[]', :upload)
+            expect { get('cookbooks/x/1.0.0') }.not_to raise_error
+            expect { get('cookbooks/x/2.0.0') }.not_to raise_error
           end
-          expect(chef_run).to have_updated('chef_mirror[]', :download)
-          expect(File.exist?(path_to('nodes/x.json'))).to be true
-          expect(File.exist?(path_to('roles/x.json'))).to be true
         end
 
-        it "Upload with :purge uploads the y's and deletes the x's" do
-          run_recipe do
-            chef_mirror '*/*.json' do
-              purge true
-              action :upload
+        context 'and Chef::Config.chef_repo_path is not set but versioned_cookbooks is true' do
+          before do
+            Chef::Config.delete(:chef_repo_path)
+            Chef::Config.versioned_cookbooks true
+          end
+          it "chef_mirror :upload with chef_repo_path uploads cookbooks with name split from version" do
+            repository_dir = @repository_dir
+            run_recipe do
+              chef_mirror '' do
+                chef_repo_path repository_dir
+                action :upload
+              end
             end
+            expect(chef_run).to have_updated('chef_mirror[]', :upload)
+            expect { get('cookbooks/x/1.0.0') }.not_to raise_error
+            expect { get('cookbooks/x/2.0.0') }.not_to raise_error
           end
-          expect(chef_run).to have_updated('chef_mirror[*/*.json]', :upload)
-          expect { get('nodes/y') }.not_to raise_error
-          expect { get('roles/y') }.not_to raise_error
         end
       end
     end
 
+    describe 'cookbook download, chef_repo_path, and versioned_cookbooks' do
+      context 'when the Chef server has a cookbook with multiple versions' do
+        cookbook 'x', '1.0.0', 'metadata.rb' => 'name "x"; version "1.0.0"'
+        cookbook 'x', '2.0.0', 'metadata.rb' => 'name "x"; version "2.0.0"'
+
+        when_the_repository 'is empty' do
+          it 'chef_mirror :download downloads the latest version of the cookbook' do
+            run_recipe do
+              chef_mirror '' do
+                action :download
+              end
+            end
+            expect(chef_run).to have_updated('chef_mirror[]', :download)
+            expect(File.read(path_to('cookbooks/x/metadata.rb'))).to eq('name "x"; version "2.0.0"')
+          end
+
+          it 'chef_mirror :download with versioned_cookbooks = true downloads all versions of the cookbook' do
+            run_recipe do
+              chef_mirror '' do
+                versioned_cookbooks true
+                action :download
+              end
+            end
+            expect(chef_run).to have_updated('chef_mirror[]', :download)
+            expect(File.read(path_to('cookbooks/x-1.0.0/metadata.rb'))).to eq('name "x"; version "1.0.0"')
+            expect(File.read(path_to('cookbooks/x-2.0.0/metadata.rb'))).to eq('name "x"; version "2.0.0"')
+          end
+
+          context 'and Chef::Config.chef_repo_path is set elsewhere' do
+            before do
+              Chef::Config.chef_repo_path = '/x/y/z'
+            end
+
+            it 'chef_mirror :download with chef_repo_path downloads all versions of the cookbook' do
+              repository_dir = @repository_dir
+              run_recipe do
+                chef_mirror '' do
+                  chef_repo_path repository_dir
+                  action :download
+                end
+              end
+              expect(chef_run).to have_updated('chef_mirror[]', :download)
+              expect(File.read(path_to('cookbooks/x-1.0.0/metadata.rb'))).to eq('name "x"; version "1.0.0"')
+              expect(File.read(path_to('cookbooks/x-2.0.0/metadata.rb'))).to eq('name "x"; version "2.0.0"')
+            end
+
+            it 'chef_mirror :download with chef_repo_path and versioned_cookbooks = false downloads the latest version of the cookbook' do
+              repository_dir = @repository_dir
+              run_recipe do
+                chef_mirror '' do
+                  chef_repo_path repository_dir
+                  versioned_cookbooks false
+                  action :download
+                end
+              end
+              expect(chef_run).to have_updated('chef_mirror[]', :download)
+              expect(File.read(path_to('cookbooks/x/metadata.rb'))).to eq('name "x"; version "2.0.0"')
+            end
+          end
+
+          context 'and Chef::Config.versioned_cookbooks is true' do
+            before do
+              Chef::Config.versioned_cookbooks = true
+            end
+
+            it 'chef_mirror :download downloads all versions of the cookbook' do
+              run_recipe do
+                chef_mirror '' do
+                  action :download
+                end
+              end
+              expect(chef_run).to have_updated('chef_mirror[]', :download)
+              expect(File.read(path_to('cookbooks/x-1.0.0/metadata.rb'))).to eq('name "x"; version "1.0.0"')
+              expect(File.read(path_to('cookbooks/x-2.0.0/metadata.rb'))).to eq('name "x"; version "2.0.0"')
+            end
+
+            it 'chef_mirror :download with versioned_cookbooks = false downloads the latest version of the cookbook' do
+              run_recipe do
+                chef_mirror '' do
+                  versioned_cookbooks false
+                  action :download
+                end
+              end
+              expect(chef_run).to have_updated('chef_mirror[]', :download)
+              expect(File.read(path_to('cookbooks/x/metadata.rb'))).to eq('name "x"; version "2.0.0"')
+            end
+
+            context 'and Chef::Config.chef_repo_path is set elsewhere' do
+              before do
+                Chef::Config.chef_repo_path = '/x/y/z'
+              end
+
+              it 'chef_mirror :download with chef_repo_path downloads all versions of the cookbook' do
+                repository_dir = @repository_dir
+                run_recipe do
+                  chef_mirror '' do
+                    chef_repo_path repository_dir
+                    action :download
+                  end
+                end
+                expect(chef_run).to have_updated('chef_mirror[]', :download)
+                expect(File.read(path_to('cookbooks/x-1.0.0/metadata.rb'))).to eq('name "x"; version "1.0.0"')
+                expect(File.read(path_to('cookbooks/x-2.0.0/metadata.rb'))).to eq('name "x"; version "2.0.0"')
+              end
+
+              it 'chef_mirror :download with chef_repo_path and versioned_cookbooks = false downloads the latest version of the cookbook' do
+                repository_dir = @repository_dir
+                run_recipe do
+                  chef_mirror '' do
+                    chef_repo_path repository_dir
+                    versioned_cookbooks false
+                    action :download
+                  end
+                end
+                expect(chef_run).to have_updated('chef_mirror[]', :download)
+                expect(File.read(path_to('cookbooks/x/metadata.rb'))).to eq('name "x"; version "2.0.0"')
+              end
+            end
+          end
+        end
+      end
+    end
   end
 end

data/spec/integration/chef_node_spec.rb

@@ -5,7 +5,7 @@ require 'chef/provider/chef_node'
 describe Chef::Resource::ChefNode do
   extend SpecSupport
 
-  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+  when_the_chef_12_server 'is in multi-org mode' do
     organization 'foo'
 
     before :each do
@@ -129,6 +129,34 @@ describe Chef::Resource::ChefNode do
         end
       end
 
+      context 'with chef_node "blah" and an updated normal attribute value' do
+        with_converge do
+          chef_node 'blah' do
+            attributes 'foo' => 'fum'
+          end
+        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' ] })
+        end
+      end
+
+      context 'with chef_node "blah" and a new normal attribute' do
+        with_converge do
+          chef_node 'blah' do
+            attributes 'foe' => 'fum'
+          end
+        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' ] })
+        end
+      end
+
       context 'with chef_node "blah" with complete true' do
         with_converge do
           chef_node 'blah' do
@@ -147,6 +175,22 @@ describe Chef::Resource::ChefNode do
           expect(node['override']).to eq({ 'foo4' => 'bar4' })
         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
+          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' ] })
+        end
+      end
+
     end
   end
 

data/spec/integration/chef_organization_spec.rb

@@ -5,7 +5,7 @@ require 'chef/provider/chef_organization'
 describe Chef::Resource::ChefOrganization do
   extend SpecSupport
 
-  when_the_chef_server 'is in multi-org mode', :osc_compat => false, :single_org => false do
+  when_the_chef_12_server 'is in multi-org mode' do
     context 'and chef_server_url is pointed at the top level' do
       user 'u', {}
       user 'u2', {}

data/spec/integration/chef_user_spec.rb

@@ -44,7 +44,7 @@ describe Chef::Resource::ChefUser do
     end
   end
 
-  when_the_chef_server 'is multitenant', :osc_compat => false, :single_org => false do
+  when_the_chef_12_server 'is in multi-org mode' do
     context 'and chef_server_url is pointed at the top level' do
       context 'and we run a recipe that creates user "blah"'do
         with_converge do

data/spec/support/spec_support.rb

@@ -9,6 +9,12 @@ require 'support/repository_support'
 module SpecSupport
   include ChefZero::RSpec
 
+  def when_the_chef_12_server(*args, &block)
+    if Gem::Version.new(ChefZero::VERSION) >= Gem::Version.new('3.1')
+      when_the_chef_server(*args, :osc_compat => false, :single_org => false, &block)
+    end
+  end
+
   def self.extended(klass)
     klass.class_eval do
       extend RepositorySupport

metadata

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