knife-essentials 0.7.5 → 0.7.6

data/lib/chef_fs/file_system/cookbooks_dir.rb

@@ -26,7 +26,15 @@ module ChefFS
         # TODO this only works on the file system.  And it can't be broken into
         # pieces.
         begin
-          Chef::CookbookUploader.new(other_cookbook_version, other.parent.file_path).upload_cookbook
+          uploader = Chef::CookbookUploader.new(other_cookbook_version, other.parent.file_path)
+          # Chef 11 changes this API
+          if uploader.respond_to?(:upload_cookbook)
+            puts "upload_cookbook"
+            uploader.upload_cookbook
+          else
+            puts "upload_cookbooks"
+            uploader.upload_cookbooks
+          end
         rescue Net::HTTPServerException => e
           case e.response.code
           when "409"

data/lib/chef_fs/file_system/data_bag_dir.rb

@@ -27,6 +27,16 @@ module ChefFS
         @exists
       end
 
+      def create_child(name, file_contents)
+        json = Chef::JSONCompat.from_json(file_contents).to_hash
+        id = name[0,name.length-5]
+        if json.include?('id') && json['id'] != id
+          raise "ID in #{path_for_printing}/#{name} must be '#{id}' (is '#{json['id']}')"
+        end
+        rest.post_rest(api_path, json)
+        _make_child_entry(name, true)
+      end
+
       def _make_child_entry(name, exists = nil)
         DataBagItem.new(name, self, exists)
       end

data/lib/chef_fs/file_system/rest_list_dir.rb

@@ -36,13 +36,13 @@ module ChefFS
         end
       end
 
+      # NOTE if you change this significantly, you will likely need to change
+      # DataBagDir.create_child as well.
       def create_child(name, 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
           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
         rest.post_rest(api_path, json)
         _make_child_entry(name, true)

data/lib/chef_fs/version.rb

@@ -1,4 +1,4 @@
 module ChefFS
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-essentials
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000Z
+date: 2012-08-07 00:00:00.000000000Z
 dependencies: []
 description: Universal knife verbs that work with your Chef repository
 email: jkeiser@opscode.com