chef-zero 1.1.2 → 1.1.3

data/lib/chef_zero/data_normalizer.rb

@@ -69,17 +69,30 @@ module ChefZero
             end
           end
         end
+        cookbook['name'] ||= "#{name}-#{version}"
+        # TODO this feels wrong, but the real chef server doesn't expand this default
+  #      cookbook['version'] ||= version
+        cookbook['cookbook_name'] ||= name
+        cookbook['frozen?'] ||= false
+        cookbook['metadata'] ||= {}
+        cookbook['metadata']['version'] ||= version
+        # Sad to not be expanding defaults just because Chef doesn't :(
+#        cookbook['metadata']['name'] ||= name
+#        cookbook['metadata']['description'] ||= "A fabulous new cookbook"
+        cookbook['metadata']['long_description'] ||= ""
+#        cookbook['metadata']['maintainer'] ||= "YOUR_COMPANY_NAME"
+#        cookbook['metadata']['maintainer_email'] ||= "YOUR_EMAIL"
+#        cookbook['metadata']['license'] ||= "none"
+        cookbook['metadata']['dependencies'] ||= {}
+        cookbook['metadata']['attributes'] ||= {}
+        cookbook['metadata']['recipes'] ||= {}
       end
-      cookbook['name'] ||= "#{name}-#{version}"
-      # TODO this feels wrong, but the real chef server doesn't expand this default
-#      cookbook['version'] ||= version
-      cookbook['cookbook_name'] ||= name
       cookbook['json_class'] ||= 'Chef::CookbookVersion'
       cookbook['chef_type'] ||= 'cookbook_version'
-      cookbook['frozen?'] ||= false
-      cookbook['metadata'] ||= {}
-      cookbook['metadata']['version'] ||= version
-      cookbook['metadata']['name'] ||= name
+      if method == 'MIN'
+        cookbook['metadata'].delete('attributes')
+        cookbook['metadata'].delete('long_description')
+      end
       cookbook
     end
 

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -76,7 +76,7 @@ module ChefZero
             end
           end
         end
-        result
+        result.uniq
       end
 
       private

data/lib/chef_zero/endpoints/cookbooks_endpoint.rb

@@ -5,7 +5,14 @@ module ChefZero
     # /cookbooks
     class CookbooksEndpoint < CookbooksBase
       def get(request)
-        json_response(200, format_cookbooks_list(request, all_cookbooks_list))
+        if request.query_params['num_versions'] == 'all'
+          num_versions = nil
+        elsif request.query_params['num_versions']
+          num_versions = request.query_params['num_versions'].to_i
+        else
+          num_versions = 1
+        end
+        json_response(200, format_cookbooks_list(request, all_cookbooks_list, {}, num_versions))
       end
     end
   end

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -41,7 +41,7 @@ module ChefZero
         result = {}
         solved.each_pair do |name, versions|
           cookbook = JSON.parse(get_data(request, ['cookbooks', name, versions[0]]), :create_additions => false)
-          result[name] = DataNormalizer.normalize_cookbook(cookbook, name, versions[0], request.base_uri, 'GET')
+          result[name] = DataNormalizer.normalize_cookbook(cookbook, name, versions[0], request.base_uri, 'MIN')
         end
         json_response(200, result)
       end

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -1,4 +1,6 @@
 require 'chef_zero/rest_base'
+require 'chef_zero/rest_error_response'
+require 'json'
 
 module ChefZero
   module Endpoints
@@ -6,6 +8,11 @@ module ChefZero
     class SandboxEndpoint < RestBase
       def put(request)
         existing_sandbox = JSON.parse(get_data(request), :create_additions => false)
+        existing_sandbox['checksums'].each do |checksum|
+          if !exists_data?(request, ['file_store', 'checksums', checksum])
+            raise RestErrorResponse.new(503, "Checksum not uploaded: #{checksum}")
+          end
+        end
         delete_data(request)
         json_response(200, {
           :guid => request.rest_path[1],

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma