chef-zero 4.8.0 → 4.9.0

data/lib/chef_zero/socketless_server_map.rb

@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'thread'
-require 'singleton'
+require "thread"
+require "singleton"
 
 module ChefZero
 
@@ -89,4 +89,3 @@ module ChefZero
 
   end
 end
-

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

@@ -18,13 +18,13 @@ module ChefZero
 
         def matches_doc?(doc)
           case @operator
-          when 'AND'
+          when "AND"
             left.matches_doc?(doc) && right.matches_doc?(doc)
-          when 'OR'
+          when "OR"
             left.matches_doc?(doc) || right.matches_doc?(doc)
-          when '^'
+          when "^"
             left.matches_doc?(doc)
-          when ':'
+          when ":"
             if left.respond_to?(:literal_string) && left.literal_string
               values = doc[left.literal_string]
             else
@@ -36,13 +36,13 @@ module ChefZero
 
         def matches_values?(values)
           case @operator
-          when 'AND'
+          when "AND"
             left.matches_values?(values) && right.matches_values?(values)
-          when 'OR'
+          when "OR"
             left.matches_values?(values) || right.matches_values?(values)
-          when '^'
+          when "^"
             left.matches_values?(values)
-          when ':'
+          when ":"
             raise ": does not work inside a : or term"
           end
         end

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

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

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

@@ -15,7 +15,7 @@ module ChefZero
 
         def matches_values?(values)
           values.any? do |value|
-            unless @from == '*'
+            unless @from == "*"
               case @from <=> value
               when -1
                 return false
@@ -23,7 +23,7 @@ module ChefZero
                 return false if !@from_inclusive
               end
             end
-            unless @to == '*'
+            unless @to == "*"
               case value <=> @to
               when 1
                 return false

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

@@ -16,6 +16,7 @@ module ChefZero
         def matches_doc?(doc)
           matches_values?(doc[DEFAULT_FIELD])
         end
+
         def matches_values?(values)
           values.any? { |value| !@regexp.match(value).nil? }
         end

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

@@ -1,4 +1,4 @@
-require 'chef_zero/solr/query/regexpable_query'
+require "chef_zero/solr/query/regexpable_query"
 
 module ChefZero
   module Solr
@@ -11,19 +11,19 @@ module ChefZero
           regexp_string = ""
           index = 0
           while index < term.length
-            if term[index] == '*'
+            if term[index] == "*"
               regexp_string << "#{WORD_CHARACTER}*"
               literal_string = nil
               index += 1
-            elsif term[index] == '?'
+            elsif term[index] == "?"
               regexp_string << WORD_CHARACTER
               literal_string = nil
               index += 1
-            elsif term[index] == '~'
+            elsif term[index] == "~"
               raise "~ unsupported"
             else
               if term[index] == '\\'
-                index = index+1
+                index = index + 1
                 if index >= term.length
                   raise "Backslash at end of string '#{term}'"
                 end

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

@@ -16,9 +16,9 @@ module ChefZero
 
         def matches_doc?(doc)
           case @operator
-          when '-', 'NOT'
+          when "-", "NOT"
             !operand.matches_doc?(doc)
-          when '+'
+          when "+"
             # TODO This operator uses relevance to eliminate other, unrelated
             # expressions.  +a OR b means "if it has b but not a, don't return it"
             raise "+ not supported yet, because it is hard."
@@ -27,9 +27,9 @@ module ChefZero
 
         def matches_values?(values)
           case @operator
-          when '-', 'NOT'
+          when "-", "NOT"
             !operand.matches_values?(values)
-          when '+'
+          when "+"
             # TODO This operator uses relevance to eliminate other, unrelated
             # expressions.  +a OR b means "if it has b but not a, don't return it"
             raise "+ not supported yet, because it is hard."

data/lib/chef_zero/solr/solr_doc.rb

@@ -15,12 +15,12 @@ module ChefZero
       def matching_values(&block)
         result = []
         key_values(nil, @json) do |key, value|
-          if block.call(key)
+          if yield(key)
             result << value.to_s
           end
         end
         # Handle manufactured value(s)
-        if block.call('X_CHEF_id_CHEF_X')
+        if yield("X_CHEF_id_CHEF_X")
           result << @id.to_s
         end
 
@@ -32,7 +32,7 @@ module ChefZero
       def key_values(key_so_far, value, &block)
         if value.is_a?(Hash)
           value.each_pair do |child_key, child_value|
-            block.call(child_key, child_value.to_s)
+            yield(child_key, child_value.to_s)
             if key_so_far
               new_key = "#{key_so_far}_#{child_key}"
               key_values(new_key, child_value, &block)
@@ -45,7 +45,7 @@ module ChefZero
             key_values(key_so_far, child_value, &block)
           end
         else
-          block.call(key_so_far || 'text', value.to_s)
+          yield(key_so_far || "text", value.to_s)
         end
       end
     end

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 "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"
 
 module ChefZero
   module Solr
@@ -40,19 +40,20 @@ module ChefZero
         # Operators
         operator = peek_operator_token
         if operator
-          @index+=operator.length
+          @index += operator.length
           operator
         else
           # Everything that isn't whitespace or an operator, is part of a term
           # (characters plus backslashed escaped characters)
           start_index = @index
-          begin
+          loop do
             if @query_string[@index] == '\\'
-              @index+=1
+              @index += 1
             end
-            @index+=1 if !eof?
-          end while !eof? && peek_term_token
-          @query_string[start_index..@index-1]
+            @index += 1 if !eof?
+            break if eof? || !peek_term_token
+          end
+          @query_string[start_index..@index - 1]
         end
       end
 
@@ -66,15 +67,15 @@ module ChefZero
       def peek_term_token
         return nil if @query_string[@index] =~ /\s/
         op = peek_operator_token
-        return !op || op == '-'
+        return !op || op == "-"
       end
 
       def peek_operator_token
-        if ['"', '+', '-', '!', '(', ')', '{', '}', '[', ']', '^', ':'].include?(@query_string[@index])
+        if ['"', "+", "-", "!", "(", ")", "{", "}", "[", "]", "^", ":"].include?(@query_string[@index])
           return @query_string[@index]
         else
-          result = @query_string[@index..@index+1]
-          if ['&&', '||'].include?(result)
+          result = @query_string[@index..@index + 1]
+          if ["&&", "||"].include?(result)
             return result
           end
         end
@@ -91,19 +92,19 @@ module ChefZero
         # Expression is over when we hit a close paren or eof
         # (peek_token has the side effect of skipping whitespace for us, so we
         # really know if we're at eof or not)
-        until peek_token == ')' || eof?
+        until peek_token == ")" || eof?
           operator = peek_token
           if binary_operator?(operator)
             next_token
           else
             # If 2 terms are next to each other, the default operator is OR
-            operator = 'OR'
+            operator = "OR"
           end
           next_expression = read_single_expression
 
           # Build the operator, taking precedence into account
           if result.is_a?(Query::BinaryOperator) &&
-             binary_operator_precedence(operator) > binary_operator_precedence(result.operator)
+              binary_operator_precedence(operator) > binary_operator_precedence(result.operator)
             # a+b*c -> a+(b*c)
             new_right = Query::BinaryOperator.new(result.right, operator, next_expression)
             result = Query::BinaryOperator.new(result.left, result.operator, new_right)
@@ -142,7 +143,7 @@ module ChefZero
           Query::Phrase.new(phrase_terms)
 
         # If it's the start of a range query, build that
-        elsif token == '{' || token == '['
+        elsif token == "{" || token == "["
           left = next_token
           parse_error(left, "Expected left term in range query") if !left
           to = next_token
@@ -150,17 +151,17 @@ module ChefZero
           right = next_token
           parse_error(right, "Expected left term in range query") if !right
           end_range = next_token
-          parse_error(right, "Expected end range '#{end_range}") if !['}', ']'].include?(end_range)
-          Query::RangeQuery.new(left, right, token == '[', end_range == ']')
+          parse_error(right, "Expected end range '#{end_range}") if !["}", "]"].include?(end_range)
+          Query::RangeQuery.new(left, right, token == "[", end_range == "]")
 
-        elsif token == '('
+        elsif token == "("
           subquery = read_expression
           close_paren = next_token
-          parse_error(close_paren, "Expected ')'") if close_paren != ')'
+          parse_error(close_paren, "Expected ')'") if close_paren != ")"
           Query::Subquery.new(subquery)
 
         # If it's the end of a closure, raise an exception
-        elsif ['}',']',')'].include?(token)
+        elsif ["}", "]", ")"].include?(token)
           parse_error(token, "Unexpected end paren")
 
         # If it's a binary operator, raise an exception
@@ -170,7 +171,7 @@ module ChefZero
         # Otherwise it's a term.
         else
           term = Query::Term.new(token)
-          if peek_token == ':'
+          if peek_token == ":"
             Query::BinaryOperator.new(term, next_token, read_single_expression)
           else
             term
@@ -179,27 +180,27 @@ module ChefZero
       end
 
       def unary_operator?(token)
-        [ 'NOT', '+', '-' ].include?(token)
+        [ "NOT", "+", "-" ].include?(token)
       end
 
       def binary_operator?(token)
-        [ 'AND', 'OR', '^', ':'].include?(token)
+        [ "AND", "OR", "^", ":"].include?(token)
       end
 
       def binary_operator_precedence(token)
         case token
-        when '^'
+        when "^"
           4
-        when ':'
+        when ":"
           3
-        when 'AND'
+        when "AND"
           2
-        when 'OR'
+        when "OR"
           1
         end
       end
 
-      DEFAULT_FIELD = 'text'
+      DEFAULT_FIELD = "text"
     end
   end
 end

data/lib/chef_zero/version.rb

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

data/spec/run_oc_pedant.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-require 'bundler'
-require 'bundler/setup'
+require "bundler"
+require "bundler/setup"
 
-require 'chef_zero/server'
-require 'rspec/core'
+require "chef_zero/server"
+require "rspec/core"
 
 # This file runs oc-chef-pedant specs and is invoked by `rake pedant`
 # and other Rake tasks. Run `rake -T` to list tasks.
@@ -29,56 +29,56 @@ DEFAULT_SERVER_OPTIONS = {
 DEFAULT_LOG_LEVEL = :warn
 
 def log_level
-  return ENV['LOG_LEVEL'].downcase.to_sym if ENV['LOG_LEVEL']
-  return :debug if ENV['DEBUG']
+  return ENV["LOG_LEVEL"].downcase.to_sym if ENV["LOG_LEVEL"]
+  return :debug if ENV["DEBUG"]
   DEFAULT_LOG_LEVEL
 end
 
-def start_chef_server(opts={})
+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 { |server| server.start_background }
 end
 
 def start_cheffs_server(chef_repo_path)
-  require 'chef/version'
-  require 'chef/config'
-  require 'chef/chef_fs/config'
-  require 'chef/chef_fs/chef_fs_data_store'
-  require 'chef_zero/server'
+  require "chef/version"
+  require "chef/config"
+  require "chef/chef_fs/config"
+  require "chef/chef_fs/chef_fs_data_store"
+  require "chef_zero/server"
 
   Dir.mkdir(chef_repo_path) if !File.exists?(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|
+    %w{clients cookbooks data_bags environments nodes roles users}.each do |child|
       Dir.mkdir("#{chef_repo_path}/#{child}") if !File.exists?("#{chef_repo_path}/#{child}")
     end
   end
 
   # Start the new server
-  Chef::Config.repo_mode = 'hosted_everything'
+  Chef::Config.repo_mode = "hosted_everything"
   Chef::Config.chef_repo_path = chef_repo_path
   Chef::Config.versioned_cookbooks = true
   chef_fs_config = Chef::ChefFS::Config.new
 
   data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs_config.local_fs, chef_fs_config.chef_config)
-  data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'pedant-testorg')
-  data_store = ChefZero::DataStore::DefaultFacade.new(data_store, 'pedant-testorg', false)
-  data_store.create(%w(organizations pedant-testorg users), 'pivotal', '{}')
-  data_store.set(%w(organizations pedant-testorg groups admins), '{ "users": [ "pivotal" ] }')
-  data_store.set(%w(organizations pedant-testorg groups users), '{ "users": [ "pivotal" ] }')
+  data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, "pedant-testorg")
+  data_store = ChefZero::DataStore::DefaultFacade.new(data_store, "pedant-testorg", false)
+  data_store.create(%w{organizations pedant-testorg users}, "pivotal", "{}")
+  data_store.set(%w{organizations pedant-testorg groups admins}, '{ "users": [ "pivotal" ] }')
+  data_store.set(%w{organizations pedant-testorg groups users}, '{ "users": [ "pivotal" ] }')
 
   start_chef_server(data_store: data_store)
 end
 
 def pedant_args_from_env
-  args_from_env('PEDANT_OPTS')
+  args_from_env("PEDANT_OPTS")
 end
 
 def rspec_args_from_env
-  args_from_env('RSPEC_OPTS')
+  args_from_env("RSPEC_OPTS")
 end
 
 def args_from_env(key)
@@ -89,17 +89,17 @@ end
 begin
   tmpdir = nil
   server =
-    if ENV['FILE_STORE']
-      require 'tmpdir'
-      require 'chef_zero/data_store/raw_file_store'
+    if ENV["FILE_STORE"]
+      require "tmpdir"
+      require "chef_zero/data_store/raw_file_store"
       tmpdir = Dir.mktmpdir
       data_store = ChefZero::DataStore::RawFileStore.new(tmpdir, true)
       data_store = ChefZero::DataStore::DefaultFacade.new(data_store, false, false)
 
       start_chef_server(data_store: data_store)
 
-    elsif ENV['CHEF_FS']
-      require 'tmpdir'
+    elsif ENV["CHEF_FS"]
+      require "tmpdir"
       tmpdir = Dir.mktmpdir
       start_cheffs_server(tmpdir)
 
@@ -107,42 +107,43 @@ begin
       start_chef_server
     end
 
-  require 'rspec/core'
-  require 'pedant'
-  require 'pedant/organization'
+  require "rspec/core"
+  require "pedant"
+  require "pedant/organization"
 
   # Pedant::Config.rerun = true
 
-  Pedant.config.suite = 'api'
+  Pedant.config.suite = "api"
 
-  Pedant.config[:config_file] = 'spec/support/oc_pedant.rb'
+  Pedant.config[:config_file] = "spec/support/oc_pedant.rb"
 
   # Because ChefFS can only ever have one user (pivotal), we can't do most of the
   # tests that involve multiple
-  chef_fs_skips = if ENV['CHEF_FS']
-    [ '--skip-association',
-      '--skip-users',
-      '--skip-organizations',
-      '--skip-multiuser',
-      '--skip-user-keys',
-
-      # chef-zero has some non-removable quirks, such as the fact that files
-      # with 255-character names cannot be stored in local mode. This is
-      # reserved only for quirks that are *irrevocable* and by design; and
-      # should barely be used at all.
-      '--skip-chef-zero-quirks',
-    ]
-  else
-    []
-  end
-  # The latest released Chef doesn't do ACLs, Cookbook Artifacts or Policies yet
-  chef_fs_skips << '--skip-acl'
-  chef_fs_skips << '--skip-cookbook-artifacts'
-  chef_fs_skips << '--skip-policies'
+  chef_fs_skips = if ENV["CHEF_FS"]
+                    [ "--skip-association",
+                      "--skip-users",
+                      "--skip-organizations",
+                      "--skip-multiuser",
+                      "--skip-user-keys",
+
+                      # chef-zero has some non-removable quirks, such as the fact that files
+                      # with 255-character names cannot be stored in local mode. This is
+                      # reserved only for quirks that are *irrevocable* and by design; and
+                      # should barely be used at all.
+                      "--skip-chef-zero-quirks",
+                    ]
+                  else
+                    []
+                  end
 
-  # Multi-keys don't work prior to 12.8
   unless Gem::Requirement.new(">= 12.8.0").satisfied_by?(Gem::Version.new(Chef::VERSION))
-    chef_fs_skips << '--skip-keys'
+    chef_fs_skips << "--skip-keys"
+  end
+
+  unless Gem::Requirement.new(">= 12.13.19").satisfied_by?(Gem::Version.new(Chef::VERSION))
+    chef_fs_skips << "--skip-acl"
+    chef_fs_skips << "--skip-cookbook-artifacts"
+    chef_fs_skips << "--skip-policies"
   end
 
   # These things aren't supported by Chef Zero in any mode of operation:
@@ -153,30 +154,30 @@ begin
     # ...but we're not there yet
 
     # Chef Zero does not intend to support validation the way erchef does.
-    '--skip-validation',
+    "--skip-validation",
 
     # Chef Zero does not intend to support authentication the way erchef does.
-    '--skip-authentication',
+    "--skip-authentication",
 
     # Chef Zero does not intend to support authorization the way erchef does.
-    '--skip-authorization',
+    "--skip-authorization",
 
     # Omnibus tests depend on erchef features that are specific to erchef and
     # bundled in the omnibus package. Currently the only test in this category
     # is for the search reindexing script.
-    '--skip-omnibus',
+    "--skip-omnibus",
 
     # USAGs (user-specific association groups) are Authz groups that contain
     # only one user and represent that user's association with an org. Though
     # there are good reasons for them, they don't work well in practice and
     # only the manage console really uses them. Since Chef Zero + Manage is a
     # quite unusual configuration, we're ignoring them.
-    '--skip-usags',
+    "--skip-usags",
 
     # Chef 12 features not yet 100% supported by Chef Zero
 
     # The universe endpoint is unlikely to ever make sense for Chef Zero
-    '--skip-universe',
+    "--skip-universe",
   ]
 
   # The knife tests are very slow and don't give us a lot of extra coverage,