chef-zero 4.4.0 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef05ae4a7aef9de3c3a3da1ec5fbd5143a1a0457
-  data.tar.gz: 01e350ee9b6ff42d42550e8bafa07e1de7d1d629
+  metadata.gz: 6d28e6a6bda690839d80bd54dce06e9e4bf320fe
+  data.tar.gz: 1858dce1cfdb1a48af5104b29352937ac9fb6138
 SHA512:
-  metadata.gz: ac2bff1a5f4518d05262d3660ad96709ec60f495706bd0700d4084cdc1a6e14cca17a458a69067bf5da9a14024c7222a17e0bb8de2a582205d9ebe0acbd560e6
-  data.tar.gz: 727e1693591ff8b7e7c03c3fd9b0e57868429fe9c1286b8b59cb65850d54b8d90cf54e6bc2a9c4353c1f1cff5081e7853400be21ef50ac1cd98b0bc2ff63a1cb
+  metadata.gz: 47705c89adc13d890d9d2454ad3fb4c0d1d451f57a91a593d4c5a31c29b94f06026abc93dbf8a1e73f2931c592833f80e853d6e86cb8a3c22f6e0da13ed1b13c
+  data.tar.gz: 6ae3097039e28c17ceded5a7811b8179c33392c22650450936225e6c81c2af343aceafa75c662862f9565b9f9718d87bf126ac8e4b50124b4de96e761c040338

data/lib/chef_zero/rspec.rb

@@ -125,8 +125,8 @@ module ChefZero
         end
       end
 
-      def cookbook_artifact(name, data, &block)
-        before(chef_server_options[:server_scope]) { cookbook_artifact(name, data, &block) }
+      def cookbook_artifact(name, identifier, data = {}, &block)
+        before(chef_server_options[:server_scope]) { cookbook_artifact(name, identifier, data, &block) }
       end
 
       def data_bag(name, data, &block)
@@ -215,6 +215,8 @@ module ChefZero
 
       def cookbook(name, version, data = {}, options = {}, &block)
         with_object_path("cookbooks/#{name}") do
+          # If you didn't specify metadata.rb, we generate it for you. If you
+          # explicitly set it to nil, that means you don't want it at all.
           if data.has_key?('metadata.rb')
             if data['metadata.rb'].nil?
               data.delete('metadata.rb')
@@ -227,9 +229,18 @@ module ChefZero
         end
       end
 
-      def cookbook_artifact(name, identifier, data, &block)
+      def cookbook_artifact(name, identifier, data = {}, &block)
         with_object_path("cookbook_artifacts/#{name}") do
-          ChefZero::RSpec.server.load_data({ 'cookbook_artifact' => { name => { identifier => data } } }, current_org)
+          # If you didn't specify metadata.rb, we generate it for you. If you
+          # explicitly set it to nil, that means you don't want it at all.
+          if data.has_key?('metadata.rb')
+            if data['metadata.rb'].nil?
+              data.delete('metadata.rb')
+            end
+          else
+            data['metadata.rb'] = "name #{name.inspect}"
+          end
+          ChefZero::RSpec.server.load_data({ 'cookbook_artifacts' => { "#{name}-#{identifier}" => data } }, current_org)
           instance_eval(&block) if block_given?
         end
       end

data/lib/chef_zero/server.rb

@@ -473,20 +473,25 @@ module ChefZero
         end
       end
 
-      if contents['cookbooks']
-        contents['cookbooks'].each_pair do |name_version, cookbook|
-          if name_version =~ /(.+)-(\d+\.\d+\.\d+)$/
-            cookbook_data = ChefData::CookbookData.to_hash(cookbook, $1, $2)
-          else
-            cookbook_data = ChefData::CookbookData.to_hash(cookbook, name_version)
-          end
-          raise "No version specified" if !cookbook_data[:version]
-          data_store.create_dir(['organizations', org_name, 'cookbooks'], cookbook_data[:cookbook_name], :recursive)
-          data_store.set(['organizations', org_name, 'cookbooks', cookbook_data[:cookbook_name], cookbook_data[:version]], FFI_Yajl::Encoder.encode(cookbook_data, :pretty => true), :create)
-          cookbook_data.values.each do |files|
-            next unless files.is_a? Array
-            files.each do |file|
-              data_store.set(['organizations', org_name, 'file_store', 'checksums', file[:checksum]], get_file(cookbook, file[:path]), :create)
+      %w(cookbooks cookbook_artifacts).each do |cookbook_type|
+        if contents[cookbook_type]
+          contents[cookbook_type].each_pair do |name_version, cookbook|
+            if cookbook_type == 'cookbook_artifacts'
+              name, dash, identifier = name_version.rpartition('-')
+              cookbook_data = ChefData::CookbookData.to_hash(cookbook, name, identifier)
+            elsif name_version =~ /(.+)-(\d+\.\d+\.\d+)$/
+              cookbook_data = ChefData::CookbookData.to_hash(cookbook, $1, $2)
+            else
+              cookbook_data = ChefData::CookbookData.to_hash(cookbook, name_version)
+            end
+            raise "No version specified" if !cookbook_data[:version]
+            data_store.create_dir(['organizations', org_name, cookbook_type], cookbook_data[:cookbook_name], :recursive)
+            data_store.set(['organizations', org_name, cookbook_type, cookbook_data[:cookbook_name], cookbook_data[:version]], FFI_Yajl::Encoder.encode(cookbook_data, :pretty => true), :create)
+            cookbook_data.values.each do |files|
+              next unless files.is_a? Array
+              files.each do |file|
+                data_store.set(['organizations', org_name, 'file_store', 'checksums', file[:checksum]], get_file(cookbook, file[:path]), :create)
+              end
             end
           end
         end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.4.0'
+  VERSION = '4.4.1'
 end

data/spec/run_oc_pedant.rb

@@ -108,7 +108,10 @@ begin
 
     # Chef 12 features not yet 100% supported by Chef Zero
     '--skip-containers',
-    '--skip-api-v1'
+    '--skip-api-v1',
+
+    # The universe endpoint is unlikely to ever make sense for Chef Zero
+    '--skip-universe'
   ] + chef_fs_skips)
 
   fail_fast = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -309,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing