chef-zero 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3698741be5962418f4c8608b65e0d81016b83ee
-  data.tar.gz: 358bd5cbef06d93ce4cd7e493aaa5e3761d522d7
+  metadata.gz: adbe4fdeea51156a8ca4c962db7d52502377726f
+  data.tar.gz: c62f0e6611983ea46a3c65f4c8afd608fa44da48
 SHA512:
-  metadata.gz: 8ea5173c1be35f69f3b38b46a119f9fe70117d6bfc9b74acca1912c13b40a6ad033caf1b0523326a078ff427553f8b6cf829badc3dee45e83990feca8186e116
-  data.tar.gz: 4fbb4286251ab707f427fce4b0c42e792c7182b0c61aa0fc7f6976aa7637a38eb036c282dd41b58560dc6c1b16a511287eb775e90482a66643f07a757c203e0b
+  metadata.gz: 1f29a803c8a6692e7a9a868d76d9391776812fbb31fc2ff0d0779918b61c9108f7be26f3fecae2b636e9c6da61d906baa55b4654fefdb28f52544a4db6cd7084
+  data.tar.gz: 84d70a227925b452a248c3d2c76456957c89bbdebf7483753a5671e96aebf1a0be24862d5fe5faf16420fb98edc8fd76b29d92af11838215ef79ce1da7ab4025

data/lib/chef_zero/rspec.rb

@@ -137,12 +137,21 @@ module ChefZero
           end
         end
 
-        def self.cookbook(name, version, data, options = {}, &block)
-          before(:each) { cookbook(name, version, data, &block) }
+        def self.cookbook(name, version, data = {}, options = {}, &block)
+          before(:each) do
+            cookbook(name, version, data, &block)
+          end
         end
 
-        def cookbook(name, version, data, options = {}, &block)
+        def cookbook(name, version, data = {}, options = {}, &block)
           with_object_path("cookbooks/#{name}") do
+            if data.has_key?('metadata.rb')
+              if data['metadata.rb'].nil?
+                data.delete('metadata.rb')
+              end
+            else
+              data['metadata.rb'] = "name #{name.inspect}; version #{version.inspect}"
+            end
             ChefZero::RSpec.server.load_data({ 'cookbooks' => { "#{name}-#{version}" => data.merge(options) }}, current_org)
             instance_eval(&block) if block_given?
           end

data/lib/chef_zero/server.rb

@@ -486,8 +486,10 @@ module ChefZero
           [ "/organizations/*/containers/*", ContainerEndpoint.new(self) ],
           [ "/organizations/*/groups", GroupsEndpoint.new(self) ],
           [ "/organizations/*/groups/*", GroupEndpoint.new(self) ],
+          [ "/organizations/*/organization/_acl", AclsEndpoint.new(self) ],
           [ "/organizations/*/organizations/_acl", AclsEndpoint.new(self) ],
           [ "/organizations/*/*/*/_acl", AclsEndpoint.new(self) ],
+          [ "/organizations/*/organization/_acl/*", AclEndpoint.new(self) ],
           [ "/organizations/*/organizations/_acl/*", AclEndpoint.new(self) ],
           [ "/organizations/*/*/*/_acl/*", AclEndpoint.new(self) ]
         ]

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - John Keiser