Adding a display_manifest function

Author: adamhjk

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

@@ -45,7 +45,7 @@ def show
     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) }
+    cookbook.display_manifest { |opts| absolute_slice_url(:cookbook_segment, opts) }
     display cookbook
   end
 

chef/lib/chef/client.rb

@@ -347,7 +347,7 @@ def save_node
                 nil
               end
     end
-    
+
     # Compiles the full list of recipes for the server, and passes it to an instance of
     # Chef::Runner.converge.
     #

chef/lib/chef/cookbook.rb

@@ -313,6 +313,35 @@ def self.json_create(o)
       cookbook
     end
 
+    def display_manifest(&url_generation)
+      self.manifest ? self.manifest : self.generate_manifest
+      [ 'resources', 'providers', 'recipes', 'definitions', 'libraries', 'attributes', 'files', 'templates' ].each do |segment|
+        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"] }
+            set_specificity_arguments(segment_item["specificity"], url_options)
+            segment_item["uri"] = url_generation.call(url_options)
+          end
+        end
+      end
+      manifest
+    end
+
+    def set_specificity_arguments(specificity, url_options={})
+      case specificity
+      when "default"
+      when /^host-(.+)$/
+        url_options[:fqdn] = $1
+      when /^(.+)-(.+)$/
+        url_options[:platform] = $1
+        url_options[:version] = $2
+      when /^(.+)$/
+        url_options[:platform] = $1
+      end
+      url_options
+    end
+
     def generate_manifest(&url_generation)
       response = {
         :recipes => Array.new,
@@ -324,6 +353,7 @@ def generate_manifest(&url_generation)
         :resources => Array.new,
         :providers => Array.new
       }
+
       [ :resources, :providers, :recipes, :definitions, :libraries, :attributes, :files, :templates ].each do |segment|
         segment_files(segment).each do |sf|
           next if File.directory?(sf)
@@ -342,18 +372,7 @@ def generate_manifest(&url_generation)
             specificity = mo[1]
             file_name = mo[2]
             url_options = { :cookbook_id => name.to_s, :segment => segment, :id => file_name }
-
-            case specificity
-            when "default"
-            when /^host-(.+)$/
-              url_options[:fqdn] = $1
-            when /^(.+)-(.+)$/
-              url_options[:platform] = $1
-              url_options[:version] = $2
-            when /^(.+)$/
-              url_options[:platform] = $1
-            end
-
+            set_specificity_arguments(specificity, url_options)
             file_specificity = specificity
           else
             mo = sf.match("cookbooks/#{name}/#{segment}/(.+)")
@@ -375,6 +394,7 @@ def generate_manifest(&url_generation)
             :checksum => checksum(sf)
           }
           rs[:specificity] = file_specificity if file_specificity
+
           response[segment] << rs 
         end
       end

chef/lib/chef/knife/cookbook_upload.rb

@@ -55,6 +55,7 @@ def run
         else
           @name_args.each do |cookbook_name|
             cl[cookbook_name].generate_manifest
+            puts JSON.pretty_generate(cl[cookbook_name])
             Chef::Log.info("Saving #{cookbook_name} version #{cl[cookbook_name].version}")
             cl[cookbook_name].save
           end