REST methods added, knife show/delete complete

Author: adamhjk

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

@@ -31,12 +31,13 @@ class Cookbooks < Application
   include Merb::TarballHelper
 
   def index
-    cl = Chef::CookbookLoader.new
-    cookbook_list = Hash.new
-    cl.each do |cookbook|
-      cookbook_list[cookbook.name] = absolute_url(:cookbook, :id => cookbook.name.to_s) 
+    cookbook_list = Chef::Cookbook.cdb_list
+    response = Hash.new
+    cookbook_list.each do |cookbook_name|
+      cookbook_name =~ /^(.+)-(\d+\.\d+\.\d+)$/
+      response[$1] = absolute_slice_url(:cookbook, :id => $1)
     end
-    display cookbook_list 
+    display response 
   end
 
   def show
@@ -51,14 +52,13 @@ def show
 
   def show_versions
     begin
-      cookbook = Chef::Cookbook.cdb_load(params[:id], params[:version])
+      cookbook_versions = Chef::Cookbook.cdb_by_version(params[:id])
     rescue ArgumentError => e
-      raise NotFound, "Cannot find a cookbook named #{params[:id]} with version #{params[:version]}"
+      raise NotFound, "Cannot find a cookbook named #{params[:id]}"
     rescue Chef::Exceptions::CouchDBNotFound => e
-      raise NotFound, "Cannot find a cookbook named #{params[:id]} with version #{params[:version]}"
+      raise NotFound, "Cannot find a cookbook named #{params[:id]}"
     end
-    cookbook.generate_manifest { |opts| absolute_slice_url(:cookbook_segment, opts) }
-    display cookbook
+    display cookbook_versions
   end
 
   def show_segment
@@ -157,40 +157,6 @@ def serve_segment_file(cookbook, segment, files)
     end
   end
 
-  def create
-    # validate name and file parameters and throw an error if a cookbook with the same name already exists
-    raise BadRequest, "missing required parameter: name" unless params[:name]
-    desired_name = params[:name]
-    raise BadRequest, "invalid parameter: name must be at least one character long and contain only letters, numbers, periods (.), underscores (_), and hyphens (-)" unless desired_name =~ /\A[\w.-]+\Z/
-    begin
-      validate_file_parameter(desired_name, params[:file])
-    rescue FileParameterException => te
-      raise BadRequest, te.message
-    end
-    
-    begin
-      Chef::CookbookLoader.new[desired_name]
-      raise BadRequest, "Cookbook with the name #{desired_name} already exists"
-    rescue ArgumentError
-    end
-    
-    expand_tarball_and_put_in_repository(desired_name, params[:file][:tempfile])
-    
-    # construct successful response
-    self.status = 201
-    location = absolute_url(:cookbook, :id => desired_name)
-    headers['Location'] = location
-    result = { 'uri' => location }
-    display result
-  end
-  
-  def get_tarball
-    cookbook_name = params[:cookbook_id]
-    expected_location = cookbook_location(cookbook_name)
-    raise NotFound, "Cannot find cookbook named #{cookbook_name} at #{expected_location}. Note: Tarball generation only applies to cookbooks under the first directory in the server's Chef::Config.cookbook_path variable and does to apply overrides." unless File.directory? expected_location
-    send_file(get_or_create_cookbook_tarball_location(cookbook_name))
-  end
-  
   def update
     cookbook_name = params[:id]
     cookbook_version = params[:version]

chef/lib/chef/cookbook.rb

@@ -35,7 +35,7 @@ class Cookbook
     attr_reader :recipe_files, :attribute_files, :couchdb_id
 
     DESIGN_DOCUMENT = {
-      "version" => 1,
+      "version" => 5,
       "language" => "javascript",
       "views" => {
         "all" => {
@@ -56,11 +56,20 @@ class Cookbook
           }
           EOJS
         },
+        "all_with_version" => {
+          "map" => <<-EOJS
+          function(doc) { 
+            if (doc.chef_type == "cookbook") {
+              emit(doc.cookbook_name, doc.version);
+            }
+          }
+          EOJS
+        },
         "all_latest_version" => {
           "map" => %q@
           function(doc) { 
             if (doc.chef_type == "cookbook") {
-              emit(doc.cookbook_name, [doc.cookbook_name, doc.version]);
+              emit(doc.cookbook_name, doc.version);
             }
           }
           @,
@@ -128,11 +137,12 @@ def initialize(name, couchdb=nil)
     end
 
     def version
-      @metadata['version']
+      @metadata.version
     end
 
     def version=(new_version)
-      @metadata['version'] = new_version
+      @manifest["version"] = new_version
+      @metadata.version(new_version)
     end
 
     def full_name
@@ -309,7 +319,6 @@ def self.json_create(o)
       cookbook.manifest = o
       # 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
 
@@ -319,7 +328,7 @@ def display_manifest(&url_generation)
         if manifest.has_key?(segment)
           manifest[segment].each do |segment_item|
             puts segment_item.inspect
-            url_options = { :cookbook_id => name.to_s, :segment => segment, :id => segment_item["name"] }
+            url_options = { :cookbook_id => name.to_s, :segment => segment, :id => segment_item["name"], :cookbook_version => version }
             set_specificity_arguments(segment_item["specificity"], url_options)
             segment_item["uri"] = url_generation.call(url_options)
           end
@@ -371,7 +380,7 @@ def generate_manifest(&url_generation)
             end
             specificity = mo[1]
             file_name = mo[2]
-            url_options = { :cookbook_id => name.to_s, :segment => segment, :id => file_name }
+            url_options = { :cookbook_id => name.to_s, :segment => segment, :id => file_name, :cookbook_version => version }
             set_specificity_arguments(specificity, url_options)
             file_specificity = specificity
           else
@@ -400,7 +409,7 @@ def generate_manifest(&url_generation)
       end
       response[:cookbook_name] = name.to_s
       response[:metadata] = metadata 
-      response[:version] = metadata['version']
+      response[:version] = metadata.version
       response[:name] = full_name 
       @manifest = response
     end
@@ -416,15 +425,32 @@ def self.chef_server_rest
       Chef::REST.new(Chef::Config[:chef_server_url])
     end
 
-    # Save this cookbook via the REST API
     def save
       chef_server_rest.put_rest("cookbooks/#{@name}/#{version}", self)
       self
     end
+    alias :create :save
+
+    def destroy
+      chef_server_rest.delete_rest("cookbooks/#{@name}/#{version}")
+      self
+    end
+
+    def self.load(name, version="_latest")
+      version = "_latest" if version == "latest"
+      Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("cookbooks/#{name}/#{version}")
+    end
 
     ##
     # Couchdb
     ##
+    
+    def self.cdb_by_version(cookbook_name=nil, couchdb=nil)
+      cdb = couchdb || Chef::CouchDB.new
+      options = cookbook_name ? { :startkey => cookbook_name, :endkey => cookbook_name } : {}
+      rs = cdb.get_view("cookbooks", "all_with_version", options)
+      rs["rows"].inject({}) { |memo, row| memo.has_key?(row["key"]) ? memo[row["key"]] << row["value"] : memo[row["key"]] = [ row["value"] ]; memo }
+    end
 
     def self.create_design_document(couchdb=nil)
       (couchdb || Chef::CouchDB.new).create_design_document("cookbooks", DESIGN_DOCUMENT)
@@ -437,8 +463,13 @@ def self.cdb_list(inflate=false, couchdb=nil)
     end
 
     def self.cdb_load(name, version='latest', couchdb=nil)
-      # Probably want to look for a view here at some point
-      (couchdb || Chef::CouchDB.new).load("cookbook", "#{name}-#{version}")
+      cdb = couchdb || Chef::CouchDB.new
+      if version == "latest" || version == "_latest"
+        rs = cdb.get_view("cookbooks", "all_latest_version", :key => name, :descending => true, :group => true, :reduce => true)["rows"].first
+        cdb.load("cookbook", "#{rs["key"]}-#{rs["value"]}")
+      else
+        cdb.load("cookbook", "#{name}-#{version}")
+      end
     end
 
     def cdb_destroy

chef/lib/chef/knife/cookbook_show.rb

@@ -44,15 +44,16 @@ class CookbookShow < Knife
       def run 
         case @name_args.length
         when 4 # We are showing a specific file
-          arguments = { :id => @name_args[2] } 
+          arguments = { :id => @name_args[3] } 
           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)}")
+          result = rest.get_rest("cookbooks/#{@name_args[0]}/#{@name_args[1]}/#{@name_args[2]}?#{make_query_params(arguments)}")
           pretty_print(result)
         when 3 # We are showing a specific part of the cookbook
-          result = rest.get_rest("cookbooks/#{@name_args[0]}")
-          output(result[@name_args[1]])
+          cookbook_version = @name_args[1] == 'latest' ? '_latest' : @name_args[1]
+          result = rest.get_rest("cookbooks/#{@name_args[0]}/#{cookbook_version}")
+          output(result.manifest[@name_args[2]])
         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}"))