knife-essentials 0.5.3 → 0.5.4

data/lib/chef_fs/command_line.rb

@@ -124,8 +124,6 @@ module ChefFS
 
     def self.canonicalize_json(json_text)
       parsed_json = JSON.parse(json_text, :create_additions => false)
-      parsed_json.delete('requesting_actor_type')
-      parsed_json.delete('requesting_user')
       sorted_json = sort_keys(parsed_json)
       JSON.pretty_generate(sorted_json)
     end

data/lib/chef_fs/file_system/data_bag_dir.rb

@@ -1,5 +1,5 @@
-require 'chef_fs/file_system/base_fs_dir'
-require 'chef_fs/file_system/rest_list_entry'
+require 'chef_fs/file_system/rest_list_dir'
+require 'chef_fs/file_system/data_bag_item'
 require 'chef_fs/file_system/not_found_error'
 
 module ChefFS
@@ -25,6 +25,11 @@ module ChefFS
         end
         @exists
       end
+
+      def _make_child_entry(name, exists = nil)
+        DataBagItem.new(name, self, exists)
+      end
+
     end
   end
 end

data/lib/chef_fs/file_system/data_bag_item.rb

@@ -0,0 +1,39 @@
+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($!), "#{path_for_printing} not found"
+          else
+            raise
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef_fs/file_system/data_bags_dir.rb

@@ -14,7 +14,17 @@ module ChefFS
       end
 
       def children
-        @children ||= rest.get_rest(api_path).keys.map { |entry| DataBagDir.new(entry, self, true) }
+        begin
+          @children ||= rest.get_rest(api_path).keys.map do |entry|
+            DataBagDir.new(entry, self, true)
+          end
+        rescue Net::HTTPServerException
+          if $!.response.code == "404"
+            raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+          else
+            raise
+          end
+        end
       end
 
       def can_have_child?(name, is_dir)

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -14,7 +14,8 @@ module ChefFS
 
       def child(name)
         result = @children.select { |child| child.name == name }.first if @children
-        result ||= can_have_child?(name, false) ? RestListEntry.new(name, self) : NonexistentFSObject.new(name, self)
+        result ||= can_have_child?(name, false) ?
+                   _make_child_entry(name) : NonexistentFSObject.new(name, self)
       end
 
       def can_have_child?(name, is_dir)
@@ -23,7 +24,9 @@ module ChefFS
 
       def children
         begin
-          @children ||= rest.get_rest(api_path).keys.map { |key| RestListEntry.new("#{key}.json", self, true) }
+          @children ||= rest.get_rest(api_path).keys.map do |key|
+            _make_child_entry("#{key}.json", true)
+          end
         rescue Net::HTTPServerException
           if $!.response.code == "404"
             raise ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
@@ -42,7 +45,7 @@ module ChefFS
           raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['id']}')"
         end
         rest.post_rest(api_path, json)
-        RestListEntry.new(name, self, true)
+        _make_child_entry(name, true)
       end
 
       def environment
@@ -52,6 +55,11 @@ module ChefFS
       def rest
         parent.rest
       end
+
+      def _make_child_entry(name, exists = nil)
+        RestListEntry.new(name, self, exists)
+      end
+
     end
   end
 end

data/lib/chef_fs/file_system/rest_list_entry.rb

@@ -65,10 +65,8 @@ module ChefFS
       def write(file_contents)
         json = Chef::JSONCompat.from_json(file_contents).to_hash
         base_name = name[0,name.length-5]
-        if json.include?('name') && json['name'] != base_name
+        if json['name'] != base_name
           raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['name']}')"
-        elsif json.include?('id') && json['id'] != base_name
-          raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['id']}')"
         end
         begin
           rest.put_rest(api_path, json)

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000Z
+date: 2012-05-18 00:00:00.000000000Z
 dependencies: []
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com
@@ -41,6 +41,7 @@ files:
 - lib/chef_fs/file_system/cookbook_subdir.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/file_system_entry.rb
 - lib/chef_fs/file_system/file_system_root_dir.rb