chef-zero 0.9.6 → 0.9.7

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -34,7 +34,7 @@ module ChefZero
 
         # Filter by environment constraints
         environment = JSON.parse(get_data(request, request.rest_path[0..1]), :create_additions => false)
-        environment_constraints = environment['cookbook_versions']
+        environment_constraints = environment['cookbook_versions'] || {}
 
         desired_versions.each_key do |name|
           desired_versions = filter_by_constraint(desired_versions, name, environment_constraints[name])
@@ -48,7 +48,8 @@ module ChefZero
 
         result = {}
         solved.each_pair do |name, versions|
-          result[name] = JSON.parse(data['cookbooks'][name][versions[0]], :create_additions => false)
+          cookbook = JSON.parse(data['cookbooks'][name][versions[0]], :create_additions => false)
+          result[name] = DataNormalizer.normalize_cookbook(cookbook, name, versions[0], request.base_uri, 'GET')
         end
         json_response(200, result)
       end
@@ -69,8 +70,10 @@ module ChefZero
 
           # Pick this cookbook, and add dependencies
           cookbook_obj = JSON.parse(cookbooks[solve_for][desired_version], :create_additions => false)
+          cookbook_metadata = cookbook_obj['metadata'] || {}
+          cookbook_dependencies = cookbook_metadata['dependencies'] || {}
           dep_not_found = false
-          cookbook_obj['metadata']['dependencies'].each_pair do |dep_name, dep_constraint|
+          cookbook_dependencies.each_pair do |dep_name, dep_constraint|
             # If the dep is not already in the list, add it to the list to solve
             # and bring in all environment-allowed cookbook versions to desired_versions
             if !new_desired_versions.has_key?(dep_name)

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
   prerelease: 
 platform: ruby
 authors: