chef-zero 4.6.2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1acaa25987b375f7585f9c0ba11b2b0f508032ea
-  data.tar.gz: 39c145979190df0cebc077e741f0d94c70e7d391
+  metadata.gz: f89ef968f192c0b01a3a0f73ba1e673cfe039849
+  data.tar.gz: 99690e56fc15973521597083a17607c943cbab7e
 SHA512:
-  metadata.gz: 247ea06777ea0899c5c8e4ad385c920a19c30df5730c7b782b45808e2234b5f7ac02c39450acde589e953818de5b08c7856c29289c7868a37d0b88133bac1c5d
-  data.tar.gz: 49b1000f437256cc657e09b7dc18a3faec6542d1c1089f0aa097447264864da687301a50d19530a9a7551e9a6b63c033eaa1a6eceec94ea250ad4b05722dc54f
+  metadata.gz: b8c05358fe42b17650dc0be8081ffb6d86512999402e919411ba1483692b978e36b91426a12cd2da12c5f63b69f079beaf0ffc06be770848ae006cfeb03e4514
+  data.tar.gz: a22b58b10510bc1b6782ad4074202d0d2db5810ffd5b5098a15d3782498017aae7b0b5c206aa067d1e1d690ed4abc9315acdc44f4a4885fb611222acc0d9b3a0

data/chef-zero.gemspec

@@ -8,17 +8,17 @@ Gem::Specification.new do |s|
   s.summary = 'Self-contained, easy-setup, fast-start in-memory Chef server for testing and solo setup purposes'
   s.description = s.summary
   s.author = 'John Keiser'
-  s.email = 'jkeiser@opscode.com'
-  s.homepage = 'http://www.opscode.com'
+  s.email = 'jkeiser@chef.io'
+  s.homepage = 'http://www.chef.io'
   s.license = 'Apache 2.0'
 
   s.required_ruby_version = ">= 2.1.0"
 
-  s.add_dependency 'mixlib-log',    '~> 1.3'
-  s.add_dependency 'hashie',        '>= 2.0', '< 4.0'
+  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'
+  s.add_dependency 'rack', '< 2' # 2.0 requires Ruby 2.2+
 
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-byebug'

data/lib/chef_zero/endpoints/actors_endpoint.rb

@@ -8,17 +8,12 @@ module ChefZero
       def get(request)
         response = super(request)
 
-        if request.query_params['email']
-          results = parse_json(response[2])
-          new_results = {}
-          results.each do |name, url|
-            record = get_data(request, request.rest_path + [ name ], :nil)
-            if record
-              record = parse_json(record)
-              new_results[name] = url if record['email'] == request.query_params['email']
-            end
-          end
-          response[2] = to_json(new_results)
+        # apply query filters: if one applies, stop processing rest
+        # (precendence matches chef-server: https://github.com/chef/chef-server/blob/268a0c9/src/oc_erchef/apps/chef_objects/src/chef_user.erl#L554-L559)
+        if value = request.query_params['external_authentication_uid']
+          response[2] = filter('external_authentication_uid', value, request, response[2])
+        elsif value = request.query_params['email']
+          response[2] = filter('email', value, request, response[2])
         end
 
         if request.query_params['verbose']
@@ -85,6 +80,21 @@ module ChefZero
           result
         end
       end
+
+      private
+
+      def filter(key, value, request, resp)
+        results = parse_json(resp)
+        new_results = {}
+        results.each do |name, url|
+          record = get_data(request, request.rest_path + [ name ], :nil)
+          if record
+            record = parse_json(record)
+            new_results[name] = url if record[key] == value
+          end
+        end
+        to_json(new_results)
+      end
     end
   end
 end

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = '4.6.2'
+  VERSION = '4.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 4.6.2
+  version: 4.7.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-06-30 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: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -172,7 +172,7 @@ dependencies:
         version: '0'
 description: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
-email: jkeiser@opscode.com
+email: jkeiser@chef.io
 executables:
 - chef-zero
 extensions: []
@@ -296,7 +296,7 @@ files:
 - spec/socketless_server_map_spec.rb
 - spec/support/oc_pedant.rb
 - spec/support/stickywicket.pem
-homepage: http://www.opscode.com
+homepage: http://www.chef.io
 licenses:
 - Apache 2.0
 metadata: {}
@@ -322,3 +322,4 @@ specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing
   and solo setup purposes
 test_files: []
+has_rdoc: