chef-zero 15.0.0 → 15.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 271585a5bebd47f62edd42c039b8e14edaa04a80bbbfcbdb557b18a46671a7d9
-  data.tar.gz: 5d3f29782891d8df38b846fcde19370e72c77a737fa587f67f865f3bfb3ff32e
+  metadata.gz: d7df32f5341390dac8dc23f9fa3606aa3517b26cf137c1cac25af1a5a71dc2c4
+  data.tar.gz: 3a4ae10241501d09b07aaf13b4e00ce1ef9273e4856f6816bc0438e2de8514ae
 SHA512:
-  metadata.gz: e29414cf9d56b03e68709cf754d028bd182dd95ec6d511a81ab7370ce8a74deaaccf388a7124c6c70364c74ab323f7b2527ca2c67c1feea8fce5afa9073ac2dc
-  data.tar.gz: 6aabee35cefa8288a981e4e9428019463357e73e1392e8bfdba9b7f5fb6462f6efb34451dd5c26c305ae50b29615405181a465003103ed6e39748dc0c3360c14
+  metadata.gz: c2bf4f7ed0f09d64d6803d11d72574d00bccb58b9b40f9ac264058880fe4858fb043ba3ae477304a51ba0174f4a124cf86c00e1c484b09b9ae2342e2cc8061c8
+  data.tar.gz: 9e50e92767f819e73f6b0c3410bf2489981919029ab40a3b63675d08b1b35d9d527ac100ece47406fa832f263b1b96438500f3a84a983b87b5b4a44b4ae6d9d7

data/Rakefile

@@ -61,7 +61,7 @@ rescue LoadError
 end
 
 begin
-  require "yard"
+  require "yard" unless defined?(YARD)
   YARD::Rake::YardocTask.new(:docs)
 rescue LoadError
   puts "yard is not available. bundle install first to make sure all dependencies are installed."

data/bin/chef-zero

@@ -3,7 +3,7 @@
 # Trap interrupts to quit cleanly.
 Signal.trap("INT") { exit 1 }
 
-require "rubygems"
+require "rubygems" unless defined?(Gem)
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
 
 require "chef_zero/log"
@@ -11,7 +11,7 @@ require "chef_zero/dist"
 require "chef_zero/version"
 require "chef_zero/server"
 require "chef_zero/data_store/raw_file_store"
-require "optparse"
+require "optparse" unless defined?(OptionParser)
 
 def parse_port(port)
   array = []

data/chef-zero.gemspec

@@ -1,4 +1,4 @@
-$:.unshift(File.dirname(__FILE__) + "/lib")
+$:.unshift(__dir__ + "/lib")
 require "chef_zero/version"
 
 Gem::Specification.new do |s|
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "uuidtools", "~> 2.1"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "rack", "~> 2.0", ">= 2.0.6"
+  s.add_dependency "webrick"
 
   s.bindir       = "bin"
   s.executables  = ["chef-zero"]

data/lib/chef_zero/chef_data/cookbook_data.rb

@@ -1,4 +1,4 @@
-require "digest/md5"
+require "digest/md5" unless defined?(Digest::MD5)
 require "hashie"
 
 module ChefZero

data/lib/chef_zero/chef_data/data_normalizer.rb

@@ -62,6 +62,7 @@ module ChefZero
           user["email"] ||= nil
           user["first_name"] ||= nil
           user["last_name"] ||= nil
+          user["display_name"] ||= nil
         end
         user
       end

data/lib/chef_zero/data_store/raw_file_store.rb

@@ -19,7 +19,7 @@
 require_relative "data_already_exists_error"
 require_relative "data_not_found_error"
 require_relative "interface_v2"
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module ChefZero
   module DataStore

data/lib/chef_zero/endpoints/acl_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "../chef_data/acl_path"
 

data/lib/chef_zero/endpoints/acls_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "../chef_data/data_normalizer"
 require_relative "../chef_data/acl_path"

data/lib/chef_zero/endpoints/actor_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/actors_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_list_endpoint"
 
 module ChefZero

data/lib/chef_zero/endpoints/authenticate_user_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/container_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/containers_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_list_endpoint"
 
 module ChefZero

data/lib/chef_zero/endpoints/cookbook_version_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../rest_error_response"
 require_relative "../chef_data/data_normalizer"

data/lib/chef_zero/endpoints/cookbooks_base.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/data_bag_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_list_endpoint"
 require_relative "data_bag_item_endpoint"
 require_relative "../rest_error_response"

data/lib/chef_zero/endpoints/data_bag_item_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "data_bag_item_endpoint"
 require_relative "../chef_data/data_normalizer"

data/lib/chef_zero/endpoints/data_bags_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_list_endpoint"
 
 module ChefZero

data/lib/chef_zero/endpoints/environment_cookbook_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "cookbooks_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/environment_cookbook_versions_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "../rest_error_response"
 

data/lib/chef_zero/endpoints/environment_cookbooks_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "cookbooks_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/environment_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/environment_nodes_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/environment_recipes_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "cookbooks_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/environment_role_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "cookbooks_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/group_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/groups_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_list_endpoint"
 
 module ChefZero

data/lib/chef_zero/endpoints/license_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/node_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/node_identifiers_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require "uuidtools"
 

data/lib/chef_zero/endpoints/nodes_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/not_found_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/organization_association_request_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/organization_association_requests_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/organization_authenticate_user_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/organization_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/organization_user_base.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/organization_user_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/organization_users_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "organization_user_base"
 

data/lib/chef_zero/endpoints/organization_validator_key_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require "uuidtools"
 

data/lib/chef_zero/endpoints/organizations_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require "uuidtools"
 

data/lib/chef_zero/endpoints/policy_group_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/policy_group_policy_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/policy_groups_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/principal_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../../chef_zero"
 require_relative "../rest_base"
 

data/lib/chef_zero/endpoints/rest_list_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/rest_object_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 require_relative "../rest_error_response"
 

data/lib/chef_zero/endpoints/role_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/role_environments_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/sandbox_endpoint.rb

@@ -1,6 +1,6 @@
 require_relative "../rest_base"
 require_relative "../rest_error_response"
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module ChefZero
   module Endpoints

data/lib/chef_zero/endpoints/sandboxes_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/search_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 require_relative "../rest_error_response"

data/lib/chef_zero/endpoints/system_recovery_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/universe_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "rest_object_endpoint"
 require_relative "../chef_data/data_normalizer"
 

data/lib/chef_zero/endpoints/user_association_request_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/user_association_requests_count_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/user_association_requests_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/endpoints/user_organizations_endpoint.rb

@@ -1,4 +1,4 @@
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require_relative "../rest_base"
 
 module ChefZero

data/lib/chef_zero/rest_request.rb

@@ -1,5 +1,5 @@
 require "rack/request"
-require "cgi"
+require "cgi" unless defined?(CGI)
 
 module ChefZero
   class RestRequest

data/lib/chef_zero/rest_router.rb

@@ -1,4 +1,4 @@
-require "pp"
+require "pp" unless defined?(PP)
 
 module ChefZero
   class RestRouter

data/lib/chef_zero/rspec.rb

@@ -1,4 +1,4 @@
-require "tempfile"
+require "tempfile" unless defined?(Tempfile)
 require_relative "server"
 require_relative "rest_request"
 

data/lib/chef_zero/server.rb

@@ -16,14 +16,14 @@
 # limitations under the License.
 #
 
-require "openssl"
-require "open-uri"
-require "rubygems"
-require "timeout"
-require "stringio"
-
-require "rack"
-require "webrick"
+require "openssl" unless defined?(OpenSSL)
+require "open-uri" unless defined?(OpenURI)
+require "rubygems" unless defined?(Gem)
+require "timeout" unless defined?(Timeout)
+require "stringio" unless defined?(StringIO)
+
+require "rack" unless defined?(Rack)
+require "webrick" unless defined?(WEBrick)
 require "webrick/https"
 
 require_relative "../chef_zero"

data/lib/chef_zero/socketless_server_map.rb

@@ -17,7 +17,7 @@
 #
 
 require "thread"
-require "singleton"
+require "singleton" unless defined?(Singleton)
 require_relative "dist"
 
 module ChefZero

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "15.0.0".freeze
+  VERSION = "15.0.7".freeze
 end

data/spec/run_oc_pedant.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require "json"
+require "json" unless defined?(JSON)
 require "bundler"
 require "bundler/setup"
 
@@ -93,7 +93,7 @@ begin
   tmpdir = nil
   server =
     if ENV["FILE_STORE"]
-      require "tmpdir"
+      require "tmpdir" unless defined?(Dir.mktmpdir)
       require "chef_zero/data_store/raw_file_store"
       tmpdir = Dir.mktmpdir
       data_store = ChefZero::DataStore::RawFileStore.new(tmpdir, true)
@@ -102,7 +102,7 @@ begin
       start_chef_server(data_store: data_store)
 
     elsif ENV["CHEF_FS"]
-      require "tmpdir"
+      require "tmpdir" unless defined?(Dir.mktmpdir)
       tmpdir = Dir.mktmpdir
       start_cheffs_server(tmpdir)
 
@@ -188,6 +188,10 @@ begin
     # tests from chef-server as the user acls are not supported in chef-zero
     # at this time.
     "--skip-chef-zero-quirks",
+
+    "--skip-status",
+    "--skip=email_case_insensitive",
+    "--skip=nginx_default_error"
   ]
 
   # The knife tests are very slow and don't give us a lot of extra coverage,

data/spec/server_spec.rb

@@ -1,6 +1,6 @@
 require "chef_zero/server"
-require "net/http"
-require "uri"
+require "net/http" unless defined?(Net::HTTP)
+require "uri" unless defined?(URI)
 
 describe ChefZero::Server do
   context "with a server bound to port 8889" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 15.0.0
+  version: 15.0.7
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -98,6 +98,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.6
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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: oss@chef.io
@@ -245,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Self-contained, easy-setup, fast-start in-memory Chef server for testing