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

data/spec/integration/knife/common_options_spec.rb

@@ -19,18 +19,11 @@ require 'support/shared/integration/integration_helper'
 require 'chef/knife/raw'
 
 describe 'knife common options' do
-  extend IntegrationSupport
+  include IntegrationSupport
   include KnifeSupport
 
   when_the_repository "has a node" do
-    file 'nodes/x.json', {}
-
-    before(:each) do
-      if ChefZero::RSpec.server
-        ChefZero::RSpec.server.stop
-        ChefZero::RSpec.server = nil
-      end
-    end
+    before { file 'nodes/x.json', {} }
 
     context 'When chef_zero.enabled is true' do
       before(:each) do
@@ -38,14 +31,14 @@ describe 'knife common options' do
       end
 
       it 'knife raw /nodes/x should retrieve the node' do
-        knife('raw /nodes/x').should_succeed /"name": "x"/
+        knife('raw /nodes/x').should_succeed( /"name": "x"/ )
       end
 
       context 'And chef_zero.port is 9999' do
         before(:each) { Chef::Config.chef_zero.port = 9999 }
 
         it 'knife raw /nodes/x should retrieve the node' do
-          knife('raw /nodes/x').should_succeed /"name": "x"/
+          knife('raw /nodes/x').should_succeed( /"name": "x"/ )
           Chef::Config.chef_server_url.should == 'http://localhost:9999'
         end
       end
@@ -55,12 +48,13 @@ describe 'knife common options' do
         before(:each) { Chef::Config.chef_zero.host = '0.0.0.0' }
 
         it 'knife raw /nodes/x should retrieve the role' do
-          knife('raw /nodes/x').should_succeed /"name": "x"/
+          knife('raw /nodes/x').should_succeed( /"name": "x"/ )
         end
       end
 
       context 'and there is a private key' do
-        file 'mykey.pem', <<EOM
+        before do
+          file 'mykey.pem', <<EOM
 -----BEGIN RSA PRIVATE KEY-----
 MIIEogIBAAKCAQEApubutqtYYQ5UiA9QhWP7UvSmsfHsAoPKEVVPdVW/e8Svwpyf
 0Xef6OFWVmBE+W442ZjLOe2y6p2nSnaq4y7dg99NFz6X+16mcKiCbj0RCiGqCvCk
@@ -89,23 +83,24 @@ syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
 +vFmf54y9YdnLXaqv+FhJT6B6V7WX7IpU9BMqJY1cJYXHuHG2KA=
 -----END RSA PRIVATE KEY-----
 EOM
+        end
 
         it 'knife raw /nodes/x should retrieve the node' do
-          knife('raw /nodes/x').should_succeed /"name": "x"/
+          knife('raw /nodes/x').should_succeed( /"name": "x"/ )
         end
       end
     end
 
     it 'knife raw -z /nodes/x retrieves the node' do
-      knife('raw -z /nodes/x').should_succeed /"name": "x"/
+      knife('raw -z /nodes/x').should_succeed( /"name": "x"/ )
     end
 
     it 'knife raw --local-mode /nodes/x retrieves the node' do
-      knife('raw --local-mode /nodes/x').should_succeed /"name": "x"/
+      knife('raw --local-mode /nodes/x').should_succeed( /"name": "x"/ )
     end
 
     it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
-      knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
+      knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed( /"name": "x"/ )
       Chef::Config.chef_server_url.should == 'http://localhost:9999'
     end
 
@@ -123,7 +118,7 @@ EOM
       end
 
       it 'knife raw -z /nodes/x retrieves the node' do
-        knife('raw -z /nodes/x').should_succeed /"name": "x"/
+        knife('raw -z /nodes/x').should_succeed( /"name": "x"/ )
         expect(URI(Chef::Config.chef_server_url).port).to be > 8889
       end
     end
@@ -142,18 +137,18 @@ EOM
       end
 
       it 'knife raw -z --chef-zero-port=9999-20000 /nodes/x' do
-        knife('raw -z --chef-zero-port=9999-20000 /nodes/x').should_succeed /"name": "x"/
+        knife('raw -z --chef-zero-port=9999-20000 /nodes/x').should_succeed( /"name": "x"/ )
         expect(URI(Chef::Config.chef_server_url).port).to be > 9999
       end
 
       it 'knife raw -z --chef-zero-port=9999-9999,19423' do
-        knife('raw -z --chef-zero-port=9999-9999,19423 /nodes/x').should_succeed /"name": "x"/
+        knife('raw -z --chef-zero-port=9999-9999,19423 /nodes/x').should_succeed( /"name": "x"/ )
         expect(URI(Chef::Config.chef_server_url).port).to be == 19423
       end
     end
 
     it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node' do
-      knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
+      knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed( /"name": "x"/ )
       Chef::Config.chef_server_url.should == 'http://localhost:9999'
     end
   end

data/spec/integration/knife/cookbook_api_ipv6_spec.rb

@@ -19,7 +19,7 @@ require 'support/shared/integration/integration_helper'
 require 'chef/mixin/shell_out'
 
 describe "Knife cookbook API integration with IPv6" do
-  extend IntegrationSupport
+  include IntegrationSupport
   include Chef::Mixin::ShellOut
 
   when_the_chef_server "is bound to IPv6" do
@@ -100,8 +100,8 @@ END_CLIENT_RB
           end
 
           it "downloads the cookbook" do
-            s = shell_out!("knife cookbook download apache2 #{knife_config_flag} -d #{cache_path}", :cwd => chef_dir)
-            Dir["#{cache_path}/*"].map {|entry| File.basename(entry)}.should include("apache2-0.0.0")
+            shell_out!("knife cookbook download apache2 #{knife_config_flag} -d #{cache_path}", :cwd => chef_dir)
+            Dir["#{cache_path}/*"].map {|entry| File.basename(entry)}.should include("apache2-0.0.1")
           end
         end
 

data/spec/integration/knife/delete_spec.rb

@@ -21,7 +21,7 @@ require 'chef/knife/list'
 require 'chef/knife/raw'
 
 describe 'knife delete' do
-  extend IntegrationSupport
+  include IntegrationSupport
   include KnifeSupport
 
   let :everything do
@@ -99,23 +99,27 @@ EOM
   end
 
   when_the_chef_server "has one of each thing" do
-    client 'x', '{}'
-    cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
-    data_bag 'x', { 'y' => '{}' }
-    environment 'x', '{}'
-    node 'x', '{}'
-    role 'x', '{}'
-    user 'x', '{}'
+    before do
+      client 'x', '{}'
+      cookbook 'x', '1.0.0'
+      data_bag 'x', { 'y' => '{}' }
+      environment 'x', '{}'
+      node 'x', '{}'
+      role 'x', '{}'
+      user 'x', '{}'
+    end
 
     when_the_repository 'also has one of each thing' do
-      file 'clients/x.json', {}
-      file 'cookbooks/x/metadata.rb', ''
-      file 'data_bags/x/y.json', {}
-      file 'environments/_default.json', {}
-      file 'environments/x.json', {}
-      file 'nodes/x.json', {}
-      file 'roles/x.json', {}
-      file 'users/x.json', {}
+      before do
+        file 'clients/x.json', {}
+        file 'cookbooks/x/metadata.rb', ''
+        file 'data_bags/x/y.json', {}
+        file 'environments/_default.json', {}
+        file 'environments/x.json', {}
+        file 'nodes/x.json', {}
+        file 'roles/x.json', {}
+        file 'users/x.json', {}
+      end
 
       it 'knife delete --both /cookbooks/x fails' do
         knife('delete --both /cookbooks/x').should_fail <<EOM
@@ -216,8 +220,11 @@ EOM
 
       # TODO delete empty data bag (particularly different on local side)
       context 'with an empty data bag on both' do
-        data_bag 'empty', {}
-        directory 'data_bags/empty'
+        before do
+          data_bag 'empty', {}
+          directory 'data_bags/empty'
+        end
+
         it 'knife delete --both /data_bags/empty fails but deletes local version' do
           knife('delete --both /data_bags/empty').should_fail <<EOM
 ERROR: /data_bags/empty (remote) must be deleted recursively!  Pass -r to knife delete.
@@ -468,13 +475,15 @@ EOM
     end
 
     when_the_repository 'has only top-level directories' do
-      directory 'clients'
-      directory 'cookbooks'
-      directory 'data_bags'
-      directory 'environments'
-      directory 'nodes'
-      directory 'roles'
-      directory 'users'
+      before do
+        directory 'clients'
+        directory 'cookbooks'
+        directory 'data_bags'
+        directory 'environments'
+        directory 'nodes'
+        directory 'roles'
+        directory 'users'
+      end
 
       it 'knife delete --both /cookbooks/x fails' do
         knife('delete --both /cookbooks/x').should_fail "ERROR: /cookbooks/x (remote) must be deleted recursively!  Pass -r to knife delete.\n"
