knife-essentials 0.8.6 → 0.9.0

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end
 

data/spec/chef_fs/file_system/chef_server_root_dir_spec.rb

@@ -46,6 +46,7 @@ describe ChefFS::FileSystem::ChefServerRootDir do
           'a' => 'b'
         })
       endpoint_leaf.read.should == '{
+  "name": "achild",
   "a": "b"
 }'
     end

data/spec/chef_fs/file_system/data_bags_dir_spec.rb

@@ -95,6 +95,7 @@ describe ChefFS::FileSystem::DataBagsDir do
         'a' => 'b'
       })
       data_bag_item.read.should == '{
+  "id": "aitem",
   "a": "b"
 }'
     end

data/spec/integration/diff_spec.rb

@@ -186,6 +186,13 @@ EOM
 M\t/cookbooks/x/metadata.rb
 D\t/cookbooks/x/onlyin1.0.1.rb
 A\t/cookbooks/x/onlyin1.0.0.rb
+EOM
+      end
+
+      it 'knife diff --diff-filter=MAT does not show deleted files' do
+        knife('diff --diff-filter=MAT --name-status /cookbooks/x').should_succeed <<EOM
+M\t/cookbooks/x/metadata.rb
+A\t/cookbooks/x/onlyin1.0.0.rb
 EOM
       end
     end
@@ -222,4 +229,72 @@ EOM
       end
     end
   end
+
+  context 'json diff tests' do
+    when_the_repository 'has an empty environment file' do
+      file 'environments/x.json', {}
+      when_the_chef_server 'has an empty environment' do
+        environment 'x', {}
+        it 'knife diff returns no differences' do
+          knife('diff /environments/x.json').should_succeed ''
+        end
+      end
+      when_the_chef_server 'has an environment with a different value' do
+        environment 'x', { 'description' => 'hi' }
+        it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          knife('diff /environments/x.json').should_succeed(/
+ {
+-  "name": "x",
+-  "description": "hi"
+\+  "name": "x"
+ }
+/)
+        end
+      end
+    end
+
+    when_the_repository 'has an environment file with a value in it' do
+      file 'environments/x.json', { 'description' => 'hi' }
+      when_the_chef_server 'has an environment with the same value' do
+        environment 'x', { 'description' => 'hi' }
+        it 'knife diff returns no differences' do
+          knife('diff /environments/x.json').should_succeed ''
+        end
+      end
+      when_the_chef_server 'has an environment with no value' do
+        environment 'x', {}
+        it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          knife('diff /environments/x.json').should_succeed(/
+ {
+-  "name": "x"
+\+  "name": "x",
+\+  "description": "hi"
+ }
+/)
+        end
+      end
+      when_the_chef_server 'has an environment with a different value' do
+        environment 'x', { 'description' => 'lo' }
+        it 'knife diff reports the difference', :pending => (RUBY_VERSION < "1.9") do
+          knife('diff /environments/x.json').should_succeed(/
+ {
+   "name": "x",
+-  "description": "lo"
+\+  "description": "hi"
+ }
+/)
+        end
+      end
+    end
+  end
+
+  when_the_chef_server 'has an environment' do
+    environment 'x', {}
+    when_the_repository 'has an environment with bad JSON' do
+      file 'environments/x.json', '{'
+      it 'knife diff reports an error and does a textual diff' do
+        knife('diff /environments/x.json').should_succeed(/-  "name": "x"/, :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n")
+      end
+    end
+  end
 end

data/spec/integration/download_spec.rb

@@ -497,4 +497,31 @@ EOM
       end
     end
   end
+
+  when_the_chef_server 'has an environment' do
+    environment 'x', {}
+    when_the_repository 'has an environment with bad JSON' do
+      file 'environments/x.json', '{'
+      it 'knife download succeeds' do
+        knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
+        knife('diff --name-status /environments/x.json').should_succeed ''
+      end
+    end
+
+    when_the_repository 'has the same environment with the wrong name in the file' do
+      file 'environments/x.json', { 'name' => 'y' }
+      it 'knife download succeeds' do
+        knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n"
+        knife('diff --name-status /environments/x.json').should_succeed ''
+      end
+    end
+
+    when_the_repository 'has the same environment with no name in the file' do
+      file 'environments/x.json', { 'description' => 'hi' }
+      it 'knife download succeeds' do
+        knife('download /environments/x.json').should_succeed "Updated /environments/x.json\n"
+        knife('diff --name-status /environments/x.json').should_succeed ''
+      end
+    end
+  end
 end

data/spec/integration/raw_spec.rb

@@ -104,18 +104,7 @@ EOM
 /roles/x.json:
 {
   "name": "x",
-  "description": "eek",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-
-  ],
-  "env_run_lists": {
-  }
+  "description": "eek"
 }
 EOM
       end
@@ -151,18 +140,7 @@ EOM
 /roles/y.json:
 {
   "name": "y",
-  "description": "eek",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-
-  ],
-  "env_run_lists": {
-  }
+  "description": "eek"
 }
 EOM
       end

data/spec/integration/show_spec.rb

@@ -56,16 +56,7 @@ EOM
         knife('show /environments/x.json').should_succeed <<EOM
 /environments/x.json:
 {
-  "name": "x",
-  "description": "",
-  "cookbook_versions": {
-  },
-  "json_class": "Chef::Environment",
-  "chef_type": "environment",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  }
+  "name": "x"
 }
 EOM
       end
@@ -81,19 +72,7 @@ EOM
         knife('show /roles/x.json').should_succeed <<EOM
 /roles/x.json:
 {
-  "name": "x",
-  "description": "",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-
-  ],
-  "env_run_lists": {
-  }
+  "name": "x"
 }
 EOM
       end
@@ -121,4 +100,42 @@ EOM
       end
     end
   end
+
+  when_the_chef_server 'has a hash with multiple keys' do
+    environment 'x', {
+      'default_attributes' => { 'foo' => 'bar' },
+      'cookbook_versions' => { 'blah' => '= 1.0.0'},
+      'override_attributes' => { 'x' => 'y' },
+      'description' => 'woo',
+      'name' => 'x'
+    }
+    it 'knife show shows the attributes in a predetermined order', :pending => (RUBY_VERSION < "1.8") do
+      knife('show /environments/x.json').should_succeed <<EOM
+/environments/x.json:
+{
+  "name": "x",
+  "description": "woo",
+  "cookbook_versions": {
+    "blah": "= 1.0.0"
+  },
+  "default_attributes": {
+    "foo": "bar"
+  },
+  "override_attributes": {
+    "x": "y"
+  }
+}
+EOM
+    end
+  end
+
+  when_the_repository 'has an environment with bad JSON' do
+    file 'environments/x.json', '{'
+    it 'knife show succeeds' do
+      knife('show --local /environments/x.json').should_succeed <<EOM
+/environments/x.json:
+{
+EOM
+    end
+  end
 end

data/spec/integration/upload_spec.rb

@@ -513,4 +513,65 @@ EOM
       end
     end
   end
+
+  when_the_chef_server 'has an environment' do
+    environment 'x', {}
+    when_the_repository 'has an environment with bad JSON' do
+      file 'environments/x.json', '{'
+      it 'knife upload tries and fails' do
+        knife('upload /environments/x.json').should_fail "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\nERROR: /environments/x.json failed to write: Parse error reading JSON: A JSON text must at least contain two octets!\n"
+        knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n", :stderr => "WARN: Parse error reading #{path_to('environments/x.json')} as JSON: A JSON text must at least contain two octets!\n"
+      end
+    end
+
+    when_the_repository 'has the same environment with the wrong name in the file' do
+      file 'environments/x.json', { 'name' => 'y' }
+      it 'knife upload fails' do
+        knife('upload /environments/x.json').should_fail "ERROR: /environments/x.json failed to write: Name in remote/environments/x.json/x.json must be 'x' (is 'y')\n"
+        knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n"
+      end
+    end
+
+    when_the_repository 'has the same environment with no name in the file' do
+      file 'environments/x.json', { 'description' => 'hi' }
+      it 'knife upload succeeds' do
+        knife('upload /environments/x.json').should_succeed "Updated /environments/x.json\n"
+        knife('diff --name-status /environments/x.json').should_succeed ''
+      end
+    end
+  end
+
+  when_the_chef_server 'is empty' do
+    when_the_repository 'has an environment with bad JSON' do
+      file 'environments/x.json', '{'
+      it 'knife upload tries and fails' do
+        knife('upload /environments/x.json').should_fail "ERROR: /environments failed to create_child: Parse error reading JSON creating child 'x.json': A JSON text must at least contain two octets!\n"
+        knife('diff --name-status /environments/x.json').should_succeed "A\t/environments/x.json\n"
+      end
+    end
+
+    when_the_repository 'has an environment with the wrong name in the file' do
+      file 'environments/x.json', { 'name' => 'y' }
+      it 'knife upload fails' do
+        knife('upload /environments/x.json').should_fail "ERROR: /environments failed to create_child: Name in remote/environments/x.json must be 'x' (is 'y')\n"
+        knife('diff --name-status /environments/x.json').should_succeed "A\t/environments/x.json\n"
+      end
+    end
+
+    when_the_repository 'has an environment with no name in the file' do
+      file 'environments/x.json', { 'description' => 'hi' }
+      it 'knife upload succeeds' do
+        knife('upload /environments/x.json').should_succeed "Created /environments/x.json\n"
+        knife('diff --name-status /environments/x.json').should_succeed ''
+      end
+    end
+
+    when_the_repository 'has a data bag with no id in the file' do
+      file 'data_bags/bag/x.json', { 'foo' => 'bar' }
+      it 'knife upload succeeds' do
+        knife('upload /data_bags/bag/x.json').should_succeed "Created /data_bags/bag\nCreated /data_bags/bag/x.json\n"
+        knife('diff --name-status /data_bags/bag/x.json').should_succeed ''
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-19 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -47,6 +47,14 @@ files:
 - lib/chef/knife/show_essentials.rb
 - lib/chef/knife/upload_essentials.rb
 - lib/chef_fs/command_line.rb
+- lib/chef_fs/data_handler/client_data_handler.rb
+- lib/chef_fs/data_handler/cookbook_data_handler.rb
+- lib/chef_fs/data_handler/data_bag_item_data_handler.rb
+- lib/chef_fs/data_handler/data_handler_base.rb
+- lib/chef_fs/data_handler/environment_data_handler.rb
+- lib/chef_fs/data_handler/node_data_handler.rb
+- lib/chef_fs/data_handler/role_data_handler.rb
+- lib/chef_fs/data_handler/user_data_handler.rb
 - lib/chef_fs/file_pattern.rb
 - lib/chef_fs/file_system/base_fs_dir.rb
 - lib/chef_fs/file_system/base_fs_object.rb
@@ -71,6 +79,7 @@ files:
 - lib/chef_fs/file_system/nodes_dir.rb
 - lib/chef_fs/file_system/nonexistent_fs_object.rb
 - lib/chef_fs/file_system/not_found_error.rb
+- lib/chef_fs/file_system/operation_failed_error.rb
 - lib/chef_fs/file_system/operation_not_allowed_error.rb
 - lib/chef_fs/file_system/rest_list_dir.rb
 - lib/chef_fs/file_system/rest_list_entry.rb