knife-essentials 0.9.8 → 1.0.0.beta1

data/spec/integration/deps_spec.rb

@@ -50,14 +50,14 @@ EOM
     when_the_repository 'has a node with no environment or run_list' do
       file 'nodes/mort.json', {}
       it 'knife deps reports just the node' do
-        knife('deps --repo-mode=everything /nodes/mort.json').should_succeed "/nodes/mort.json\n"
+        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' }
       it 'knife deps reports just the node' do
-        knife('deps --repo-mode=everything /nodes/mort.json').should_succeed "/environments/desert.json\n/nodes/mort.json\n"
+        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
@@ -68,7 +68,7 @@ EOM
       file 'cookbooks/soup/recipes/chicken.rb', ''
       file 'nodes/mort.json', { 'run_list' => %w(role[minor] recipe[quiche] recipe[soup::chicken]) }
       it 'knife deps reports just the node' do
-        knife('deps --repo-mode=everything /nodes/mort.json').should_succeed <<EOM
+        knife('deps /nodes/mort.json').should_succeed <<EOM
 /roles/minor.json
 /cookbooks/quiche
 /cookbooks/soup
@@ -115,7 +115,7 @@ EOM
       file 'nodes/bart.json', { 'run_list' => [ 'role[minor]' ] }
 
       it 'knife deps reports all dependencies' do
-        knife('deps --repo-mode=everything /nodes/mort.json').should_succeed <<EOM
+        knife('deps /nodes/mort.json').should_succeed <<EOM
 /environments/desert.json
 /roles/minor.json
 /cookbooks/quiche
@@ -125,7 +125,7 @@ EOM
 EOM
       end
       it 'knife deps * reports all dependencies of all things' do
-        knife('deps --repo-mode=everything /nodes/*').should_succeed <<EOM
+        knife('deps /nodes/*').should_succeed <<EOM
 /roles/minor.json
 /nodes/bart.json
 /environments/desert.json
@@ -136,7 +136,7 @@ EOM
 EOM
       end
       it 'knife deps a b reports all dependencies of a and b' do
-        knife('deps --repo-mode=everything /nodes/bart.json /nodes/mort.json').should_succeed <<EOM
+        knife('deps /nodes/bart.json /nodes/mort.json').should_succeed <<EOM
 /roles/minor.json
 /nodes/bart.json
 /environments/desert.json
@@ -147,7 +147,7 @@ EOM
 EOM
       end
       it 'knife deps --tree /* shows dependencies in a tree' do
-        knife('deps --tree --repo-mode=everything /nodes/*').should_succeed <<EOM
+        knife('deps --tree /nodes/*').should_succeed <<EOM
 /nodes/bart.json
   /roles/minor.json
 /nodes/mort.json
@@ -159,7 +159,7 @@ EOM
 EOM
       end
       it 'knife deps --tree --no-recurse shows only the first level of dependencies' do
-        knife('deps --tree --no-recurse --repo-mode=everything /nodes/*').should_succeed <<EOM
+        knife('deps --tree --no-recurse /nodes/*').should_succeed <<EOM
 /nodes/bart.json
   /roles/minor.json
 /nodes/mort.json
@@ -233,7 +233,7 @@ EOM
           )
         end
         it 'knife deps /nodes/x.json reports an error' do
-          knife('deps --repo-mode=everything /nodes/x.json').should_fail(
+          knife('deps /nodes/x.json').should_fail(
             :exit_code => 2,
             :stdout => "/nodes/x.json\n",
             :stderr => "ERROR: /nodes/x.json: No such file or directory\n"
@@ -274,7 +274,7 @@ EOM
       when_the_repository 'is missing a dependent environment' do
         file 'nodes/mort.json', { 'chef_environment' => 'desert' }
         it 'knife deps reports the environment, along with an error' do
-          knife('deps --repo-mode=everything /nodes/mort.json').should_fail(
+          knife('deps /nodes/mort.json').should_fail(
             :exit_code => 2,
             :stdout => "/environments/desert.json\n/nodes/mort.json\n",
             :stderr => "ERROR: /environments/desert.json: No such file or directory\n"
@@ -363,14 +363,14 @@ EOM
     when_the_chef_server 'has a node with no environment or run_list' do
       node 'mort', {}
       it 'knife deps reports just the node' do
-        knife('deps --remote --repo-mode=everything /nodes/mort.json').should_succeed "/nodes/mort.json\n"
+        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' }
       it 'knife deps reports just the node' do
-        knife('deps --remote --repo-mode=everything /nodes/mort.json').should_succeed "/environments/desert.json\n/nodes/mort.json\n"
+        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
@@ -379,7 +379,7 @@ EOM
       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]) }
       it 'knife deps reports just the node' do
-        knife('deps --remote --repo-mode=everything /nodes/mort.json').should_succeed <<EOM
+        knife('deps --remote /nodes/mort.json').should_succeed <<EOM
 /roles/minor.json
 /cookbooks/quiche
 /cookbooks/soup
@@ -422,7 +422,7 @@ EOM
       node 'bart', { 'run_list' => [ 'role[minor]' ] }
 
       it 'knife deps reports all dependencies' do
-        knife('deps --remote --repo-mode=everything /nodes/mort.json').should_succeed <<EOM
+        knife('deps --remote /nodes/mort.json').should_succeed <<EOM
 /environments/desert.json
 /roles/minor.json
 /cookbooks/quiche
@@ -432,7 +432,7 @@ EOM
 EOM
       end
       it 'knife deps * reports all dependencies of all things' do
-        knife('deps --remote --repo-mode=everything /nodes/*').should_succeed <<EOM
+        knife('deps --remote /nodes/*').should_succeed <<EOM
 /roles/minor.json
 /nodes/bart.json
 /environments/desert.json
@@ -443,7 +443,7 @@ EOM
 EOM
       end
       it 'knife deps a b reports all dependencies of a and b' do
-        knife('deps --remote --repo-mode=everything /nodes/bart.json /nodes/mort.json').should_succeed <<EOM
+        knife('deps --remote /nodes/bart.json /nodes/mort.json').should_succeed <<EOM
 /roles/minor.json
 /nodes/bart.json
 /environments/desert.json
@@ -454,7 +454,7 @@ EOM
 EOM
       end
       it 'knife deps --tree /* shows dependencies in a tree' do
-        knife('deps --remote --tree --repo-mode=everything /nodes/*').should_succeed <<EOM
+        knife('deps --remote --tree /nodes/*').should_succeed <<EOM
 /nodes/bart.json
   /roles/minor.json
 /nodes/mort.json
@@ -466,7 +466,7 @@ EOM
 EOM
       end
       it 'knife deps --tree --no-recurse shows only the first level of dependencies' do
-        knife('deps --remote --tree --no-recurse --repo-mode=everything /nodes/*').should_succeed <<EOM
+        knife('deps --remote --tree --no-recurse /nodes/*').should_succeed <<EOM
 /nodes/bart.json
   /roles/minor.json
 /nodes/mort.json
@@ -540,7 +540,7 @@ EOM
           )
         end
         it 'knife deps /nodes/x.json reports an error' do
