knife-essentials 1.0.0.beta4 → 1.0.0.beta5

data/lib/chef/knife/deps_essentials.rb

@@ -73,7 +73,7 @@ class Chef
       def get_dependencies(entry)
         begin
           if entry.parent && entry.parent.path == '/cookbooks'
-            return entry.chef_object.metadata.dependencies.keys.map { |cookbook| "/cookbooks/#{cookbook}"}
+            return entry.chef_object.metadata.dependencies.keys.map { |cookbook| "/cookbooks/#{cookbook}" }
 
           elsif entry.parent && entry.parent.path == '/nodes'
             node = JSON.parse(entry.read, :create_additions => false)

data/lib/chef_fs/data_handler/container_data_handler.rb

@@ -3,8 +3,8 @@ require 'chef_fs/data_handler/data_handler_base'
 module ChefFS
   module DataHandler
     class ContainerDataHandler < DataHandlerBase
-      def normalize(user, entry)
-        super(user, {
+      def normalize(container, entry)
+        super(container, {
           'containername' => remove_dot_json(entry.name),
           'containerpath' => remove_dot_json(entry.name)
         })
@@ -14,6 +14,13 @@ module ChefFS
         return key == 'containername'
       end
 
+      def verify_integrity(object, entry, &on_error)
+        base_name = remove_dot_json(entry.name)
+        if object['containername'] != base_name
+          on_error.call("Name in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['name']}')")
+        end
+      end
+
       # There is no chef_class for users, nor does to_ruby work.
     end
   end

data/lib/chef_fs/data_handler/data_bag_item_data_handler.rb

@@ -18,16 +18,20 @@ module ChefFS
         })
       end
 
-      def normalize_for_put(data_bag_item, entry)
+      def normalize_for_post(data_bag_item, entry)
         {
-          "name" => "data_bag_item_#{entry.parent.name}_#{entry.name}",
+          "name" => "data_bag_item_#{entry.parent.name}_#{remove_dot_json(entry.name)}",
           "json_class" => "Chef::DataBagItem",
           "chef_type" => "data_bag_item",
           "data_bag" => entry.parent.name,
-          "raw_data" => normalize(data_bag_item)
+          "raw_data" => normalize(data_bag_item, entry)
         }
       end
 
+      def normalize_for_put(data_bag_item, entry)
+        normalize_for_post(data_bag_item, entry)
+      end
+
       def preserve_key(key)
         return key == 'id'
       end
@@ -36,6 +40,13 @@ module ChefFS
         Chef::DataBagItem
       end
 
+      def verify_integrity(object, entry, &on_error)
+        base_name = remove_dot_json(entry.name)
+        if object['raw_data']['id'] != base_name
+          on_error.call("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['raw_data']['id']}')")
+        end
+      end
+
       # Data bags do not support .rb files (or if they do, it's undocumented)
     end
   end

data/lib/chef_fs/data_handler/data_handler_base.rb

@@ -38,6 +38,10 @@ module ChefFS
         result
       end
 
+      def normalize_for_post(object, entry)
+        normalize(object, entry)
+      end
+
       def normalize_for_put(object, entry)
         normalize(object, entry)
       end
@@ -110,6 +114,13 @@ module ChefFS
         result
       end
 
+      def verify_integrity(object, entry, &on_error)
+        base_name = remove_dot_json(entry.name)
+        if object['name'] != base_name
+          on_error.call("Name must be '#{base_name}' (is '#{object['name']}')")
+        end
+      end
+
     end # class DataHandlerBase
   end
 end

data/lib/chef_fs/file_system/chef_server_root_dir.rb

@@ -19,7 +19,6 @@
 require 'chef_fs/file_system/acls_dir'
 require 'chef_fs/file_system/base_fs_dir'
 require 'chef_fs/file_system/rest_list_dir'
-require 'chef_fs/file_system/containers_dir'
 require 'chef_fs/file_system/cookbooks_dir'
 require 'chef_fs/file_system/data_bags_dir'
 require 'chef_fs/file_system/nodes_dir'
@@ -86,7 +85,7 @@ module ChefFS
             result += [
               AclsDir.new(self),
               RestListDir.new("clients", self, nil, ChefFS::DataHandler::ClientDataHandler.new),
-              ContainersDir.new(self),
+              RestListDir.new("containers", self, nil, ChefFS::DataHandler::ContainerDataHandler.new),
               RestListDir.new("groups", self, nil, ChefFS::DataHandler::GroupDataHandler.new),
               NodesDir.new(self)
             ]

data/lib/chef_fs/file_system/data_bag_dir.rb

@@ -45,10 +45,6 @@ module ChefFS
         @exists
       end
 
-      def identity_key
-        'id'
-      end
-
       def delete(recurse)
         if !recurse
           raise NotFoundError.new(self) if !exists?

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -56,10 +56,6 @@ module ChefFS
         end
       end
 
-      def identity_key
-        'name'
-      end
-
       def create_child(name, file_contents)
         begin
           object = JSON.parse(file_contents, :create_additions => false)
@@ -70,12 +66,10 @@ module ChefFS
         result = _make_child_entry(name, true)
 
         if data_handler
-          object = data_handler.normalize(object, result)
-        end
-
-        base_name = name[0,name.length-5]
-        if object[identity_key] != base_name
-          raise ChefFS::FileSystem::OperationFailedError.new(:create_child, self), "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{object[identity_key]}')"
+          object = data_handler.normalize_for_post(object, result)
+          data_handler.verify_integrity(object, result) do |error|
+            raise ChefFS::FileSystem::OperationFailedError.new(:create_child, self), "Error creating '#{name}': #{error}"
+          end
         end
 
         begin

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -141,10 +141,6 @@ module ChefFS
         parent.rest
       end
 
-      def identity_key
-        parent.identity_key
-      end
-
       def write(file_contents)
         begin
           #object = Chef::JSONCompat.from_json(file_contents).to_hash
@@ -155,11 +151,9 @@ module ChefFS
 
         if data_handler
           object = data_handler.normalize_for_put(object, self)
-        end
-
-        base_name = name[0,name.length-5] # Strip ".json"
-        if object[identity_key] != base_name
-          raise ChefFS::FileSystem::OperationFailedError.new(:write, self), "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{object['name']}')"
+          data_handler.verify_integrity(object, self) do |error|
+            raise ChefFS::FileSystem::OperationFailedError.new(:write, self), "#{error}"
+          end
         end
 
         begin

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.0.0.beta4"
+  VERSION = "1.0.0.beta5"
 end

data/spec/integration/deps_spec.rb

@@ -396,7 +396,7 @@ EOM
     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' => '' } }
-      it 'knife deps reports just the cookbook' do
+      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

data/spec/integration/download_spec.rb

@@ -192,7 +192,7 @@ EOM
         end
 
         it 'knife download --no-diff creates the extra files' do
-          knife('download /').should_succeed <<EOM
+          knife('download --no-diff /').should_succeed <<EOM
 Created /clients
 Created /clients/chef-validator.json
 Created /clients/chef-webui.json

data/spec/integration/upload_spec.rb

@@ -91,7 +91,7 @@ EOM
             knife('diff --name-status /').should_succeed ''
           end
           it 'knife upload --no-diff does not change the role' do
-            knife('upload /').should_succeed ''
+            knife('upload --no-diff /').should_succeed ''
             knife('diff --name-status /').should_succeed "M\t/roles/x.json\n"
           end
         end
@@ -148,7 +148,7 @@ EOM
           end
 
           it 'knife upload --no-diff adds the new files' do
-            knife('upload /').should_succeed <<EOM
+            knife('upload --no-diff /').should_succeed <<EOM
 Created /clients/y.json
 Updated /cookbooks/x
 Created /cookbooks/y
@@ -451,7 +451,7 @@ EOM
       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('upload /environments/x.json').should_fail "ERROR: /environments/x.json failed to write: Name must be 'x' (is 'y')\n"
           knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n"
         end
       end
@@ -477,7 +477,7 @@ EOM
       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('upload /environments/x.json').should_fail "ERROR: /environments failed to create_child: Error creating 'x.json': Name must be 'x' (is 'y')\n"
           knife('diff --name-status /environments/x.json').should_succeed "A\t/environments/x.json\n"
         end
       end
@@ -930,7 +930,7 @@ EOM
       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('upload /environments/x.json').should_fail "ERROR: /environments/x.json failed to write: Name must be 'x' (is 'y')\n"
           knife('diff --name-status /environments/x.json').should_succeed "M\t/environments/x.json\n"
         end
       end
@@ -956,7 +956,7 @@ EOM
       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('upload /environments/x.json').should_fail "ERROR: /environments failed to create_child: Error creating 'x.json': Name must be 'x' (is 'y')\n"
           knife('diff --name-status /environments/x.json').should_succeed "A\t/environments/x.json\n"
         end
       end

data/spec/support/integration_helper.rb

@@ -19,8 +19,8 @@
 
 require 'tmpdir'
 require 'fileutils'
-require 'chef_zero/rspec'
 require 'chef/config'
+require 'chef_zero/rspec'
 require 'json'
 require 'support/knife_support'
 require 'support/spec_helper'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
   prerelease: 6
 platform: ruby
 authors:
@@ -87,7 +87,6 @@ files:
 - lib/chef_fs/file_system/chef_repository_file_system_entry.rb
 - lib/chef_fs/file_system/chef_repository_file_system_root_dir.rb
 - lib/chef_fs/file_system/chef_server_root_dir.rb
-- lib/chef_fs/file_system/containers_dir.rb
 - lib/chef_fs/file_system/cookbook_dir.rb
 - lib/chef_fs/file_system/cookbook_file.rb
 - lib/chef_fs/file_system/cookbook_subdir.rb

data/lib/chef_fs/file_system/containers_dir.rb

@@ -1,33 +0,0 @@
-#
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require 'chef_fs/file_system/rest_list_entry'
-
-module ChefFS
-  module FileSystem
-    class ContainersDir < RestListDir
-      def initialize(parent)
-        super("containers", parent, nil, ChefFS::DataHandler::ContainerDataHandler.new)
-      end
-
-      def identity_key
-        'containername'
-      end
-    end
-  end
-end