chef-zero 3.1.1 → 3.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/chef_zero/rspec.rb +12 -3
- data/lib/chef_zero/server.rb +2 -0
- data/lib/chef_zero/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: adbe4fdeea51156a8ca4c962db7d52502377726f
|
|
4
|
+
data.tar.gz: c62f0e6611983ea46a3c65f4c8afd608fa44da48
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1f29a803c8a6692e7a9a868d76d9391776812fbb31fc2ff0d0779918b61c9108f7be26f3fecae2b636e9c6da61d906baa55b4654fefdb28f52544a4db6cd7084
|
|
7
|
+
data.tar.gz: 84d70a227925b452a248c3d2c76456957c89bbdebf7483753a5671e96aebf1a0be24862d5fe5faf16420fb98edc8fd76b29d92af11838215ef79ce1da7ab4025
|
data/lib/chef_zero/rspec.rb
CHANGED
|
@@ -137,12 +137,21 @@ module ChefZero
|
|
|
137
137
|
end
|
|
138
138
|
end
|
|
139
139
|
|
|
140
|
-
def self.cookbook(name, version, data, options = {}, &block)
|
|
141
|
-
before(:each)
|
|
140
|
+
def self.cookbook(name, version, data = {}, options = {}, &block)
|
|
141
|
+
before(:each) do
|
|
142
|
+
cookbook(name, version, data, &block)
|
|
143
|
+
end
|
|
142
144
|
end
|
|
143
145
|
|
|
144
|
-
def cookbook(name, version, data, options = {}, &block)
|
|
146
|
+
def cookbook(name, version, data = {}, options = {}, &block)
|
|
145
147
|
with_object_path("cookbooks/#{name}") do
|
|
148
|
+
if data.has_key?('metadata.rb')
|
|
149
|
+
if data['metadata.rb'].nil?
|
|
150
|
+
data.delete('metadata.rb')
|
|
151
|
+
end
|
|
152
|
+
else
|
|
153
|
+
data['metadata.rb'] = "name #{name.inspect}; version #{version.inspect}"
|
|
154
|
+
end
|
|
146
155
|
ChefZero::RSpec.server.load_data({ 'cookbooks' => { "#{name}-#{version}" => data.merge(options) }}, current_org)
|
|
147
156
|
instance_eval(&block) if block_given?
|
|
148
157
|
end
|
data/lib/chef_zero/server.rb
CHANGED
|
@@ -486,8 +486,10 @@ module ChefZero
|
|
|
486
486
|
[ "/organizations/*/containers/*", ContainerEndpoint.new(self) ],
|
|
487
487
|
[ "/organizations/*/groups", GroupsEndpoint.new(self) ],
|
|
488
488
|
[ "/organizations/*/groups/*", GroupEndpoint.new(self) ],
|
|
489
|
+
[ "/organizations/*/organization/_acl", AclsEndpoint.new(self) ],
|
|
489
490
|
[ "/organizations/*/organizations/_acl", AclsEndpoint.new(self) ],
|
|
490
491
|
[ "/organizations/*/*/*/_acl", AclsEndpoint.new(self) ],
|
|
492
|
+
[ "/organizations/*/organization/_acl/*", AclEndpoint.new(self) ],
|
|
491
493
|
[ "/organizations/*/organizations/_acl/*", AclEndpoint.new(self) ],
|
|
492
494
|
[ "/organizations/*/*/*/_acl/*", AclEndpoint.new(self) ]
|
|
493
495
|
]
|
data/lib/chef_zero/version.rb
CHANGED