-          knife('deps --remote --repo-mode=everything /nodes/x.json').should_fail(
+          knife('deps --remote /nodes/x.json').should_fail(
             :exit_code => 2,
             :stdout => "/nodes/x.json\n",
             :stderr => "ERROR: /nodes/x.json: No such file or directory\n"
@@ -581,7 +581,7 @@ EOM
       when_the_chef_server 'is missing a dependent environment' do
         node 'mort', { 'chef_environment' => 'desert' }
         it 'knife deps reports the environment, along with an error' do
-          knife('deps --remote --repo-mode=everything /nodes/mort.json').should_fail(
+          knife('deps --remote /nodes/mort.json').should_fail(
             :exit_code => 2,
             :stdout => "/environments/desert.json\n/nodes/mort.json\n",
             :stderr => "ERROR: /environments/desert.json: No such file or directory\n"

data/spec/integration/diff_spec.rb

@@ -26,76 +26,34 @@ describe 'knife diff' do
 
         it 'knife diff reports everything as deleted' do
           knife('diff --name-status /').should_succeed <<EOM
+D\t/clients/chef-validator.json
+D\t/clients/chef-webui.json
+D\t/clients/x.json
 D\t/cookbooks/x
 D\t/data_bags/x
 D\t/environments/_default.json
 D\t/environments/x.json
+D\t/nodes/x.json
 D\t/roles/x.json
+D\t/users/admin.json
+D\t/users/x.json
 EOM
       end
     end
 
       when_the_repository 'has an identical copy of each thing' do
-        file 'clients/x.json', <<EOM
-{}
-EOM
+
+        file 'clients/chef-validator.json', { 'validator' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'clients/chef-webui.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'clients/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
         file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
-        file 'data_bags/x/y.json', <<EOM
-{
-  "id": "y"
-}
-EOM
-        file 'environments/_default.json', <<EOM
-{
-  "name": "_default",
-  "description": "The default Chef environment",
-  "cookbook_versions": {
-  },
-  "json_class": "Chef::Environment",
-  "chef_type": "environment",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  }
-}
-EOM
-        file 'environments/x.json', <<EOM
-{
-  "chef_type": "environment",
-  "cookbook_versions": {
-  },
-  "default_attributes": {
-  },
-  "description": "",
-  "json_class": "Chef::Environment",
-  "name": "x",
-  "override_attributes": {
-  }
-}
-EOM
-        file 'nodes/x.json', <<EOM
-{}
-EOM
-        file 'roles/x.json', <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "description": "",
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "x",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
-        file 'users/x.json', <<EOM
-{}
-EOM
+        file 'data_bags/x/y.json', {}
+        file 'environments/_default.json', { "description" => "The default Chef environment" }
+        file 'environments/x.json', {}
+        file 'nodes/x.json', {}
+        file 'roles/x.json', {}
+        file 'users/admin.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'users/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
 
         it 'knife diff reports no differences' do
           knife('diff /').should_succeed ''
@@ -123,7 +81,7 @@ EOM
         end
 
         context 'as well as one extra copy of each thing' do
-          file 'clients/y.json', {}
+          file 'clients/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
           file 'cookbooks/x/blah.rb', ''
           file 'cookbooks/y/metadata.rb', 'version "1.0.0"'
           file 'data_bags/x/z.json', {}
@@ -131,16 +89,19 @@ EOM
           file 'environments/y.json', {}
           file 'nodes/y.json', {}
           file 'roles/y.json', {}
-          file 'users/y.json', {}
+          file 'users/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
 
           it 'knife diff reports the new files as added' do
             knife('diff --name-status /').should_succeed <<EOM
+A\t/clients/y.json
 A\t/cookbooks/x/blah.rb
 A\t/cookbooks/y
 A\t/data_bags/x/z.json
 A\t/data_bags/y
 A\t/environments/y.json
+A\t/nodes/y.json
 A\t/roles/y.json
+A\t/users/y.json
 EOM
           end
 
@@ -165,10 +126,13 @@ EOM
       when_the_repository 'is empty' do
         it 'knife diff reports everything as deleted' do
           knife('diff --name-status /').should_succeed <<EOM
+D\t/clients
 D\t/cookbooks
 D\t/data_bags
 D\t/environments
+D\t/nodes
 D\t/roles
+D\t/users
 EOM
         end
       end
@@ -321,76 +285,33 @@ EOM
 
         it 'knife diff reports everything as deleted' do
           knife('diff --name-status /').should_succeed <<EOM
+D\t/clients/chef-validator.json
+D\t/clients/chef-webui.json
+D\t/clients/x.json
 D\t/cookbooks/x-1.0.0
 D\t/data_bags/x
 D\t/environments/_default.json
 D\t/environments/x.json
+D\t/nodes/x.json
 D\t/roles/x.json
+D\t/users/admin.json
+D\t/users/x.json
 EOM
       end
     end
 
       when_the_repository 'has an identical copy of each thing' do
-        file 'clients/x.json', <<EOM
-{}
-EOM
+        file 'clients/chef-validator.json', { 'validator' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'clients/chef-webui.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'clients/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
         file 'cookbooks/x-1.0.0/metadata.rb', 'version "1.0.0"'
-        file 'data_bags/x/y.json', <<EOM
-{
-  "id": "y"
-}
-EOM
-        file 'environments/_default.json', <<EOM
-{
-  "name": "_default",
-  "description": "The default Chef environment",
-  "cookbook_versions": {
-  },
-  "json_class": "Chef::Environment",
-  "chef_type": "environment",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  }
-}
-EOM
-        file 'environments/x.json', <<EOM
-{
-  "chef_type": "environment",
-  "cookbook_versions": {
-  },
-  "default_attributes": {
-  },
-  "description": "",
-  "json_class": "Chef::Environment",
-  "name": "x",
-  "override_attributes": {
-  }
-}
-EOM
-        file 'nodes/x.json', <<EOM
-{}
-EOM
-        file 'roles/x.json', <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "description": "",
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "x",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
-        file 'users/x.json', <<EOM
-{}
-EOM
+        file 'data_bags/x/y.json', {}
+        file 'environments/_default.json', { "description" => "The default Chef environment" }
+        file 'environments/x.json', {}
+        file 'nodes/x.json', {}
+        file 'roles/x.json', {}
+        file 'users/admin.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'users/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
 
         it 'knife diff reports no differences' do
           knife('diff /').should_succeed ''
@@ -431,13 +352,16 @@ EOM
 
           it 'knife diff reports the new files as added' do
             knife('diff --name-status /').should_succeed <<EOM
+A\t/clients/y.json
 A\t/cookbooks/x-1.0.0/blah.rb
 A\t/cookbooks/x-2.0.0
 A\t/cookbooks/y-1.0.0
 A\t/data_bags/x/z.json
 A\t/data_bags/y
 A\t/environments/y.json
+A\t/nodes/y.json
 A\t/roles/y.json
+A\t/users/y.json
 EOM
           end
 
@@ -462,10 +386,13 @@ EOM
       when_the_repository 'is empty' do
         it 'knife diff reports everything as deleted' do
           knife('diff --name-status /').should_succeed <<EOM
+D\t/clients
 D\t/cookbooks
 D\t/data_bags
 D\t/environments
+D\t/nodes
 D\t/roles
+D\t/users
 EOM
         end
       end

data/spec/integration/download_spec.rb

@@ -8,13 +8,13 @@ describe 'knife download' do
 
   context 'without versioned cookbooks' do
     when_the_chef_server "has one of each thing" do
-      client 'x', '{}'
+      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', '{}'
+      data_bag 'x', { 'y' => {} }
+      environment 'x', {}
+      node 'x', {}
+      role 'x', {}
+      user 'x', {}
 
       when_the_repository 'has only top-level directories' do
         directory 'clients'
@@ -27,79 +27,36 @@ describe 'knife download' do
 
         it 'knife download downloads everything' do
           knife('download /').should_succeed <<EOM
+Created /clients/chef-validator.json
+Created /clients/chef-webui.json
+Created /clients/x.json
 Created /cookbooks/x
 Created /cookbooks/x/metadata.rb
 Created /data_bags/x
 Created /data_bags/x/y.json
 Created /environments/_default.json
 Created /environments/x.json
+Created /nodes/x.json
 Created /roles/x.json
+Created /users/admin.json
+Created /users/x.json
 EOM
           knife('diff --name-status /').should_succeed ''
         end
       end
 
       when_the_repository 'has an identical copy of each thing' do
-        file 'clients/x.json', <<EOM
-{}
-EOM
+        file 'clients/chef-validator.json', { 'validator' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'clients/chef-webui.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'clients/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
         file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
-        file 'data_bags/x/y.json', <<EOM
-{
-  "id": "y"
-}
-EOM
-        file 'environments/_default.json', <<EOM
-{
-  "name": "_default",
-  "description": "The default Chef environment",
-  "cookbook_versions": {
-  },
-  "json_class": "Chef::Environment",
-  "chef_type": "environment",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  }
-}
-EOM
-        file 'environments/x.json', <<EOM
-{
-  "chef_type": "environment",
-  "cookbook_versions": {
-  },
-  "default_attributes": {
-  },
-  "description": "",
-  "json_class": "Chef::Environment",
-  "name": "x",
-  "override_attributes": {
-  }
-}
-EOM
-        file 'nodes/x.json', <<EOM
-{}
-EOM
-        file 'roles/x.json', <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "description": "",
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "x",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
-        file 'users/x.json', <<EOM
-{}
-EOM
+        file 'data_bags/x/y.json', {}
+        file 'environments/_default.json', { "description" => "The default Chef environment" }
+        file 'environments/x.json', {}
+        file 'nodes/x.json', {}
+        file 'roles/x.json', {}
+        file 'users/admin.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'users/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
 
         it 'knife download makes no changes' do
           knife('download /').should_succeed ''
@@ -160,73 +117,42 @@ EOM
         end
 
         context 'as well as one extra copy of each thing' do
-          file 'clients/y.json', { 'name' => 'y' }
+          file 'clients/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
           file 'cookbooks/x/blah.rb', ''
           file 'cookbooks/y/metadata.rb', 'version "1.0.0"'
-          file 'data_bags/x/z.json', <<EOM
-{
-  "id": "z"
-}
-EOM
-          file 'data_bags/y/zz.json', <<EOM
-{
-  "id": "zz"
-}
-EOM
-          file 'environments/y.json', <<EOM
-{
-  "chef_type": "environment",
-  "cookbook_versions": {
-  },
-  "default_attributes": {
-  },
-  "description": "",
-  "json_class": "Chef::Environment",
-  "name": "y",
-  "override_attributes": {
-  }
-}
-EOM
-          file 'nodes/y.json', { 'name' => 'y' }
-          file 'roles/y.json', <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "description": "",
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "y",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
-          file 'users/y.json', { 'name' => 'y' }
+          file 'data_bags/x/z.json', {}
+          file 'data_bags/y/zz.json', {}
+          file 'environments/y.json', {}
+          file 'nodes/y.json', {}
+          file 'roles/y.json', {}
+          file 'users/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
 
           it 'knife download does nothing' do
             knife('download /').should_succeed ''
             knife('diff --name-status /').should_succeed <<EOM
+A\t/clients/y.json
 A\t/cookbooks/x/blah.rb
 A\t/cookbooks/y
 A\t/data_bags/x/z.json
 A\t/data_bags/y
 A\t/environments/y.json
+A\t/nodes/y.json
 A\t/roles/y.json
+A\t/users/y.json
 EOM
           end
 
           it 'knife download --purge deletes the extra files' do
             knife('download --purge /').should_succeed <<EOM
+Deleted extra entry /clients/y.json (purge is on)
 Deleted extra entry /cookbooks/x/blah.rb (purge is on)
 Deleted extra entry /cookbooks/y (purge is on)
 Deleted extra entry /data_bags/x/z.json (purge is on)
 Deleted extra entry /data_bags/y (purge is on)
 Deleted extra entry /environments/y.json (purge is on)
+Deleted extra entry /nodes/y.json (purge is on)
 Deleted extra entry /roles/y.json (purge is on)
+Deleted extra entry /users/y.json (purge is on)
 EOM
             knife('diff --name-status /').should_succeed ''
           end
@@ -236,6 +162,10 @@ EOM
       when_the_repository 'is empty' do
         it 'knife download creates the extra files' do
           knife('download /').should_succeed <<EOM
+Created /clients
+Created /clients/chef-validator.json
+Created /clients/chef-webui.json
+Created /clients/x.json
 Created /cookbooks
 Created /cookbooks/x
 Created /cookbooks/x/metadata.rb
@@ -245,8 +175,13 @@ Created /data_bags/x/y.json
 Created /environments
 Created /environments/_default.json
 Created /environments/x.json
+Created /nodes
+Created /nodes/x.json
 Created /roles
 Created /roles/x.json
+Created /users
+Created /users/admin.json
+Created /users/x.json
 EOM
           knife('diff --name-status /').should_succeed ''
         end
@@ -529,13 +464,13 @@ EOM
 
   with_versioned_cookbooks do
     when_the_chef_server "has one of each thing" do
-      client 'x', '{}'
+      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', '{}'
+      data_bag 'x', { 'y' => {} }
+      environment 'x', {}
+      node 'x', {}
+      role 'x', {}
+      user 'x', {}
 
       when_the_repository 'has only top-level directories' do
         directory 'clients'
@@ -548,79 +483,36 @@ EOM
 
         it 'knife download downloads everything' do
           knife('download /').should_succeed <<EOM
+Created /clients/chef-validator.json
+Created /clients/chef-webui.json
+Created /clients/x.json
 Created /cookbooks/x-1.0.0
 Created /cookbooks/x-1.0.0/metadata.rb
 Created /data_bags/x
 Created /data_bags/x/y.json
 Created /environments/_default.json
 Created /environments/x.json
+Created /nodes/x.json
 Created /roles/x.json
+Created /users/admin.json
+Created /users/x.json
 EOM
           knife('diff --name-status /').should_succeed ''
         end
       end
 
       when_the_repository 'has an identical copy of each thing' do
-        file 'clients/x.json', <<EOM
-{}
-EOM
+        file 'clients/chef-validator.json', { 'validator' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'clients/chef-webui.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'clients/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
         file 'cookbooks/x-1.0.0/metadata.rb', 'version "1.0.0"'
-        file 'data_bags/x/y.json', <<EOM
-{
-  "id": "y"
-}
-EOM
-        file 'environments/_default.json', <<EOM
-{
-  "name": "_default",
-  "description": "The default Chef environment",
-  "cookbook_versions": {
-  },
-  "json_class": "Chef::Environment",
-  "chef_type": "environment",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  }
-}
-EOM
-        file 'environments/x.json', <<EOM
-{
-  "chef_type": "environment",
-  "cookbook_versions": {
-  },
-  "default_attributes": {
-  },
-  "description": "",
-  "json_class": "Chef::Environment",
-  "name": "x",
-  "override_attributes": {
-  }
-}
-EOM
-        file 'nodes/x.json', <<EOM
-{}
-EOM
-        file 'roles/x.json', <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "description": "",
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "x",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
-        file 'users/x.json', <<EOM
-{}
-EOM
+        file 'data_bags/x/y.json', {}
+        file 'environments/_default.json', { "description" => "The default Chef environment" }
+        file 'environments/x.json', {}
+        file 'nodes/x.json', {}
+        file 'roles/x.json', {}
+        file 'users/admin.json', { 'admin' => true, 'public_key' => ChefZero::PUBLIC_KEY }
+        file 'users/x.json', { 'public_key' => ChefZero::PUBLIC_KEY }
 
         it 'knife download makes no changes' do
           knife('download /').should_succeed ''
@@ -633,23 +525,8 @@ EOM
         end
 
         context 'except the role file' do
-          file 'roles/x.json', <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "description": "blarghle",
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "x",
-  "override_attributes": {
-  },
-  "run_list": [
+          file 'roles/x.json', { "description" => "blarghle" }
 
-  ]
-}
-EOM
           it 'knife download changes the role' do
             knife('download /').should_succeed "Updated /roles/x.json\n"
             knife('diff --name-status /').should_succeed ''
@@ -658,8 +535,8 @@ EOM
 
         context 'except the role file is textually different, but not ACTUALLY different' do
           file 'roles/x.json', <<EOM
-{
-  "chef_type": "role",
+{  
+  "chef_type": "role" ,
   "default_attributes": {
   },
   "env_run_lists": {
@@ -670,7 +547,7 @@ EOM
   "override_attributes": {
   },
   "run_list": [
-
+     
   ]
 }
 EOM
@@ -681,76 +558,45 @@ EOM
         end
 
         context 'as well as one extra copy of each thing' do
-          file 'clients/y.json', { 'name' => 'y' }
+          file 'clients/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
           file 'cookbooks/x-1.0.0/blah.rb', ''
           file 'cookbooks/x-2.0.0/metadata.rb', 'version "2.0.0"'
           file 'cookbooks/y-1.0.0/metadata.rb', 'version "1.0.0"'
-          file 'data_bags/x/z.json', <<EOM
-{
-  "id": "z"
-}
-EOM
-          file 'data_bags/y/zz.json', <<EOM
-{
-  "id": "zz"
-}
-EOM
-          file 'environments/y.json', <<EOM
-{
-  "chef_type": "environment",
-  "cookbook_versions": {
-  },
-  "default_attributes": {
-  },
-  "description": "",
-  "json_class": "Chef::Environment",
-  "name": "y",
-  "override_attributes": {
-  }
-}
-EOM
-          file 'nodes/y.json', { 'name' => 'y' }
-          file 'roles/y.json', <<EOM
-{
-  "chef_type": "role",
-  "default_attributes": {
-  },
-  "description": "",
-  "env_run_lists": {
-  },
-  "json_class": "Chef::Role",
-  "name": "y",
-  "override_attributes": {
-  },
-  "run_list": [
-
-  ]
-}
-EOM
-          file 'users/y.json', { 'name' => 'y' }
+          file 'data_bags/x/z.json', {}
+          file 'data_bags/y/zz.json', {}
+          file 'environments/y.json', {}
+          file 'nodes/y.json', {}
+          file 'roles/y.json', {}
+          file 'users/y.json', { 'public_key' => ChefZero::PUBLIC_KEY }
 
           it 'knife download does nothing' do
             knife('download /').should_succeed ''
             knife('diff --name-status /').should_succeed <<EOM
+A\t/clients/y.json
 A\t/cookbooks/x-1.0.0/blah.rb
 A\t/cookbooks/x-2.0.0
 A\t/cookbooks/y-1.0.0
 A\t/data_bags/x/z.json
 A\t/data_bags/y
 A\t/environments/y.json
+A\t/nodes/y.json
 A\t/roles/y.json
+A\t/users/y.json
 EOM
           end
 
           it 'knife download --purge deletes the extra files' do
             knife('download --purge /').should_succeed <<EOM
+Deleted extra entry /clients/y.json (purge is on)
 Deleted extra entry /cookbooks/x-1.0.0/blah.rb (purge is on)
 Deleted extra entry /cookbooks/x-2.0.0 (purge is on)
 Deleted extra entry /cookbooks/y-1.0.0 (purge is on)
 Deleted extra entry /data_bags/x/z.json (purge is on)
 Deleted extra entry /data_bags/y (purge is on)
 Deleted extra entry /environments/y.json (purge is on)
+Deleted extra entry /nodes/y.json (purge is on)
 Deleted extra entry /roles/y.json (purge is on)
+Deleted extra entry /users/y.json (purge is on)
 EOM
             knife('diff --name-status /').should_succeed ''
           end
@@ -760,6 +606,10 @@ EOM
       when_the_repository 'is empty' do
         it 'knife download creates the extra files' do
           knife('download /').should_succeed <<EOM
+Created /clients
+Created /clients/chef-validator.json
+Created /clients/chef-webui.json
+Created /clients/x.json
 Created /cookbooks
 Created /cookbooks/x-1.0.0
 Created /cookbooks/x-1.0.0/metadata.rb
@@ -769,8 +619,13 @@ Created /data_bags/x/y.json
 Created /environments
 Created /environments/_default.json
 Created /environments/x.json
+Created /nodes
+Created /nodes/x.json
 Created /roles
 Created /roles/x.json
+Created /users
+Created /users/admin.json
+Created /users/x.json
 EOM
           knife('diff --name-status /').should_succeed ''
         end