chef 12.0.0.alpha.0 → 12.0.0.alpha.1

data/spec/integration/knife/chef_repo_path_spec.rb

@@ -21,36 +21,38 @@ require 'chef/knife/list'
 require 'chef/knife/show'
 
 describe 'chef_repo_path tests' do
-  extend IntegrationSupport
+  include IntegrationSupport
   include KnifeSupport
 
   # TODO alternate repo_path / *_path
   context 'alternate *_path' do
     when_the_repository 'has clients and clients2, cookbooks and cookbooks2, etc.' do
-      file 'clients/client1.json', {}
-      file 'cookbooks/cookbook1/metadata.rb', ''
-      file 'data_bags/bag/item.json', {}
-      file 'environments/env1.json', {}
-      file 'nodes/node1.json', {}
-      file 'roles/role1.json', {}
-      file 'users/user1.json', {}
-
-      file 'clients2/client2.json', {}
-      file 'cookbooks2/cookbook2/metadata.rb', ''
-      file 'data_bags2/bag2/item2.json', {}
-      file 'environments2/env2.json', {}
-      file 'nodes2/node2.json', {}
-      file 'roles2/role2.json', {}
-      file 'users2/user2.json', {}
-
-      directory 'chef_repo2' do
-        file 'clients/client3.json', {}
-        file 'cookbooks/cookbook3/metadata.rb', ''
-        file 'data_bags/bag3/item3.json', {}
-        file 'environments/env3.json', {}
-        file 'nodes/node3.json', {}
-        file 'roles/role3.json', {}
-        file 'users/user3.json', {}
+      before do
+        file 'clients/client1.json', {}
+        file 'cookbooks/cookbook1/metadata.rb', ''
+        file 'data_bags/bag/item.json', {}
+        file 'environments/env1.json', {}
+        file 'nodes/node1.json', {}
+        file 'roles/role1.json', {}
+        file 'users/user1.json', {}
+
+        file 'clients2/client2.json', {}
+        file 'cookbooks2/cookbook2/metadata.rb', ''
+        file 'data_bags2/bag2/item2.json', {}
+        file 'environments2/env2.json', {}
+        file 'nodes2/node2.json', {}
+        file 'roles2/role2.json', {}
+        file 'users2/user2.json', {}
+
+        directory 'chef_repo2' do
+          file 'clients/client3.json', {}
+          file 'cookbooks/cookbook3/metadata.rb', ''
+          file 'data_bags/bag3/item3.json', {}
+          file 'environments/env3.json', {}
+          file 'nodes/node3.json', {}
+          file 'roles/role3.json', {}
+          file 'users/user3.json', {}
+        end
       end
 
       it 'knife list --local -Rfp --chef-repo-path chef_repo2 / grabs chef_repo2 stuff' do
@@ -105,21 +107,21 @@ EOM
         end
 
         context 'when cwd is at the top level' do
-          cwd '.'
+          before { cwd '.' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
+          before { cwd 'chef_repo2' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -143,7 +145,7 @@ EOM
         end
 
         context 'when cwd is inside data_bags2' do
-          cwd 'data_bags2'
+          before { cwd 'data_bags2' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag2/
@@ -164,7 +166,7 @@ EOM
         end
 
         context 'when cwd is at the top level' do
-          cwd '.'
+          before { cwd '.' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -188,21 +190,21 @@ EOM
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
+          before { cwd 'chef_repo2' }
           it 'knife list -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside data_bags2' do
-          cwd 'data_bags2'
+          before { cwd 'data_bags2' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag2/
@@ -221,21 +223,21 @@ EOM
         end
 
         context 'when cwd is at the top level' do
-          cwd '.'
+          before { cwd '.' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
+          before { cwd 'chef_repo2' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -259,7 +261,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2/data_bags' do
-          cwd 'chef_repo2/data_bags'
+          before { cwd 'chef_repo2/data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag3/
@@ -281,20 +283,25 @@ EOM
         end
 
         context 'when there is a directory in clients1 and file in clients2 with the same name' do
-          directory 'clients/blah.json'
-          file 'clients2/blah.json', {}
+          before do
+            directory 'clients/blah.json'
+            file 'clients2/blah.json', {}
+          end
           it 'knife show /clients/blah.json succeeds' do
             knife('show --local /clients/blah.json').should_succeed <<EOM
 /clients/blah.json:
 {
+
 }
 EOM
           end
         end
 
         context 'when there is a file in cookbooks1 and directory in cookbooks2 with the same name' do
-          file 'cookbooks/blah', ''
-          file 'cookbooks2/blah/metadata.rb', ''
+          before do
+            file 'cookbooks/blah', ''
+            file 'cookbooks2/blah/metadata.rb', ''
+          end
           it 'knife list -Rfp cookbooks shows files in blah' do
             knife('list --local -Rfp /cookbooks').should_succeed <<EOM
 /cookbooks/blah/
@@ -308,8 +315,10 @@ EOM
         end
 
         context 'when there is an empty directory in cookbooks1 and a real cookbook in cookbooks2 with the same name' do
-          directory 'cookbooks/blah'
-          file 'cookbooks2/blah/metadata.rb', ''
+          before do
+            directory 'cookbooks/blah'
+            file 'cookbooks2/blah/metadata.rb', ''
+          end
           it 'knife list -Rfp cookbooks shows files in blah' do
             knife('list --local -Rfp /cookbooks').should_succeed(<<EOM, :stderr => "WARN: Cookbook 'blah' is empty or entirely chefignored at #{Chef::Config.cookbook_path[0]}/blah\n")
 /cookbooks/blah/
@@ -323,8 +332,10 @@ EOM
         end
 
         context 'when there is a cookbook in cookbooks1 and a cookbook in cookbooks2 with the same name' do
-          file 'cookbooks/blah/metadata.json', {}
-          file 'cookbooks2/blah/metadata.rb', ''
+          before do
+            file 'cookbooks/blah/metadata.json', {}
+            file 'cookbooks2/blah/metadata.rb', ''
+          end
           it 'knife list -Rfp cookbooks shows files in the first cookbook and not the second' do
             knife('list --local -Rfp /cookbooks').should_succeed(<<EOM, :stderr => "WARN: Child with name 'blah' found in multiple directories: #{Chef::Config.cookbook_path[0]}/blah and #{Chef::Config.cookbook_path[1]}/blah\n")
 /cookbooks/blah/
@@ -338,8 +349,10 @@ EOM
         end
 
         context 'when there is a file in data_bags1 and a directory in data_bags2 with the same name' do
-          file 'data_bags/blah', ''
-          file 'data_bags2/blah/item.json', ''
+          before do
+            file 'data_bags/blah', ''
+            file 'data_bags2/blah/item.json', ''
+          end
           it 'knife list -Rfp data_bags shows files in blah' do
             knife('list --local -Rfp /data_bags').should_succeed <<EOM
 /data_bags/bag/
@@ -353,8 +366,10 @@ EOM
         end
 
         context 'when there is a data bag in data_bags1 and a data bag in data_bags2 with the same name' do
-          file 'data_bags/blah/item1.json', ''
-          file 'data_bags2/blah/item2.json', ''
+          before do
+            file 'data_bags/blah/item1.json', ''
+            file 'data_bags2/blah/item2.json', ''
+          end
           it 'knife list -Rfp data_bags shows only items in data_bags1' do
             knife('list --local -Rfp /data_bags').should_succeed(<<EOM, :stderr => "WARN: Child with name 'blah' found in multiple directories: #{Chef::Config.data_bag_path[0]}/blah and #{Chef::Config.data_bag_path[1]}/blah\n")
 /data_bags/bag/
@@ -368,62 +383,74 @@ EOM
         end
 
         context 'when there is a directory in environments1 and file in environments2 with the same name' do
-          directory 'environments/blah.json'
-          file 'environments2/blah.json', {}
+          before do
+            directory 'environments/blah.json'
+            file 'environments2/blah.json', {}
+          end
           it 'knife show /environments/blah.json succeeds' do
             knife('show --local /environments/blah.json').should_succeed <<EOM
 /environments/blah.json:
 {
+
 }
 EOM
           end
         end
 
         context 'when there is a directory in nodes1 and file in nodes2 with the same name' do
-          directory 'nodes/blah.json'
-          file 'nodes2/blah.json', {}
+          before do
+            directory 'nodes/blah.json'
+            file 'nodes2/blah.json', {}
+          end
           it 'knife show /nodes/blah.json succeeds' do
             knife('show --local /nodes/blah.json').should_succeed <<EOM
 /nodes/blah.json:
 {
+
 }
 EOM
           end
         end
 
         context 'when there is a directory in roles1 and file in roles2 with the same name' do
-          directory 'roles/blah.json'
-          file 'roles2/blah.json', {}
+          before do
+            directory 'roles/blah.json'
+            file 'roles2/blah.json', {}
+          end
           it 'knife show /roles/blah.json succeeds' do
             knife('show --local /roles/blah.json').should_succeed <<EOM
 /roles/blah.json:
 {
+
 }
 EOM
           end
         end
 
         context 'when there is a directory in users1 and file in users2 with the same name' do
-          directory 'users/blah.json'
-          file 'users2/blah.json', {}
+          before do
+            directory 'users/blah.json'
+            file 'users2/blah.json', {}
+          end
           it 'knife show /users/blah.json succeeds' do
             knife('show --local /users/blah.json').should_succeed <<EOM
 /users/blah.json:
 {
+
 }
 EOM
           end
         end
 
         context 'when cwd is at the top level' do
-          cwd '.'
+          before { cwd '.' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag/
@@ -435,7 +462,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
+          before { cwd 'chef_repo2' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -468,7 +495,7 @@ EOM
         end
 
         context 'when cwd is inside data_bags2' do
-          cwd 'data_bags2'
+          before { cwd 'data_bags2' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag/
@@ -492,7 +519,7 @@ EOM
         end
 
         context 'when cwd is at the top level' do
-          cwd '.'
+          before { cwd '.' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -525,7 +552,7 @@ EOM
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag/
@@ -537,7 +564,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
+          before { cwd 'chef_repo2' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -570,7 +597,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2/data_bags' do
-          cwd 'chef_repo2/data_bags'
+          before { cwd 'chef_repo2/data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag/
@@ -592,21 +619,21 @@ EOM
         end
 
         context 'when cwd is at the top level' do
-          cwd '.'
+          before { cwd '.' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
+          before { cwd 'chef_repo2' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -630,7 +657,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2/data_bags' do
-          cwd 'chef_repo2/data_bags'
+          before { cwd 'chef_repo2/data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag3/
@@ -653,7 +680,7 @@ EOM
         end
 
         context 'when cwd is at the top level' do
-          cwd '.'
+          before { cwd '.' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -686,7 +713,7 @@ EOM
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag/
@@ -698,7 +725,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
+          before { cwd 'chef_repo2' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -731,7 +758,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2/data_bags' do
-          cwd 'chef_repo2/data_bags'
+          before { cwd 'chef_repo2/data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag/
@@ -753,14 +780,14 @@ EOM
         end
 
         context 'when cwd is at the top level' do
-          cwd '.'
+          before { cwd '.' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag/
@@ -770,7 +797,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2' do
-          cwd 'chef_repo2'
+          before { cwd 'chef_repo2' }
           it 'knife list --local -Rfp lists everything' do
             knife('list --local -Rfp').should_succeed <<EOM
 clients/
@@ -794,7 +821,7 @@ EOM
         end
 
         context 'when cwd is inside chef_repo2/data_bags' do
-          cwd 'chef_repo2/data_bags'
+          before { cwd 'chef_repo2/data_bags' }
           it 'knife list --local -Rfp fails' do
             knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
           end
@@ -828,7 +855,7 @@ EOM
         end
 
         context 'when cwd is inside the data_bags directory' do
-          cwd 'data_bags'
+          before { cwd 'data_bags' }
           it 'knife list --local -Rfp lists data bags' do
             knife('list --local -Rfp').should_succeed <<EOM
 bag/