@@ -632,7 +641,7 @@ EOM
       end
 
       context 'and cwd is at the top level' do
-        cwd '.'
+        before { cwd '.' }
         it 'knife delete fails' do
           knife('delete').should_fail "FATAL: Must specify at least one argument.  If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
           knife('list -Rf /').should_succeed <<EOM
@@ -673,14 +682,16 @@ EOM
 
   when_the_chef_server 'is empty' do
     when_the_repository 'has one of each thing' do
-      file 'clients/x.json', {}
-      file 'cookbooks/x/metadata.rb', ''
-      file 'data_bags/x/y.json', {}
-      file 'environments/_default.json', {}
-      file 'environments/x.json', {}
-      file 'nodes/x.json', {}
-      file 'roles/x.json', {}
-      file 'users/x.json', {}
+      before do
+        file 'clients/x.json', {}
+        file 'cookbooks/x/metadata.rb', ''
+        file 'data_bags/x/y.json', {}
+        file 'environments/_default.json', {}
+        file 'environments/x.json', {}
+        file 'nodes/x.json', {}
+        file 'roles/x.json', {}
+        file 'users/x.json', {}
+      end
 
       it 'knife delete --both /cookbooks/x fails' do
         knife('delete --both /cookbooks/x').should_fail "ERROR: /cookbooks/x (local) must be deleted recursively!  Pass -r to knife delete.\n"
@@ -843,7 +854,7 @@ EOM
       end
 
       context 'and cwd is at the top level' do
-        cwd '.'
+        before { cwd '.' }
         it 'knife delete fails' do
           knife('delete').should_fail "FATAL: Must specify at least one argument.  If you want to delete everything in this directory, type \"knife delete --recurse .\"\n", :stdout => /USAGE/
           knife('list -Rf /').should_succeed <<EOM
@@ -884,12 +895,16 @@ EOM
   end
 
   when_the_repository 'has a cookbook' do
-    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
-    file 'cookbooks/x/onlyin1.0.0.rb', 'old_text'
+    before do
+      file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
+      file 'cookbooks/x/onlyin1.0.0.rb', 'old_text'
+    end
 
     when_the_chef_server 'has a later version for the cookbook' do
-      cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => '' }
-      cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
+      before do
+        cookbook 'x', '1.0.0', { 'onlyin1.0.0.rb' => '' }
+        cookbook 'x', '1.0.1', { 'onlyin1.0.1.rb' => 'hi' }
+      end
 
       # TODO this seems wrong
       it 'knife delete --both -r /cookbooks/x deletes the latest version on the server and the local version' do
@@ -900,8 +915,10 @@ EOM
     end
 
     when_the_chef_server 'has an earlier version for the cookbook' do
-      cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"', 'onlyin1.0.0.rb' => ''}
-      cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
+      before do
+        cookbook 'x', '1.0.0', { 'onlyin1.0.0.rb' => ''}
+        cookbook 'x', '0.9.9', { 'onlyin0.9.9.rb' => 'hi' }
+      end
 
       it 'knife delete --both /cookbooks/x deletes the latest version on the server and the local version' do
         knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
@@ -911,7 +928,7 @@ EOM
     end
 
     when_the_chef_server 'has a later version for the cookbook, and no current version' do
-      cookbook 'x', '1.0.1', { 'metadata.rb' => 'version "1.0.1"', 'onlyin1.0.1.rb' => 'hi' }
+      before { cookbook 'x', '1.0.1', { 'onlyin1.0.1.rb' => 'hi' } }
 
       it 'knife delete --both /cookbooks/x deletes the server and client version of the cookbook' do
         knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
@@ -921,7 +938,7 @@ EOM
     end
 
     when_the_chef_server 'has an earlier version for the cookbook, and no current version' do
-      cookbook 'x', '0.9.9', { 'metadata.rb' => 'version "0.9.9"', 'onlyin0.9.9.rb' => 'hi' }
+      before { cookbook 'x', '0.9.9', { 'onlyin0.9.9.rb' => 'hi' } }
 
       it 'knife delete --both /cookbooks/x deletes the server and client version of the cookbook' do
         knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
@@ -933,11 +950,14 @@ EOM
 
   when_the_repository 'is empty' do
     when_the_chef_server 'has two versions of a cookbook' do
-      cookbook 'x', '2.0.11', { 'metadata.rb' => 'version "2.0.11"' }
-      cookbook 'x', '11.0.0', { 'metadata.rb' => 'version "11.0.0"' }
+      before do
+        cookbook 'x', '2.0.11'
+        cookbook 'x', '11.0.0'
+      end
+
       it 'knife delete deletes the latest version' do
         knife('delete --both -r /cookbooks/x').should_succeed "Deleted /cookbooks/x\n"
