chef-zero 14.0.13 → 15.0.3

data/lib/chef_zero/socketless_server_map.rb

@@ -17,8 +17,8 @@
 #
 
 require "thread"
-require "singleton"
-require "chef_zero/dist"
+require "singleton" unless defined?(Singleton)
+require_relative "dist"
 
 module ChefZero
 
@@ -85,6 +85,7 @@ module ChefZero
     def request(port, request_env)
       server = @servers_by_port[port]
       raise ServerNotFound, "No socketless #{ChefZero::Dist::PRODUCT} server on given port #{port.inspect}" unless server
+
       server.handle_socketless_request(request_env)
     end
 

data/lib/chef_zero/solr/query/phrase.rb

@@ -1,4 +1,4 @@
-require "chef_zero/solr/query/regexpable_query"
+require_relative "regexpable_query"
 
 module ChefZero
   module Solr
@@ -11,7 +11,7 @@ module ChefZero
           else
             literal_string = nil
           end
-          super(terms.map { |term| term.regexp_string }.join("#{NON_WORD_CHARACTER}+"), literal_string)
+          super(terms.map(&:regexp_string).join("#{NON_WORD_CHARACTER}+"), literal_string)
         end
 
         def to_s

data/lib/chef_zero/solr/query/range_query.rb

@@ -10,7 +10,7 @@ module ChefZero
         end
 
         def to_s
-          "#{@from_inclusive ? '[' : '{'}#{@from} TO #{@to}#{@to_inclusive ? ']' : '}'}"
+          "#{@from_inclusive ? "[" : "{"}#{@from} TO #{@to}#{@to_inclusive ? "]" : "}"}"
         end
 
         def matches_values?(values)
@@ -20,7 +20,7 @@ module ChefZero
               when -1
                 return false
               when 0
-                return false if !@from_inclusive
+                return false unless @from_inclusive
               end
             end
             unless @to == "*"
@@ -28,7 +28,7 @@ module ChefZero
               when 1
                 return false
               when 0
-                return false if !@to_inclusive
+                return false unless @to_inclusive
               end
             end
             return true

data/lib/chef_zero/solr/query/term.rb

@@ -1,4 +1,4 @@
-require "chef_zero/solr/query/regexpable_query"
+require_relative "regexpable_query"
 
 module ChefZero
   module Solr

data/lib/chef_zero/solr/solr_parser.rb

@@ -1,9 +1,9 @@
-require "chef_zero/solr/query/binary_operator"
-require "chef_zero/solr/query/unary_operator"
-require "chef_zero/solr/query/term"
-require "chef_zero/solr/query/phrase"
-require "chef_zero/solr/query/range_query"
-require "chef_zero/solr/query/subquery"
+require_relative "query/binary_operator"
+require_relative "query/unary_operator"
+require_relative "query/term"
+require_relative "query/phrase"
+require_relative "query/range_query"
+require_relative "query/subquery"
 
 module ChefZero
   module Solr
@@ -50,7 +50,7 @@ module ChefZero
             if @query_string[@index] == '\\'
               @index += 1
             end
-            @index += 1 if !eof?
+            @index += 1 unless eof?
             break if eof? || !peek_term_token
           end
           @query_string[start_index..@index - 1]
@@ -66,6 +66,7 @@ module ChefZero
 
       def peek_term_token
         return nil if @query_string[@index] =~ /\s/
+
         op = peek_operator_token
         !op || op == "-"
       end
@@ -79,6 +80,7 @@ module ChefZero
             return result
           end
         end
+
         nil
       end
 
@@ -145,13 +147,13 @@ module ChefZero
         # If it's the start of a range query, build that
         elsif token == "{" || token == "["
           left = next_token
-          parse_error(left, "Expected left term in range query") if !left
+          parse_error(left, "Expected left term in range query") unless left
           to = next_token
           parse_error(left, "Expected TO in range query") if to != "TO"
           right = next_token
-          parse_error(right, "Expected left term in range query") if !right
+          parse_error(right, "Expected left term in range query") unless right
           end_range = next_token
-          parse_error(right, "Expected end range '#{end_range}") if !["}", "]"].include?(end_range)
+          parse_error(right, "Expected end range '#{end_range}") unless ["}", "]"].include?(end_range)
           Query::RangeQuery.new(left, right, token == "[", end_range == "]")
 
         elsif token == "("

data/lib/chef_zero/version.rb

@@ -1,3 +1,3 @@
 module ChefZero
-  VERSION = "14.0.13".freeze
+  VERSION = "15.0.3".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"
 
@@ -32,6 +32,7 @@ DEFAULT_LOG_LEVEL = :warn
 def log_level
   return ENV["LOG_LEVEL"].downcase.to_sym if ENV["LOG_LEVEL"]
   return :debug if ENV["DEBUG"]
+
   DEFAULT_LOG_LEVEL
 end
 
@@ -39,7 +40,7 @@ def start_chef_server(opts = {})
   opts = DEFAULT_SERVER_OPTIONS.merge(opts)
   opts[:log_level] = log_level
 
-  ChefZero::Server.new(opts).tap { |server| server.start_background }
+  ChefZero::Server.new(opts).tap(&:start_background)
 end
 
 def start_cheffs_server(chef_repo_path)
@@ -49,12 +50,12 @@ def start_cheffs_server(chef_repo_path)
   require "chef/chef_fs/chef_fs_data_store"
   require "chef_zero/server"
 
-  Dir.mkdir(chef_repo_path) if !File.exist?(chef_repo_path)
+  Dir.mkdir(chef_repo_path) unless File.exist?(chef_repo_path)
 
   # 11.6 and below had a bug where it couldn't create the repo children automatically
   if Chef::VERSION.to_f < 11.8
     %w{clients cookbooks data_bags environments nodes roles users}.each do |child|
-      Dir.mkdir("#{chef_repo_path}/#{child}") if !File.exist?("#{chef_repo_path}/#{child}")
+      Dir.mkdir("#{chef_repo_path}/#{child}") unless File.exist?("#{chef_repo_path}/#{child}")
     end
   end
 
@@ -84,6 +85,7 @@ end
 
 def args_from_env(key)
   return [] unless ENV[key]
+
   ENV[key].split
 end
 
@@ -91,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)
@@ -100,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)
 

data/spec/search_spec.rb

@@ -6,8 +6,8 @@ describe ChefZero::Solr::SolrParser do
     docs = []
     [{ "foo" => "a" },
      { "foo" => "d" }].each_with_index do |h, i|
-      docs.push ChefZero::Solr::SolrDoc.new(h, i)
-    end
+       docs.push ChefZero::Solr::SolrDoc.new(h, i)
+     end
     docs
   end
 

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

data/spec/socketless_server_map_spec.rb

@@ -2,7 +2,7 @@ require "chef_zero/socketless_server_map"
 
 describe "Socketless Mode" do
 
-  let(:server_map) { ChefZero::SocketlessServerMap.instance.tap { |i| i.reset! } }
+  let(:server_map) { ChefZero::SocketlessServerMap.instance.tap(&:reset!) }
 
   let(:server) { instance_double("ChefZero::Server") }
 

data/spec/support/oc_pedant.rb

@@ -140,7 +140,7 @@ requestors({
              },
            })
 
-self[:tags] = [:validation, :authentication, :authorization]
+self[:tags] = %i{validation authentication authorization}
 verify_error_messages false
 
 ruby_users_endpoint? false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-zero
 version: !ruby/object:Gem::Version
-  version: 14.0.13
+  version: 15.0.3
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -39,7 +39,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -98,34 +98,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.6
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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: oss@chef.io
@@ -266,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="