knife-essentials 1.0.0.beta2 → 1.0.0.beta3

data/lib/chef_fs/data_handler/data_bag_item_data_handler.rb

@@ -18,6 +18,16 @@ module ChefFS
         })
       end
 
+      def normalize_for_put(data_bag_item, entry)
+        {
+          "name" => "data_bag_item_#{entry.parent.name}_#{entry.name}",
+          "json_class" => "Chef::DataBagItem",
+          "chef_type" => "data_bag_item",
+          "data_bag" => entry.parent.name,
+          "raw_data" => normalize(data_bag_item)
+        }
+      end
+
       def preserve_key(key)
         return key == 'id'
       end

data/lib/chef_fs/file_system/chef_server_root_dir.rb

@@ -19,6 +19,7 @@
 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'
@@ -85,7 +86,7 @@ module ChefFS
             result += [
               AclsDir.new(self),
               RestListDir.new("clients", self, nil, ChefFS::DataHandler::ClientDataHandler.new),
-              RestListDir.new("containers", self, nil, ChefFS::DataHandler::ContainerDataHandler.new),
+              ContainersDir.new(self),
               RestListDir.new("groups", self, nil, ChefFS::DataHandler::GroupDataHandler.new),
               NodesDir.new(self)
             ]

data/lib/chef_fs/file_system/containers_dir.rb

@@ -0,0 +1,33 @@
+#
+# 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

data/lib/chef_fs/file_system/data_bag_dir.rb

@@ -17,7 +17,6 @@
 #
 
 require 'chef_fs/file_system/rest_list_dir'
-require 'chef_fs/file_system/data_bag_item'
 require 'chef_fs/file_system/not_found_error'
 require 'chef_fs/file_system/must_delete_recursively_error'
 require 'chef_fs/data_handler/data_bag_item_data_handler'
@@ -50,10 +49,6 @@ module ChefFS
         'id'
       end
 
-      def _make_child_entry(name, exists = nil)
-        DataBagItem.new(name, self, exists)
-      end
-
       def delete(recurse)
         if !recurse
           raise NotFoundError.new(self) if !exists?

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -141,6 +141,10 @@ 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
@@ -153,8 +157,8 @@ module ChefFS
           object = data_handler.normalize_for_put(object, self)
         end
 
-        base_name = name[0,name.length-5]
-        if object['name'] != base_name
+        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']}')"
         end
 

data/lib/chef_fs/knife.rb

@@ -73,7 +73,7 @@ module ChefFS
 
       # Default to getting *everything* from the server.
       if !Chef::Config[:repo_mode]
-        if Chef::Config[:chef_server_url] =~ /^[^\/]+\/+organizations\//
+        if Chef::Config[:chef_server_url] =~ /\/+organizations\/.+/
           Chef::Config[:repo_mode] = 'hosted_everything'
         else
           Chef::Config[:repo_mode] = 'everything'

data/lib/chef_fs/parallelizer.rb

@@ -93,7 +93,7 @@ module ChefFS
         begin
           @outputs[index] = @block.call(input)
           @status[index] = :finished
-        rescue
+        rescue Exception
           @outputs[index] = $!
           @status[index] = :exception
         end

data/lib/chef_fs/version.rb

@@ -1,3 +1,3 @@
 module ChefFS
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.0.0.beta3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-zero
@@ -87,13 +87,13 @@ 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
 - lib/chef_fs/file_system/cookbooks_acl_dir.rb
 - lib/chef_fs/file_system/cookbooks_dir.rb
 - lib/chef_fs/file_system/data_bag_dir.rb
-- lib/chef_fs/file_system/data_bag_item.rb
 - lib/chef_fs/file_system/data_bags_dir.rb
 - lib/chef_fs/file_system/default_environment_cannot_be_modified_error.rb
 - lib/chef_fs/file_system/environments_dir.rb

data/lib/chef_fs/file_system/data_bag_item.rb

@@ -1,63 +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 DataBagItem < RestListEntry
-      def initialize(name, parent, exists = nil)
-        super(name, parent, exists)
-      end
-
-      def write(file_contents)
-        # Write is just a little tiny bit different for data bags:
-        # you set raw_data in the JSON instead of putting the items
-        # in the top level.
-        json = Chef::JSONCompat.from_json(file_contents).to_hash
-        id = name[0,name.length-5]  # Strip off the .json from the end
-        if json['id'] != id
-          raise "Id in #{path_for_printing}/#{name} must be '#{id}' (is '#{json['id']}')"
-        end
-        begin
-          data_bag = parent.name
-          json = {
-            "name" => "data_bag_item_#{data_bag}_#{id}",
-            "json_class" => "Chef::DataBagItem",
-            "chef_type" => "data_bag_item",
-            "data_bag" => data_bag,
-            "raw_data" => json
-          }
-          rest.put_rest(api_path, json)
-        rescue Net::HTTPServerException
-          if $!.response.code == "404"
-            raise ChefFS::FileSystem::NotFoundError.new(self, $!)
-          else
-            raise
-          end
-        end
-      end
-
-      def normalize_value(value)
-        data_handler.minimize(
-          data_handler.normalize(value, parent.name, api_child_name),
-          parent.name, api_child_name)
-      end
-    end
-  end
-end