-        knife('raw /cookbooks/x').should_succeed /2.0.11/
+        knife('raw /cookbooks/x').should_succeed( /2.0.11/ )
       end
     end
   end

data/spec/integration/knife/deps_spec.rb

@@ -20,24 +20,26 @@ require 'support/shared/context/config'
 require 'chef/knife/deps'
 
 describe 'knife deps' do
-  extend IntegrationSupport
+  include IntegrationSupport
   include KnifeSupport
 
   context 'local' do
     when_the_repository 'has a role with no run_list' do
-      file 'roles/starring.json', {}
+      before { file 'roles/starring.json', {} }
       it 'knife deps reports no dependencies' do
         knife('deps /roles/starring.json').should_succeed "/roles/starring.json\n"
       end
     end
 
     when_the_repository 'has a role with a default run_list' do
-      file 'roles/starring.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
-      file 'roles/minor.json', {}
-      file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
-      file 'cookbooks/quiche/recipes/default.rb', ''
-      file 'cookbooks/soup/metadata.rb', 'name "soup"'
-      file 'cookbooks/soup/recipes/chicken.rb', ''
+      before do
+        file 'roles/starring.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+        file 'roles/minor.json', {}
+        file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
+        file 'cookbooks/quiche/recipes/default.rb', ''
+        file 'cookbooks/soup/metadata.rb', 'name "soup"'
+        file 'cookbooks/soup/recipes/chicken.rb', ''
+      end
       it 'knife deps reports all dependencies' do
         knife('deps /roles/starring.json').should_succeed <<EOM
 /roles/minor.json
@@ -49,12 +51,14 @@ EOM
     end
 
     when_the_repository 'has a role with an env_run_list' do
-      file 'roles/starring.json', { 'env_run_lists' => { 'desert' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) } }
-      file 'roles/minor.json', {}
-      file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
-      file 'cookbooks/quiche/recipes/default.rb', ''
-      file 'cookbooks/soup/metadata.rb', 'name "soup"'
-      file 'cookbooks/soup/recipes/chicken.rb', ''
+      before do
+        file 'roles/starring.json', { 'env_run_lists' => { 'desert' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) } }
+        file 'roles/minor.json', {}
+        file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
+        file 'cookbooks/quiche/recipes/default.rb', ''
+        file 'cookbooks/soup/metadata.rb', 'name "soup"'
+        file 'cookbooks/soup/recipes/chicken.rb', ''
+      end
       it 'knife deps reports all dependencies' do
         knife('deps /roles/starring.json').should_succeed <<EOM
 /roles/minor.json
@@ -66,25 +70,29 @@ EOM
     end
 
     when_the_repository 'has a node with no environment or run_list' do
-      file 'nodes/mort.json', {}
+      before { file 'nodes/mort.json', {} }
       it 'knife deps reports just the node' do
         knife('deps /nodes/mort.json').should_succeed "/nodes/mort.json\n"
       end
     end
     when_the_repository 'has a node with an environment' do
-      file 'environments/desert.json', {}
-      file 'nodes/mort.json', { 'chef_environment' => 'desert' }
+      before do
+        file 'environments/desert.json', {}
+        file 'nodes/mort.json', { 'chef_environment' => 'desert' }
+      end
       it 'knife deps reports just the node' do
         knife('deps /nodes/mort.json').should_succeed "/environments/desert.json\n/nodes/mort.json\n"
       end
     end
     when_the_repository 'has a node with roles and recipes in its run_list' do
-      file 'roles/minor.json', {}
-      file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
-      file 'cookbooks/quiche/recipes/default.rb', ''
-      file 'cookbooks/soup/metadata.rb', 'name "soup"'
-      file 'cookbooks/soup/recipes/chicken.rb', ''
-      file 'nodes/mort.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+      before do
+        file 'roles/minor.json', {}
+        file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
+        file 'cookbooks/quiche/recipes/default.rb', ''
+        file 'cookbooks/soup/metadata.rb', 'name "soup"'
+        file 'cookbooks/soup/recipes/chicken.rb', ''
+        file 'nodes/mort.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+      end
       it 'knife deps reports just the node' do
         knife('deps /nodes/mort.json').should_succeed <<EOM
 /roles/minor.json
@@ -95,42 +103,48 @@ EOM
       end
     end
     when_the_repository 'has a cookbook with no dependencies' do
-      file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
-      file 'cookbooks/quiche/recipes/default.rb', ''
+      before do
+        file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
+        file 'cookbooks/quiche/recipes/default.rb', ''
+      end
       it 'knife deps reports just the cookbook' do
         knife('deps /cookbooks/quiche').should_succeed "/cookbooks/quiche\n"
       end
     end
     when_the_repository 'has a cookbook with dependencies' do
-      file 'cookbooks/kettle/metadata.rb', 'name "kettle"'
-      file 'cookbooks/quiche/metadata.rb', "name 'quiche'\ndepends 'kettle'\n"
-      file 'cookbooks/quiche/recipes/default.rb', ''
+      before do
+        file 'cookbooks/kettle/metadata.rb', 'name "kettle"'
+        file 'cookbooks/quiche/metadata.rb', "name 'quiche'\ndepends 'kettle'\n"
+        file 'cookbooks/quiche/recipes/default.rb', ''
+      end
       it 'knife deps reports just the cookbook' do
         knife('deps /cookbooks/quiche').should_succeed "/cookbooks/kettle\n/cookbooks/quiche\n"
       end
     end
     when_the_repository 'has a data bag' do
-      file 'data_bags/bag/item.json', {}
+      before { file 'data_bags/bag/item.json', {} }
       it 'knife deps reports just the data bag' do
         knife('deps /data_bags/bag/item.json').should_succeed "/data_bags/bag/item.json\n"
       end
     end
     when_the_repository 'has an environment' do
-      file 'environments/desert.json', {}
+      before { file 'environments/desert.json', {} }
       it 'knife deps reports just the environment' do
         knife('deps /environments/desert.json').should_succeed "/environments/desert.json\n"
       end
     end
     when_the_repository 'has a deep dependency tree' do
-      file 'roles/starring.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
-      file 'roles/minor.json', {}
-      file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
-      file 'cookbooks/quiche/recipes/default.rb', ''
-      file 'cookbooks/soup/metadata.rb', 'name "soup"'
-      file 'cookbooks/soup/recipes/chicken.rb', ''
-      file 'environments/desert.json', {}
-      file 'nodes/mort.json', { 'chef_environment' => 'desert', 'run_list' => [ 'role[starring]' ] }
-      file 'nodes/bart.json', { 'run_list' => [ 'role[minor]' ] }
+      before do
+        file 'roles/starring.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+        file 'roles/minor.json', {}
+        file 'cookbooks/quiche/metadata.rb', 'name "quiche"'
+        file 'cookbooks/quiche/recipes/default.rb', ''
+        file 'cookbooks/soup/metadata.rb', 'name "soup"'
+        file 'cookbooks/soup/recipes/chicken.rb', ''
+        file 'environments/desert.json', {}
+        file 'nodes/mort.json', { 'chef_environment' => 'desert', 'run_list' => [ 'role[starring]' ] }
+        file 'nodes/bart.json', { 'run_list' => [ 'role[minor]' ] }
+      end
 
       it 'knife deps reports all dependencies' do
         knife('deps /nodes/mort.json').should_succeed <<EOM
@@ -189,10 +203,13 @@ EOM
 
     context 'circular dependencies' do
       when_the_repository 'has cookbooks with circular dependencies' do
-        file 'cookbooks/foo/metadata.rb', "name 'foo'\ndepends 'bar'\n"
-        file 'cookbooks/bar/metadata.rb', "name 'bar'\ndepends 'baz'\n"
-        file 'cookbooks/baz/metadata.rb', "name 'baz'\ndepends 'foo'\n"
-        file 'cookbooks/self/metadata.rb', "name 'self'\ndepends 'self'\n"
+        before do
+          file 'cookbooks/foo/metadata.rb', "name 'foo'\ndepends 'bar'\n"
+          file 'cookbooks/bar/metadata.rb', "name 'bar'\ndepends 'baz'\n"
+          file 'cookbooks/baz/metadata.rb', "name 'baz'\ndepends 'foo'\n"
+          file 'cookbooks/self/metadata.rb', "name 'self'\ndepends 'self'\n"
+        end
+
         it 'knife deps prints each once' do
           knife('deps /cookbooks/foo /cookbooks/self').should_succeed <<EOM
 /cookbooks/baz
@@ -213,10 +230,12 @@ EOM
         end
       end
       when_the_repository 'has roles with circular dependencies' do
