Adding delete support for cookboooks

Author: Adam Jacob

chef-server-api/app/controllers/cookbooks.rb

@@ -40,6 +40,16 @@ def index
   end
 
   def show
+    begin
+      cookbook = Chef::Cookbook.cdb_load(params[:id], params[:version])
+    rescue Chef::Exceptions::CouchDBNotFound => e
+      raise NotFound, "Cannot find a cookbook named #{params[:id]} with version #{params[:version]}"
+    end
+    cookbook.generate_manifest { |opts| absolute_slice_url(:cookbook_segment, opts) }
+    display cookbook
+  end
+
+  def show_versions
     begin
       cookbook = Chef::Cookbook.cdb_load(params[:id], params[:version])
     rescue ArgumentError => e
@@ -211,14 +221,13 @@ def update
   end
 
   def destroy
-    cookbook_name = params[:id]
-    cookbook_path = cookbook_location(cookbook_name)
-    raise NotFound, "Cannot find cookbook named #{cookbook_name}" unless File.directory? cookbook_path
-
-    FileUtils.rm_rf(cookbook_path)
-    FileUtils.rm_f(cookbook_tarball_location(cookbook_name))
+    begin
+      cookbook = Chef::Cookbook.cdb_load(params[:id], params[:version])
+    rescue ArgumentError => e
+      raise NotFound, "Cannot find a cookbook named #{params[:id]} with version #{params[:version]}"
+    end
 
-    display Hash.new
+    display cookbook.cdb_destroy
   end
 
 end

chef/lib/chef/cookbook.rb

@@ -307,7 +307,8 @@ def self.json_create(o)
         o.delete("_id")
       end
       cookbook.manifest = o
-      cookbook.metadata = o["metadata"]
+      # We want the Chef::Cookbook::Metadata object to always be inflated
+      cookbook.metadata = Chef::Cookbook::Metadata.from_hash(o["metadata"])
       cookbook.version = o["version"]
       cookbook
     end

chef/lib/chef/knife/cookbook_delete.rb

@@ -22,11 +22,11 @@ class Chef
   class Knife
     class CookbookDelete < Knife
 
-      banner "Sub-Command: cookbook delete COOKBOOK (options)"
+      banner "Sub-Command: cookbook delete COOKBOOK VERSION (options)"
 
-      def run 
-        delete_object(Chef::Cookbook, @name_args[0], "cookbook") do
-          rest.delete_rest("cookbooks/#{@name_args[0]}")
+      def run
+        delete_object(Chef::Cookbook, "#{@name_args[0]} #{@name_args[1]}", "cookbook") do
+          rest.delete_rest("cookbooks/#{@name_args[0]}/#{@name_args[1]}")
         end
       end
 

chef/lib/chef/knife/cookbook_show.rb

@@ -24,7 +24,7 @@ class Chef
   class Knife
     class CookbookShow < Knife
 
-      banner "Sub-Command: cookbook show COOKBOOK [PART] [FILENAME] (options)"
+      banner "Sub-Command: cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"
 
       option :fqdn,
        :short => "-f FQDN",
@@ -43,17 +43,20 @@ class CookbookShow < Knife
 
       def run 
         case @name_args.length
-        when 3 # We are showing a specific file
+        when 4 # We are showing a specific file
           arguments = { :id => @name_args[2] } 
           arguments[:fqdn] = config[:fqdn] if config.has_key?(:fqdn)
           arguments[:platform] = config[:platform] if config.has_key?(:platform)
           arguments[:version] = config[:platform_version] if config.has_key?(:platform_version)
           result = rest.get_rest("cookbooks/#{@name_args[0]}/#{@name_args[1]}?#{make_query_params(arguments)}")
           pretty_print(result)
-        when 2 # We are showing a specific part of the cookbook
+        when 3 # We are showing a specific part of the cookbook
           result = rest.get_rest("cookbooks/#{@name_args[0]}")
           output(result[@name_args[1]])
-        when 1 # We are showing the whole cookbook data
+        when 2 # We are showing the whole cookbook data
+          cookbook_version = @name_args[1] == 'latest' ? '_latest' : @name_args[1]
+          output(rest.get_rest("cookbooks/#{@name_args[0]}/#{cookbook_version}"))
+        when 1 # We are showing the cookbook versions 
           output(rest.get_rest("cookbooks/#{@name_args[0]}"))
         end
       end