chef 12.0.0.alpha.1 → 12.0.0.alpha.2

data/spec/integration/knife/deps_spec.rb

@@ -114,7 +114,8 @@ EOM
     when_the_repository 'has a cookbook with dependencies' do
       before do
         file 'cookbooks/kettle/metadata.rb', 'name "kettle"'
-        file 'cookbooks/quiche/metadata.rb', "name 'quiche'\ndepends 'kettle'\n"
+        file 'cookbooks/quiche/metadata.rb', 'name "quiche"
+depends "kettle"'
         file 'cookbooks/quiche/recipes/default.rb', ''
       end
       it 'knife deps reports just the cookbook' do
@@ -204,10 +205,14 @@ EOM
     context 'circular dependencies' do
       when_the_repository 'has cookbooks with circular dependencies' do
         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"
+          file 'cookbooks/foo/metadata.rb', 'name "foo"
+depends "bar"'
+          file 'cookbooks/bar/metadata.rb', 'name "bar"
+depends "baz"'
+          file 'cookbooks/baz/metadata.rb', 'name "baz"
+depends "foo"'
+          file 'cookbooks/self/metadata.rb', 'name "self"
+depends "self"'
         end
 
         it 'knife deps prints each once' do
@@ -379,8 +384,8 @@ EOM
       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' => '' } }
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => %Q{name "quiche"\nversion "1.0.0"\n}, 'recipes' => { 'default.rb' => '' } }
+        cookbook 'soup', '1.0.0', { 'metadata.rb' => %Q{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
@@ -396,8 +401,8 @@ EOM
       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' => '' } }
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => %Q{name "quiche"\nversion "1.0.0"\n}, 'recipes' => { 'default.rb' => '' } }
+        cookbook 'soup', '1.0.0', { 'metadata.rb' =>   %Q{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
@@ -427,8 +432,8 @@ EOM
     when_the_chef_server 'has a node with roles and recipes in its run_list' do
       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' => '' } }
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => %Q{name "quiche"\nversion "1.0.0"\n}, 'recipes' => { 'default.rb' => '' } }
+        cookbook 'soup', '1.0.0', { 'metadata.rb' =>   %Q{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
@@ -442,7 +447,7 @@ EOM
     end
     when_the_chef_server 'has a cookbook with no dependencies' do
       before do
-        cookbook 'quiche', '1.0.0', { 'metadata.rb' => "name 'quiche'\nversion '1.0.0'\n", 'recipes' => { 'default.rb' => '' } }
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => %Q{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"
@@ -450,8 +455,9 @@ EOM
     end
     when_the_chef_server 'has a cookbook with dependencies' do
       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' => '' } }
+        cookbook 'kettle', '1.0.0', { 'metadata.rb' => %Q{name "kettle"\nversion "1.0.0"\n} }
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => 'name "quiche"
+depends "kettle"', '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"
@@ -473,8 +479,8 @@ EOM
       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' => '' } }
+        cookbook 'quiche', '1.0.0', { 'metadata.rb' => %Q{name "quiche"\nversion "1.0.0"\n}, 'recipes' => { 'default.rb' => '' } }
+        cookbook 'soup', '1.0.0', { 'metadata.rb' =>   %Q{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]' ] }
@@ -538,10 +544,14 @@ EOM
     context 'circular dependencies' do
       when_the_chef_server 'has cookbooks with circular dependencies' do
         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" }
+          cookbook 'foo', '1.0.0', { 'metadata.rb'  => 'name "foo"
+depends "bar"' }
+          cookbook 'bar', '1.0.0', { 'metadata.rb'  => 'name "bar"
+depends "baz"' }
+          cookbook 'baz', '1.0.0', { 'metadata.rb'  => 'name "baz"
+depends "foo"' }
+          cookbook 'self', '1.0.0', { 'metadata.rb' => 'name "self"
+depends "self"' }
         end
         it 'knife deps prints each once' do
           knife('deps --remote /cookbooks/foo /cookbooks/self').should_succeed <<EOM

data/spec/integration/knife/download_spec.rb

@@ -903,7 +903,7 @@ EOM
 
     when_the_repository 'has a cookbook' do
       before do
-        file 'cookbooks/x-1.0.0/metadata.rb', 'name "x"; version "1.0.0"'
+        file 'cookbooks/x-1.0.0/metadata.rb', 'name "x"; version "1.0.0"#unmodified'
         file 'cookbooks/x-1.0.0/z.rb', ''
       end
 
@@ -1091,4 +1091,80 @@ EOM
       end
     end
   end
+
+  when_the_chef_server "is in Enterprise mode", :osc_compat => false, :single_org => false do
+    before do
+      organization 'foo' do
+        container 'x', {}
+        group 'x', {}
+      end
+    end
+
+    before :each do
+      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo')
+    end
+
+    when_the_repository 'is empty' do
+      it 'knife download / downloads everything' do
+        knife('download /').should_succeed <<EOM
+Created /acls
+Created /acls/clients
+Created /acls/clients/foo-validator.json
+Created /acls/containers
+Created /acls/containers/clients.json
+Created /acls/containers/containers.json
+Created /acls/containers/cookbooks.json
+Created /acls/containers/data.json
+Created /acls/containers/environments.json
+Created /acls/containers/groups.json
+Created /acls/containers/nodes.json
+Created /acls/containers/roles.json
+Created /acls/containers/sandboxes.json
+Created /acls/containers/x.json
+Created /acls/cookbooks
+Created /acls/data_bags
+Created /acls/environments
+Created /acls/environments/_default.json
+Created /acls/groups
+Created /acls/groups/admins.json
+Created /acls/groups/billing-admins.json
+Created /acls/groups/clients.json
+Created /acls/groups/users.json
+Created /acls/groups/x.json
+Created /acls/nodes
+Created /acls/roles
+Created /acls/organization.json
+Created /clients
+Created /clients/foo-validator.json
+Created /containers
+Created /containers/clients.json
+Created /containers/containers.json
+Created /containers/cookbooks.json
+Created /containers/data.json
+Created /containers/environments.json
+Created /containers/groups.json
+Created /containers/nodes.json
+Created /containers/roles.json
+Created /containers/sandboxes.json
+Created /containers/x.json
+Created /cookbooks
+Created /data_bags
+Created /environments
+Created /environments/_default.json
+Created /groups
+Created /groups/admins.json
+Created /groups/billing-admins.json
+Created /groups/clients.json
+Created /groups/users.json
+Created /groups/x.json
+Created /invitations.json
+Created /members.json
+Created /nodes
+Created /org.json
+Created /roles
+EOM
+        knife('diff --name-status /').should_succeed ''
+      end
+    end
+  end
 end

data/spec/integration/knife/list_spec.rb

@@ -641,4 +641,225 @@ EOM
       end
     end
   end
+
+  when_the_chef_server "is in Enterprise mode", :osc_compat => false, :single_org => false do
+    before do
+      organization 'foo'
+    end
+
+    before :each do
+      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo')
+    end
+
+    context 'and is empty' do
+      it "knife list / returns all top level directories" do
+        knife('list /').should_succeed <<EOM
+/acls
+/clients
+/containers
+/cookbooks
+/data_bags
+/environments
+/groups
+/invitations.json
+/members.json
+/nodes
+/org.json
+/roles
+EOM
+      end
+
+      it "knife list -R / returns everything" do
+        knife('list -R /').should_succeed <<EOM
+/:
+acls
+clients
+containers
+cookbooks
+data_bags
+environments
+groups
+invitations.json
+members.json
+nodes
+org.json
+roles
+
+/acls:
+clients
+containers
+cookbooks
+data_bags
+environments
+groups
+nodes
+organization.json
+roles
+
+/acls/clients:
+foo-validator.json
+
+/acls/containers:
+clients.json
+containers.json
+cookbooks.json
+data.json
+environments.json
+groups.json
+nodes.json
+roles.json
+sandboxes.json
+
+/acls/cookbooks:
+
+/acls/data_bags:
+
+/acls/environments:
+_default.json
+
+/acls/groups:
+admins.json
+billing-admins.json
+clients.json
+users.json
+
+/acls/nodes:
+
+/acls/roles:
+
+/clients:
+foo-validator.json
+
+/containers:
+clients.json
+containers.json
+cookbooks.json
+data.json
+environments.json
+groups.json
+nodes.json
+roles.json
+sandboxes.json
+
+/cookbooks:
+
+/data_bags:
+
+/environments:
+_default.json
+
+/groups:
+admins.json
+billing-admins.json
+clients.json
+users.json
+
+/nodes:
+
+/roles:
+EOM
+      end
+    end
+  end
+
+  when_the_chef_server "is in Enterprise mode", :osc_compat => false, :single_org => false do
+    before do
+      organization 'foo'
+    end
+
+    before :each do
+      Chef::Config.chef_server_url = URI.join(Chef::Config.chef_server_url, '/organizations/foo')
+    end
+
+    it 'knife list -R / returns everything' do
+      knife('list -R /').should_succeed <<EOM
+/:
+acls
+clients
+containers
+cookbooks
+data_bags
+environments
+groups
+invitations.json
+members.json
+nodes
+org.json
+roles
+
+/acls:
+clients
+containers
+cookbooks
+data_bags
+environments
+groups
+nodes
+organization.json
+roles
+
+/acls/clients:
+foo-validator.json
+
+/acls/containers:
+clients.json
+containers.json
+cookbooks.json
+data.json
+environments.json
+groups.json
+nodes.json
+roles.json
+sandboxes.json
+
+/acls/cookbooks:
+
+/acls/data_bags:
+
+/acls/environments:
+_default.json
+
+/acls/groups:
+admins.json
+billing-admins.json
+clients.json
+users.json
+
+/acls/nodes:
+
+/acls/roles:
+
+/clients:
+foo-validator.json
+
+/containers:
+clients.json
+containers.json
+cookbooks.json
+data.json
+environments.json
+groups.json
+nodes.json
+roles.json
+sandboxes.json
+
+/cookbooks:
+
+/data_bags:
+
+/environments:
+_default.json
+
+/groups:
+admins.json
+billing-admins.json
+clients.json
+users.json
+
+/nodes:
+
+/roles:
+EOM
+    end
+  end
 end

data/spec/integration/knife/raw_spec.rb

@@ -169,7 +169,7 @@ EOM
 
         knife("raw -m POST -i #{file.path} /roles").should_succeed <<EOM
 {
-  "uri": "#{ChefZeroSupport::Server.server.url}/roles/y"
+  "uri": "#{Chef::Config.chef_server_url}/roles/y"
 }
 EOM
         knife('show /roles/y.json').should_succeed <<EOM

data/spec/integration/knife/show_spec.rb

@@ -51,13 +51,13 @@ describe 'knife show' do
       it 'knife show /cookbooks/x/metadata.rb shows the remote version' do
         knife('show /cookbooks/x/metadata.rb').should_succeed <<EOM
 /cookbooks/x/metadata.rb:
-name 'x'; version '1.0.0'
+name "x"; version "1.0.0"
 EOM
       end
       it 'knife show --local /cookbooks/x/metadata.rb shows the local version' do
         knife('show --local /cookbooks/x/metadata.rb').should_succeed <<EOM
 /cookbooks/x/metadata.rb:
-name 'x'; version '1.0.0'
+name "x"; version "1.0.0"
 EOM
       end
       it 'knife show /data_bags/x/y.json shows the remote version' do