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

data/spec/integration/knife/chef_repository_file_system_spec.rb

@@ -20,14 +20,16 @@ require 'chef/knife/list'
 require 'chef/knife/show'
 
 describe 'General chef_repo file system checks' do
-  extend IntegrationSupport
+  include IntegrationSupport
   include KnifeSupport
 
   context 'directories and files that should/should not be ignored' do
     when_the_repository "has empty roles, environments and data bag item directories" do
-      directory "roles"
-      directory "environments"
-      directory "data_bags/bag1"
+      before do
+        directory "roles"
+        directory "environments"
+        directory "data_bags/bag1"
+      end
 
       it "knife list --local -Rfp / returns them" do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -40,7 +42,7 @@ EOM
     end
 
     when_the_repository "has an empty data_bags directory" do
-      directory "data_bags"
+      before { directory "data_bags" }
 
       it "knife list --local / returns it" do
         knife('list --local /').should_succeed "/data_bags\n"
@@ -48,7 +50,7 @@ EOM
     end
 
     when_the_repository "has an empty cookbook directory" do
-      directory 'cookbooks/cookbook1'
+      before { directory 'cookbooks/cookbook1' }
 
       it "knife list --local -Rfp / does not return it" do
         knife('list --local -Rfp /').should_succeed(<<EOM, :stderr => "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
@@ -58,7 +60,7 @@ EOM
     end
 
     when_the_repository "has only empty cookbook subdirectories" do
-      directory 'cookbooks/cookbook1/recipes'
+      before { directory 'cookbooks/cookbook1/recipes' }
 
       it "knife list --local -Rfp / does not return it" do
         knife('list --local -Rfp /').should_succeed(<<EOM, :stderr => "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
@@ -68,8 +70,10 @@ EOM
     end
 
     when_the_repository "has empty and non-empty cookbook subdirectories" do
-      directory 'cookbooks/cookbook1/recipes'
-      file 'cookbooks/cookbook1/templates/default/x.txt', ''
+      before do
+        directory 'cookbooks/cookbook1/recipes'
+        file 'cookbooks/cookbook1/templates/default/x.txt', ''
+      end
 
       it "knife list --local -Rfp / does not return the empty ones" do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -83,7 +87,7 @@ EOM
     end
 
     when_the_repository "has only empty cookbook sub-sub-directories" do
-      directory 'cookbooks/cookbook1/templates/default'
+      before { directory 'cookbooks/cookbook1/templates/default' }
 
       it "knife list --local -Rfp / does not return it" do
         knife('list --local -Rfp /').should_succeed(<<EOM, :stderr => "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
@@ -93,9 +97,11 @@ EOM
     end
 
     when_the_repository "has empty cookbook sub-sub-directories alongside non-empty ones" do
-      file 'cookbooks/cookbook1/templates/default/x.txt', ''
-      directory 'cookbooks/cookbook1/templates/rhel'
-      directory 'cookbooks/cookbook1/files/default'
+      before do
+        file 'cookbooks/cookbook1/templates/default/x.txt', ''
+        directory 'cookbooks/cookbook1/templates/rhel'
+        directory 'cookbooks/cookbook1/files/default'
+      end
 
       it "knife list --local -Rfp / does not return the empty ones" do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -109,8 +115,10 @@ EOM
     end
 
     when_the_repository "has an extra schmenvironments directory" do
-      directory "schmenvironments" do
-        file "_default.json", {}
+      before do
+        directory "schmenvironments" do
+          file "_default.json", {}
+        end
       end
 
       it "knife list --local -Rfp / should NOT return it" do
@@ -119,20 +127,22 @@ EOM
     end
 
     when_the_repository "has extra subdirectories and files under data bag items, roles, and environments" do
-      directory "data_bags/bag1" do
-        file "item1.json", {}
-        file "item2.xml", ""
-        file "another_subdir/item.json", {}
-      end
-      directory "roles" do
-        file "role1.json", {}
-        file "role2.xml", ""
-        file "subdir/role.json", {}
-      end
-      directory "environments" do
-        file "environment1.json", {}
-        file "environment2.xml", ""
-        file "subdir/environment.json", {}
+      before do
+        directory "data_bags/bag1" do
+          file "item1.json", {}
+          file "item2.xml", ""
+          file "another_subdir/item.json", {}
+        end
+        directory "roles" do
+          file "role1.json", {}
+          file "role2.xml", ""
+          file "subdir/role.json", {}
+        end
+        directory "environments" do
+          file "environment1.json", {}
+          file "environment2.xml", ""
+          file "subdir/environment.json", {}
+        end
       end
 
       it "knife list --local -Rfp / should NOT return them" do
@@ -149,56 +159,58 @@ EOM
     end
 
     when_the_repository "has extraneous subdirectories and files under a cookbook" do
-      directory 'cookbooks/cookbook1' do
-        file 'a.rb', ''
-        file 'blarghle/blah.rb', ''
-        directory 'attributes' do
-          file 'a.rb', ''
-          file 'b.json', {}
-          file 'c/d.rb', ''
-          file 'c/e.json', {}
-        end
-        directory 'definitions' do
-          file 'a.rb', ''
-          file 'b.json', {}
-          file 'c/d.rb', ''
-          file 'c/e.json', {}
-        end
-        directory 'recipes' do
+      before do
+        directory 'cookbooks/cookbook1' do
           file 'a.rb', ''
-          file 'b.json', {}
-          file 'c/d.rb', ''
-          file 'c/e.json', {}
-        end
-        directory 'libraries' do
-          file 'a.rb', ''
-          file 'b.json', {}
-          file 'c/d.rb', ''
-          file 'c/e.json', {}
-        end
-        directory 'templates' do
-          file 'a.rb', ''
-          file 'b.json', {}
-          file 'c/d.rb', ''
-          file 'c/e.json', {}
-        end
-        directory 'files' do
-          file 'a.rb', ''
-          file 'b.json', {}
-          file 'c/d.rb', ''
-          file 'c/e.json', {}
-        end
-        directory 'resources' do
-          file 'a.rb', ''
-          file 'b.json', {}
-          file 'c/d.rb', ''
-          file 'c/e.json', {}
-        end
-        directory 'providers' do
-          file 'a.rb', ''
-          file 'b.json', {}
-          file 'c/d.rb', ''
-          file 'c/e.json', {}
+          file 'blarghle/blah.rb', ''
+          directory 'attributes' do
+            file 'a.rb', ''
+            file 'b.json', {}
+            file 'c/d.rb', ''
+            file 'c/e.json', {}
+          end
+          directory 'definitions' do
+            file 'a.rb', ''
+            file 'b.json', {}
+            file 'c/d.rb', ''
+            file 'c/e.json', {}
+          end
+          directory 'recipes' do
+            file 'a.rb', ''
+            file 'b.json', {}
+            file 'c/d.rb', ''
+            file 'c/e.json', {}
+          end
+          directory 'libraries' do
+            file 'a.rb', ''
+            file 'b.json', {}
+            file 'c/d.rb', ''
+            file 'c/e.json', {}
+          end
+          directory 'templates' do
+            file 'a.rb', ''
+            file 'b.json', {}
+            file 'c/d.rb', ''
+            file 'c/e.json', {}
+          end
+          directory 'files' do
+            file 'a.rb', ''
+            file 'b.json', {}
+            file 'c/d.rb', ''
+            file 'c/e.json', {}
+          end
+          directory 'resources' do
+            file 'a.rb', ''
+            file 'b.json', {}
+            file 'c/d.rb', ''
+            file 'c/e.json', {}
+          end
+          directory 'providers' do
+            file 'a.rb', ''
+            file 'b.json', {}
+            file 'c/d.rb', ''
+            file 'c/e.json', {}
+          end
         end
       end
 
@@ -240,7 +252,7 @@ EOM
     end
 
     when_the_repository "has a file in cookbooks/" do
-      file 'cookbooks/file', ''
+      before { file 'cookbooks/file', '' }
       it 'does not show up in list -Rfp' do
         knife('list --local -Rfp /').should_succeed <<EOM
 /cookbooks/
@@ -249,7 +261,7 @@ EOM
     end
 
     when_the_repository "has a file in data_bags/" do
-      file 'data_bags/file', ''
+      before { file 'data_bags/file', '' }
       it 'does not show up in list -Rfp' do
         knife('list --local -Rfp /').should_succeed <<EOM
 /data_bags/
@@ -259,16 +271,20 @@ EOM
   end
 
   when_the_repository 'has a cookbook starting with .' do
-    file 'cookbooks/.svn/metadata.rb', ''
-    file 'cookbooks/a.b/metadata.rb', ''
+    before do
+      file 'cookbooks/.svn/metadata.rb', ''
+      file 'cookbooks/a.b/metadata.rb', ''
+    end
     it 'knife list does not show it' do
       knife('list --local -fp /cookbooks').should_succeed "/cookbooks/a.b/\n"
     end
   end
 
   when_the_repository 'has a data bag starting with .' do
-    file 'data_bags/.svn/x.json', {}
-    file 'data_bags/a.b/x.json', {}
+    before do
+      file 'data_bags/.svn/x.json', {}
+      file 'data_bags/a.b/x.json', {}
+    end
     it 'knife list does not show it' do
       knife('list --local -fp /data_bags').should_succeed "/data_bags/a.b/\n"
     end

data/spec/integration/knife/chefignore_spec.rb

@@ -20,23 +20,27 @@ require 'chef/knife/list'
 require 'chef/knife/show'
 
 describe 'chefignore tests' do
-  extend IntegrationSupport
+  include IntegrationSupport
   include KnifeSupport
 
   when_the_repository "has lots of stuff in it" do
-    file 'roles/x.json', {}
-    file 'environments/x.json', {}
-    file 'data_bags/bag1/x.json', {}
-    file 'cookbooks/cookbook1/x.json', {}
+    before do
+      file 'roles/x.json', {}
+      file 'environments/x.json', {}
+      file 'data_bags/bag1/x.json', {}
+      file 'cookbooks/cookbook1/x.json', {}
+    end
 
     context "and has a chefignore everywhere except cookbooks" do
-      chefignore = "x.json\nroles/x.json\nenvironments/x.json\ndata_bags/bag1/x.json\nbag1/x.json\ncookbooks/cookbook1/x.json\ncookbook1/x.json\n"
-      file 'chefignore', chefignore
-      file 'roles/chefignore', chefignore
-      file 'environments/chefignore', chefignore
-      file 'data_bags/chefignore', chefignore
-      file 'data_bags/bag1/chefignore', chefignore
-      file 'cookbooks/cookbook1/chefignore', chefignore
+      before do
+        chefignore = "x.json\nroles/x.json\nenvironments/x.json\ndata_bags/bag1/x.json\nbag1/x.json\ncookbooks/cookbook1/x.json\ncookbook1/x.json\n"
+        file 'chefignore', chefignore
+        file 'roles/chefignore', chefignore
+        file 'environments/chefignore', chefignore
+        file 'data_bags/chefignore', chefignore
+        file 'data_bags/bag1/chefignore', chefignore
+        file 'cookbooks/cookbook1/chefignore', chefignore
+      end
 
       it 'matching files and directories get ignored' do
         # NOTE: many of the "chefignore" files should probably not show up
@@ -58,9 +62,11 @@ EOM
   end
 
   when_the_repository 'has a cookbook with only chefignored files' do
-    file 'cookbooks/cookbook1/templates/default/x.rb', ''
-    file 'cookbooks/cookbook1/libraries/x.rb', ''
-    file 'cookbooks/chefignore', "libraries/x.rb\ntemplates/default/x.rb\n"
+    before do
+      file 'cookbooks/cookbook1/templates/default/x.rb', ''
+      file 'cookbooks/cookbook1/libraries/x.rb', ''
+      file 'cookbooks/chefignore', "libraries/x.rb\ntemplates/default/x.rb\n"
+    end
 
     it 'the cookbook is not listed' do
       knife('list --local -Rfp /').should_succeed(<<EOM, :stderr => "WARN: Cookbook 'cookbook1' is empty or entirely chefignored at #{Chef::Config.chef_repo_path}/cookbooks/cookbook1\n")
@@ -70,13 +76,15 @@ EOM
   end
 
   when_the_repository "has multiple cookbooks" do
-    file 'cookbooks/cookbook1/x.json', {}
-    file 'cookbooks/cookbook1/y.json', {}
-    file 'cookbooks/cookbook2/x.json', {}
-    file 'cookbooks/cookbook2/y.json', {}
+    before do
+      file 'cookbooks/cookbook1/x.json', {}
+      file 'cookbooks/cookbook1/y.json', {}
+      file 'cookbooks/cookbook2/x.json', {}
+      file 'cookbooks/cookbook2/y.json', {}
+    end
 
     context 'and has a chefignore with filenames' do
-      file 'cookbooks/chefignore', "x.json\n"
+      before { file 'cookbooks/chefignore', "x.json\n" }
 
       it 'matching files and directories get ignored in all cookbooks' do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -90,8 +98,10 @@ EOM
     end
 
     context "and has a chefignore with wildcards" do
-      file 'cookbooks/chefignore', "x.*\n"
-      file 'cookbooks/cookbook1/x.rb', ''
+      before do
+        file 'cookbooks/chefignore', "x.*\n"
+        file 'cookbooks/cookbook1/x.rb', ''
+      end
 
       it 'matching files and directories get ignored in all cookbooks' do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -105,9 +115,11 @@ EOM
     end
 
     context "and has a chefignore with relative paths" do
-      file 'cookbooks/cookbook1/recipes/x.rb', ''
-      file 'cookbooks/cookbook2/recipes/y.rb', ''
-      file 'cookbooks/chefignore', "recipes/x.rb\n"
+      before do
+        file 'cookbooks/cookbook1/recipes/x.rb', ''
+        file 'cookbooks/cookbook2/recipes/y.rb', ''
+        file 'cookbooks/chefignore', "recipes/x.rb\n"
+      end
 
       it 'matching directories get ignored' do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -125,8 +137,10 @@ EOM
     end
 
     context "and has a chefignore with subdirectories" do
-      file 'cookbooks/cookbook1/recipes/y.rb', ''
-      file 'cookbooks/chefignore', "recipes\nrecipes/\n"
+      before do
+        file 'cookbooks/cookbook1/recipes/y.rb', ''
+        file 'cookbooks/chefignore', "recipes\nrecipes/\n"
+      end
 
       it 'matching directories do NOT get ignored' do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -144,9 +158,11 @@ EOM
     end
 
     context "and has a chefignore that ignores all files in a subdirectory" do
-      file 'cookbooks/cookbook1/templates/default/x.rb', ''
-      file 'cookbooks/cookbook1/libraries/x.rb', ''
-      file 'cookbooks/chefignore', "libraries/x.rb\ntemplates/default/x.rb\n"
+      before do
+        file 'cookbooks/cookbook1/templates/default/x.rb', ''
+        file 'cookbooks/cookbook1/libraries/x.rb', ''
+        file 'cookbooks/chefignore', "libraries/x.rb\ntemplates/default/x.rb\n"
+      end
 
       it 'ignores the subdirectory entirely' do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -162,7 +178,9 @@ EOM
     end
 
     context "and has an empty chefignore" do
-      file 'cookbooks/chefignore', "\n"
+      before do
+        file 'cookbooks/chefignore', "\n"
+      end
 
       it 'nothing is ignored' do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -178,7 +196,9 @@ EOM
     end
 
     context "and has a chefignore with comments and empty lines" do
-      file 'cookbooks/chefignore', "\n\n # blah\n#\nx.json\n\n"
+      before do
+        file 'cookbooks/chefignore', "\n\n # blah\n#\nx.json\n\n"
+      end
 
       it 'matching files and directories get ignored in all cookbooks' do
         knife('list --local -Rfp /').should_succeed <<EOM
@@ -200,14 +220,18 @@ EOM
       ]
     end
 
-    file 'cookbooks1/mycookbook/metadata.rb', ''
-    file 'cookbooks1/mycookbook/x.json', {}
-    file 'cookbooks2/yourcookbook/metadata.rb', ''
-    file 'cookbooks2/yourcookbook/x.json', ''
+    before do
+      file 'cookbooks1/mycookbook/metadata.rb', ''
+      file 'cookbooks1/mycookbook/x.json', {}
+      file 'cookbooks2/yourcookbook/metadata.rb', ''
+      file 'cookbooks2/yourcookbook/x.json', ''
+    end
 
     context "and multiple chefignores" do
-      file 'cookbooks1/chefignore', "metadata.rb\n"
-      file 'cookbooks2/chefignore', "x.json\n"
+      before do
+        file 'cookbooks1/chefignore', "metadata.rb\n"
+        file 'cookbooks2/chefignore', "x.json\n"
+      end
       it "chefignores apply only to the directories they are in" do
         knife('list --local -Rfp /').should_succeed <<EOM
 /cookbooks/
@@ -219,10 +243,12 @@ EOM
       end
 
       context "and conflicting cookbooks" do
-        file 'cookbooks1/yourcookbook/metadata.rb', ''
-        file 'cookbooks1/yourcookbook/x.json', ''
-        file 'cookbooks1/yourcookbook/onlyincookbooks1.rb', ''
-        file 'cookbooks2/yourcookbook/onlyincookbooks2.rb', ''
+        before do
+          file 'cookbooks1/yourcookbook/metadata.rb', ''
+          file 'cookbooks1/yourcookbook/x.json', ''
+          file 'cookbooks1/yourcookbook/onlyincookbooks1.rb', ''
+          file 'cookbooks2/yourcookbook/onlyincookbooks2.rb', ''
+        end
 
         it "chefignores apply only to the winning cookbook" do
           knife('list --local -Rfp /').should_succeed(<<EOM, :stderr => "WARN: Child with name 'yourcookbook' found in multiple directories: #{Chef::Config.chef_repo_path}/cookbooks1/yourcookbook and #{Chef::Config.chef_repo_path}/cookbooks2/yourcookbook\n")
@@ -239,7 +265,9 @@ EOM
   end
 
   when_the_repository 'has a cookbook named chefignore' do
-    file 'cookbooks/chefignore/metadata.rb', {}
+    before do
+      file 'cookbooks/chefignore/metadata.rb', {}
+    end
     it 'knife list -Rfp /cookbooks shows it' do
       knife('list --local -Rfp /cookbooks').should_succeed <<EOM
 /cookbooks/chefignore/
@@ -249,9 +277,11 @@ EOM
   end
 
   when_the_repository 'has multiple cookbook paths, one with a chefignore file and the other with a cookbook named chefignore' do
-    file 'cookbooks1/chefignore', ''
-    file 'cookbooks1/blah/metadata.rb', ''
-    file 'cookbooks2/chefignore/metadata.rb', ''
+    before do
+      file 'cookbooks1/chefignore', ''
+      file 'cookbooks1/blah/metadata.rb', ''
+      file 'cookbooks2/chefignore/metadata.rb', ''
+    end
     before :each do
       Chef::Config.cookbook_path = [
         File.join(Chef::Config.chef_repo_path, 'cookbooks1'),