-        file 'roles/foo.json', { 'run_list' => [ 'role[bar]' ] }
-        file 'roles/bar.json', { 'run_list' => [ 'role[baz]' ] }
-        file 'roles/baz.json', { 'run_list' => [ 'role[foo]' ] }
-        file 'roles/self.json', { 'run_list' => [ 'role[self]' ] }
+        before do
+          file 'roles/foo.json', { 'run_list' => [ 'role[bar]' ] }
+          file 'roles/bar.json', { 'run_list' => [ 'role[baz]' ] }
+          file 'roles/baz.json', { 'run_list' => [ 'role[foo]' ] }
+          file 'roles/self.json', { 'run_list' => [ 'role[self]' ] }
+        end
         it 'knife deps prints each once' do
           knife('deps /roles/foo.json /roles/self.json').should_succeed <<EOM
 /roles/baz.json
@@ -280,7 +299,9 @@ EOM
         end
       end
       when_the_repository 'is missing a dependent cookbook' do
-        file 'roles/starring.json', { 'run_list' => [ 'recipe[quiche]'] }
+        before do
+          file 'roles/starring.json', { 'run_list' => [ 'recipe[quiche]'] }
+        end
         it 'knife deps reports the cookbook, along with an error' do
           knife('deps /roles/starring.json').should_fail(
             :exit_code => 2,
@@ -290,7 +311,9 @@ EOM
         end
       end
       when_the_repository 'is missing a dependent environment' do
-        file 'nodes/mort.json', { 'chef_environment' => 'desert' }
+        before do
+          file 'nodes/mort.json', { 'chef_environment' => 'desert' }
+        end
         it 'knife deps reports the environment, along with an error' do
           knife('deps /nodes/mort.json').should_fail(
             :exit_code => 2,
@@ -300,7 +323,9 @@ EOM
         end
       end
       when_the_repository 'is missing a dependent role' do
-        file 'roles/starring.json', { 'run_list' => [ 'role[minor]'] }
+        before do
+          file 'roles/starring.json', { 'run_list' => [ 'role[minor]'] }
+        end
         it 'knife deps reports the role, along with an error' do
           knife('deps /roles/starring.json').should_fail(
             :exit_code => 2,
@@ -324,13 +349,13 @@ EOM
         end
       end
       when_the_repository 'has a data bag' do
-        file 'data_bags/bag/item.json', ''
+        before { file 'data_bags/bag/item.json', '' }
         it 'knife deps /data_bags/bag shows no dependencies' do
           knife('deps /data_bags/bag').should_succeed("/data_bags/bag\n")
         end
       end
       when_the_repository 'has a cookbook' do
-        file 'cookbooks/blah/metadata.rb', 'name "blah"'
+        before { file 'cookbooks/blah/metadata.rb', 'name "blah"' }
         it 'knife deps on a cookbook file shows no dependencies' do
           knife('deps /cookbooks/blah/metadata.rb').should_succeed(
             "/cookbooks/blah/metadata.rb\n"
@@ -342,19 +367,21 @@ EOM
 
   context 'remote' do
     include_context "default config options"
-    
+
     when_the_chef_server 'has a role with no run_list' do
-      role 'starring', {}
+      before { role 'starring', {} }
       it 'knife deps reports no dependencies' do
         knife('deps --remote /roles/starring.json').should_succeed "/roles/starring.json\n"
       end
     end
 
     when_the_chef_server 'has a role with a default run_list' do
-      role 'starring', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
-      role 'minor', {}
-      cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
-      cookbook 'soup', '1.0.0', { 'metadata.rb' => "name 'soup'\nversion '1.0.0'\n", 'recipes' => { 'chicken.rb' => '' } }
+      before do
+        role 'starring', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+        role 'minor', {}
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
+        cookbook 'soup', '1.0.0', { 'metadata.rb' => "name 'soup'\nversion '1.0.0'\n", 'recipes' => { 'chicken.rb' => '' } }
+      end
       it 'knife deps reports all dependencies' do
         knife('deps --remote /roles/starring.json').should_succeed <<EOM
 /roles/minor.json
@@ -366,10 +393,12 @@ EOM
     end
 
     when_the_chef_server 'has a role with an env_run_list' do
-      role 'starring', { 'env_run_lists' => { 'desert' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) } }
-      role 'minor', {}
-      cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
-      cookbook 'soup', '1.0.0', { 'metadata.rb' =>   "name 'soup'\nversion '1.0.0'\n", 'recipes' => { 'chicken.rb' => '' } }
+      before do
+        role 'starring', { 'env_run_lists' => { 'desert' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) } }
+        role 'minor', {}
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
+        cookbook 'soup', '1.0.0', { 'metadata.rb' =>   "name 'soup'\nversion '1.0.0'\n", 'recipes' => { 'chicken.rb' => '' } }
+      end
       it 'knife deps reports all dependencies' do
         knife('deps --remote /roles/starring.json').should_succeed <<EOM
 /roles/minor.json
@@ -381,23 +410,27 @@ EOM
     end
 
     when_the_chef_server 'has a node with no environment or run_list' do
-      node 'mort', {}
+      before { node 'mort', {} }
       it 'knife deps reports just the node' do
         knife('deps --remote /nodes/mort.json').should_succeed "/nodes/mort.json\n"
       end
     end
     when_the_chef_server 'has a node with an environment' do
-      environment 'desert', {}
-      node 'mort', { 'chef_environment' => 'desert' }
+      before do
+        environment 'desert', {}
+        node 'mort', { 'chef_environment' => 'desert' }
+      end
       it 'knife deps reports just the node' do
         knife('deps --remote /nodes/mort.json').should_succeed "/environments/desert.json\n/nodes/mort.json\n"
       end
     end
     when_the_chef_server 'has a node with roles and recipes in its run_list' do
-      role 'minor', {}
-      cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
-      cookbook 'soup', '1.0.0', { 'metadata.rb' =>   "name 'soup'\nversion '1.0.0'\n", 'recipes' => { 'chicken.rb' => '' } }
-      node 'mort', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+      before do
+        role 'minor', {}
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
+        cookbook 'soup', '1.0.0', { 'metadata.rb' =>   "name 'soup'\nversion '1.0.0'\n", 'recipes' => { 'chicken.rb' => '' } }
+        node 'mort', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+      end
       it 'knife deps reports just the node' do
         knife('deps --remote /nodes/mort.json').should_succeed <<EOM
 /roles/minor.json
@@ -408,38 +441,44 @@ EOM
       end
     end
     when_the_chef_server 'has a cookbook with no dependencies' do
-      cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
+      before do
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
+      end
       it 'knife deps reports just the cookbook' do
         knife('deps --remote /cookbooks/quiche').should_succeed "/cookbooks/quiche\n"
       end
     end
     when_the_chef_server 'has a cookbook with dependencies' do
-      cookbook 'kettle', '1.0.0', { 'metadata.rb' => "name 'kettle'\nversion '1.0.0'\n" }
-      cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\ndepends 'kettle'\n", 'recipes' => { 'default.rb' => '' } }
+      before do
+        cookbook 'kettle', '1.0.0', { 'metadata.rb' => "name 'kettle'\nversion '1.0.0'\n" }
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\ndepends 'kettle'\n", 'recipes' => { 'default.rb' => '' } }
+      end
       it 'knife deps reports the cookbook and its dependencies' do
         knife('deps --remote /cookbooks/quiche').should_succeed "/cookbooks/kettle\n/cookbooks/quiche\n"
       end
     end
     when_the_chef_server 'has a data bag' do
-      data_bag 'bag', { 'item' => {} }
+      before { data_bag 'bag', { 'item' => {} } }
       it 'knife deps reports just the data bag' do
         knife('deps --remote /data_bags/bag/item.json').should_succeed "/data_bags/bag/item.json\n"
       end
     end
     when_the_chef_server 'has an environment' do
-      environment 'desert', {}
+      before { environment 'desert', {} }
       it 'knife deps reports just the environment' do
         knife('deps --remote /environments/desert.json').should_succeed "/environments/desert.json\n"
       end
     end
     when_the_chef_server 'has a deep dependency tree' do
-      role 'starring', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
-      role 'minor', {}
-      cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
-      cookbook 'soup', '1.0.0', { 'metadata.rb' =>   "name 'soup'\nversion '1.0.0'\n", 'recipes' => { 'chicken.rb' => '' } }
-      environment 'desert', {}
-      node 'mort', { 'chef_environment' => 'desert', 'run_list' => [ 'role[starring]' ] }
-      node 'bart', { 'run_list' => [ 'role[minor]' ] }
+      before do
+        role 'starring', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
+        role 'minor', {}
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
+        cookbook 'soup', '1.0.0', { 'metadata.rb' =>   "name 'soup'\nversion '1.0.0'\n", 'recipes' => { 'chicken.rb' => '' } }
+        environment 'desert', {}
+        node 'mort', { 'chef_environment' => 'desert', 'run_list' => [ 'role[starring]' ] }
+        node 'bart', { 'run_list' => [ 'role[minor]' ] }
+      end
 
       it 'knife deps reports all dependencies' do
         knife('deps --remote /nodes/mort.json').should_succeed <<EOM
@@ -498,10 +537,12 @@ EOM
 
     context 'circular dependencies' do
       when_the_chef_server 'has cookbooks with circular dependencies' do
-        cookbook 'foo', '1.0.0', { 'metadata.rb'  => "name 'foo'\ndepends 'bar'\n" }
-        cookbook 'bar', '1.0.0', { 'metadata.rb'  => "name 'bar'\ndepends 'baz'\n" }
-        cookbook 'baz', '1.0.0', { 'metadata.rb'  => "name 'baz'\ndepends 'foo'\n" }
-        cookbook 'self', '1.0.0', { 'metadata.rb' => "name 'self'\ndepends 'self'\n" }
+        before do
+          cookbook 'foo', '1.0.0', { 'metadata.rb'  => "name 'foo'\ndepends 'bar'\n" }
+          cookbook 'bar', '1.0.0', { 'metadata.rb'  => "name 'bar'\ndepends 'baz'\n" }
+          cookbook 'baz', '1.0.0', { 'metadata.rb'  => "name 'baz'\ndepends 'foo'\n" }
+          cookbook 'self', '1.0.0', { 'metadata.rb' => "name 'self'\ndepends 'self'\n" }
+        end
         it 'knife deps prints each once' do
           knife('deps --remote /cookbooks/foo /cookbooks/self').should_succeed <<EOM
 /cookbooks/baz
@@ -522,10 +563,12 @@ EOM
         end
       end
       when_the_chef_server 'has roles with circular dependencies' do
-        role 'foo', { 'run_list' => [ 'role[bar]' ] }
-        role 'bar', { 'run_list' => [ 'role[baz]' ] }
-        role 'baz', { 'run_list' => [ 'role[foo]' ] }
-        role 'self', { 'run_list' => [ 'role[self]' ] }
+        before do
+          role 'foo', { 'run_list' => [ 'role[bar]' ] }
+          role 'bar', { 'run_list' => [ 'role[baz]' ] }
+          role 'baz', { 'run_list' => [ 'role[foo]' ] }
+          role 'self', { 'run_list' => [ 'role[self]' ] }
+        end
         it 'knife deps prints each once' do
           knife('deps --remote /roles/foo.json /roles/self.json').should_succeed <<EOM
 /roles/baz.json
@@ -589,7 +632,9 @@ EOM
         end
       end
       when_the_chef_server 'is missing a dependent cookbook' do
-        role 'starring', { 'run_list' => [ 'recipe[quiche]'] }
+        before do
+          role 'starring', { 'run_list' => [ 'recipe[quiche]'] }
+        end
         it 'knife deps reports the cookbook, along with an error' do
           knife('deps --remote /roles/starring.json').should_fail(
             :exit_code => 2,
@@ -599,7 +644,9 @@ EOM
         end
       end
       when_the_chef_server 'is missing a dependent environment' do
-        node 'mort', { 'chef_environment' => 'desert' }
+        before do
+          node 'mort', { 'chef_environment' => 'desert' }
+        end
         it 'knife deps reports the environment, along with an error' do
           knife('deps --remote /nodes/mort.json').should_fail(
             :exit_code => 2,
@@ -609,7 +656,9 @@ EOM
         end
       end
       when_the_chef_server 'is missing a dependent role' do
-        role 'starring', { 'run_list' => [ 'role[minor]'] }
+        before do
+          role 'starring', { 'run_list' => [ 'role[minor]'] }
+        end
         it 'knife deps reports the role, along with an error' do
           knife('deps --remote /roles/starring.json').should_fail(
             :exit_code => 2,
@@ -629,13 +678,15 @@ EOM
         end
       end
       when_the_chef_server 'has a data bag' do
-        data_bag 'bag', { 'item' => {} }
+        before { data_bag 'bag', { 'item' => {} } }
         it 'knife deps /data_bags/bag shows no dependencies' do
           knife('deps --remote /data_bags/bag').should_succeed("/data_bags/bag\n")
         end
       end
       when_the_chef_server 'has a cookbook' do
-        cookbook 'blah', '1.0.0', { 'metadata.rb' => 'name "blah"' }
+        before do
+          cookbook 'blah', '1.0.0', { 'metadata.rb' => 'name "blah"' }
+        end
         it 'knife deps on a cookbook file shows no dependencies' do
           knife('deps --remote /cookbooks/blah/metadata.rb').should_succeed(
             "/cookbooks/blah/metadata.rb\n"