chef-zero 4.9.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c7f3a055202722134203eea195e863199ebe127
-  data.tar.gz: e9840b8dcffaac05370d37bb63a9ea3181026700
+  metadata.gz: af78d3b28c39a909122160ebeb4abe7086ba495d
+  data.tar.gz: e151250b3435d68022ace2ea846f839e0bbeaddf
 SHA512:
-  metadata.gz: b856efb3361afc894f457b253fd1b682a39fee7e4e5f924273052e546b932cbd35b575792280821427ba29a3406af93bfa098cb331d38d15e421a8d6952e9391
-  data.tar.gz: 272ae46e85c90e99f8d1cecffad2f2ef4017b1c7d4dce079f14dcc6dfb6ddf54747dfe07298b5baf812dfa11ead7aae6ad500ee47804d07f7a69261451a84bbf
+  metadata.gz: 65df47af4dcf486c45c84285ba99ec247c15bdb5d4fa83d1b827d12831e29fa47e88bb02da82a78b129554fcde26a621dc2b4495ef87c1af4892d5594ddb8da3
+  data.tar.gz: 9ab659ccb4ad813a3a9cde3cdd3496ae448f97bd7129b0ef8c2a44c258078503e5980ca4b6954019344f57028a52133ef58697bcc8738abe26bc6a7b8cacff2b

data/Gemfile

@@ -16,7 +16,7 @@ end
 # bundler resolve failure on "rspec_junit_formatter"
 # gem 'chef-pedant', :github => 'opscode/chef-pedant', :ref => "server-cli-option"
 
-# gem 'chef', :github => 'chef/chef', :branch => 'jk/policies-acls'
+gem "chef", github: "chef/chef" # until chef 12.15 is released
 
 if ENV["GEMFILE_MOD"]
   puts "GEMFILE_MOD: #{ENV['GEMFILE_MOD']}"

data/chef-zero.gemspec

@@ -12,20 +12,19 @@ Gem::Specification.new do |s|
   s.homepage = "http://www.chef.io"
   s.license = "Apache 2.0"
 
-  s.required_ruby_version = ">= 2.1.0"
+  s.required_ruby_version = ">= 2.2.2"
 
   s.add_dependency "mixlib-log", "~> 1.3"
   s.add_dependency "hashie", ">= 2.0", "< 4.0"
   s.add_dependency "uuidtools", "~> 2.1"
   s.add_dependency "ffi-yajl", "~> 2.2"
-  s.add_dependency "rack", "< 2" # 2.0 requires Ruby 2.2+
+  s.add_dependency "rack", "~> 2.0"
 
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-byebug"
   s.add_development_dependency "pry-stack_explorer"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "chef"
 
   s.bindir       = "bin"
   s.executables  = ["chef-zero"]

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -8,8 +8,18 @@ module ChefZero
       def self.normalize_acls(acls)
         ChefData::DefaultCreator::PERMISSIONS.each do |perm|
           acls[perm] ||= {}
-          (acls[perm]["actors"] ||= []).uniq! # this gets doubled sometimes, for reasons.
           acls[perm]["groups"] ||= []
+          if acls[perm].has_key? "users"
+            # When clients and users are split, their combined list
+            # is the final list of actors that a subsequent GET will
+            # provide. Each list is guaranteed to be unique, but the
+            # combined list is not.
+            acls[perm]["actors"] = acls[perm].delete("users").uniq +
+              acls[perm].delete("clients").uniq
+          else
+            # this gets doubled sometimes, for reasons.
+            (acls[perm]["actors"] ||= []).uniq!
+          end
         end
         acls
       end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "4.9.0"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 5.0.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -76,16 +76,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -156,20 +156,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 email: jkeiser@chef.io
@@ -308,7 +294,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -316,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing