chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/lib/chef/event_dispatch/dispatcher.rb

@@ -60,7 +60,8 @@ class Chef
         @in_call = true
         subscribers.each do |s|
           # Skip new/unsupported event names
-          next if !s.respond_to?(method_name)
+          next unless s.respond_to?(method_name)
+
           mth = s.method(method_name)
           # Trim arguments to match what the subscriber expects to allow
           # adding new arguments without breaking compat.

data/lib/chef/event_loggers/base.rb

@@ -43,8 +43,9 @@ class Chef
 
     def self.new(name)
       event_logger_class = by_name(name.to_s)
-      raise UnknownEventLogger, "No event logger found for #{name} (available: #{available_event_loggers.join(', ')})" unless event_logger_class
+      raise UnknownEventLogger, "No event logger found for #{name} (available: #{available_event_loggers.join(", ")})" unless event_logger_class
       raise UnavailableEventLogger unless available_event_loggers.include? name.to_s
+
       event_logger_class.new
     end
 

data/lib/chef/exceptions.rb

@@ -2,7 +2,7 @@
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,6 +19,7 @@
 
 require "chef-config/exceptions"
 require_relative "dist"
+require_relative "constants"
 
 class Chef
   # == Chef::Exceptions
@@ -264,14 +265,12 @@ class Chef
     end
 
     class MissingRole < RuntimeError
-      NULL = Object.new
-
       attr_reader :expansion
 
-      def initialize(message_or_expansion = NULL)
+      def initialize(message_or_expansion = NOT_PASSED)
         @expansion = nil
         case message_or_expansion
-        when NULL
+        when NOT_PASSED
           super()
         when String
           super
@@ -493,9 +492,9 @@ class Chef
         @resources_found = resources_found
         matches_info = @resources_found.each do |r|
           if r["Module"].nil?
-            "Resource #{r['Name']} was found in #{r['Module']['Name']}"
+            "Resource #{r["Name"]} was found in #{r["Module"]["Name"]}"
           else
-            "Resource #{r['Name']} is a binary resource"
+            "Resource #{r["Name"]} is a binary resource"
           end
         end
         super "Found multiple resources matching #{matches_info[0]["Module"]["Name"]}:\n#{(matches_info.map { |f| f["Module"]["Version"] }).uniq.join("\n")}"

data/lib/chef/file_access_control/unix.rb

@@ -118,9 +118,10 @@ class Chef
 
       def gid_from_resource(resource)
         return nil if resource.nil? || resource.group.nil?
-        if resource.group.kind_of?(String)
+
+        if resource.group.is_a?(String)
           diminished_radix_complement( Etc.getgrnam(resource.group).gid )
-        elsif resource.group.kind_of?(Integer)
+        elsif resource.group.is_a?(Integer)
           resource.group
         else
           Chef::Log.error("The `group` parameter of the #{@resource} resource is set to an invalid value (#{resource.owner.inspect})")
@@ -169,6 +170,7 @@ class Chef
 
       def mode_from_resource(res)
         return nil if res.nil? || res.mode.nil?
+
         (res.mode.respond_to?(:oct) ? res.mode.oct : res.mode.to_i) & 007777
       end
 
@@ -265,9 +267,10 @@ class Chef
 
       def uid_from_resource(resource)
         return nil if resource.nil? || resource.owner.nil?
-        if resource.owner.kind_of?(String)
+
+        if resource.owner.is_a?(String)
           diminished_radix_complement( Etc.getpwnam(resource.owner).uid )
-        elsif resource.owner.kind_of?(Integer)
+        elsif resource.owner.is_a?(Integer)
           resource.owner
         else
           Chef::Log.error("The `owner` parameter of the #{@resource} resource is set to an invalid value (#{resource.owner.inspect})")

data/lib/chef/file_access_control/windows.rb

@@ -34,7 +34,8 @@ class Chef
         # We want to mix these in as class methods
         def writable?(path)
           ::File.exists?(path) && Chef::ReservedNames::Win32::File.file_access_check(
-            path, Chef::ReservedNames::Win32::API::Security::FILE_GENERIC_WRITE)
+            path, Chef::ReservedNames::Win32::API::Security::FILE_GENERIC_WRITE
+          )
         end
       end
 
@@ -110,9 +111,9 @@ class Chef
       end
 
       def get_sid(value)
-        if value.kind_of?(String)
+        if value.is_a?(String)
           SID.from_account(value)
-        elsif value.kind_of?(SID)
+        elsif value.is_a?(SID)
           value
         else
           raise "Must specify username, group or SID: #{value}"
@@ -121,16 +122,18 @@ class Chef
 
       def securable_object
         @securable_object ||= begin
-          if file.kind_of?(String)
+          if file.is_a?(String)
             so = Chef::ReservedNames::Win32::Security::SecurableObject.new(file.dup)
           end
-          raise ArgumentError, "'file' must be a valid path or object of type 'Chef::ReservedNames::Win32::Security::SecurableObject'" unless so.kind_of? Chef::ReservedNames::Win32::Security::SecurableObject
+          raise ArgumentError, "'file' must be a valid path or object of type 'Chef::ReservedNames::Win32::Security::SecurableObject'" unless so.is_a? Chef::ReservedNames::Win32::Security::SecurableObject
+
           so
         end
       end
 
       def should_update_dacl?
         return true unless ::File.exists?(file) || ::File.symlink?(file)
+
         dacl = target_dacl
         existing_dacl = existing_descriptor.dacl
         inherits = target_inherits
@@ -164,6 +167,7 @@ class Chef
 
       def should_update_group?
         return true unless ::File.exists?(file) || ::File.symlink?(file)
+
         (group = target_group) && (group != existing_descriptor.group)
       end
 
@@ -183,6 +187,7 @@ class Chef
 
       def should_update_owner?
         return true unless ::File.exists?(file) || ::File.symlink?(file)
+
         (owner = target_owner) && (owner != existing_descriptor.owner)
       end
 
@@ -206,6 +211,7 @@ class Chef
         mask |= (GENERIC_WRITE | DELETE) if mode & 2 != 0
         mask |= GENERIC_EXECUTE if mode & 1 != 0
         return [] if mask == 0
+
         [ ACE.access_allowed(sid, mask) ]
       end
 
@@ -266,9 +272,10 @@ class Chef
 
       def target_dacl
         return nil if resource.rights.nil? && resource.deny_rights.nil? && resource.mode.nil?
+
         acls = nil
 
-        if !resource.deny_rights.nil?
+        unless resource.deny_rights.nil?
           acls = [] if acls.nil?
 
           resource.deny_rights.each do |rights|
@@ -281,7 +288,7 @@ class Chef
           end
         end
 
-        if !resource.rights.nil?
+        unless resource.rights.nil?
           acls = [] if acls.nil?
 
           resource.rights.each do |rights|
@@ -294,7 +301,7 @@ class Chef
           end
         end
 
-        if !resource.mode.nil?
+        unless resource.mode.nil?
           acls = [] if acls.nil?
 
           mode = (resource.mode.respond_to?(:oct) ? resource.mode.oct : resource.mode.to_i) & 0777
@@ -321,6 +328,7 @@ class Chef
 
       def target_group
         return nil if resource.group.nil?
+
         get_sid(resource.group)
       end
 
@@ -330,6 +338,7 @@ class Chef
 
       def target_owner
         return nil if resource.owner.nil?
+
         get_sid(resource.owner)
       end
     end

data/lib/chef/file_cache.rb

@@ -113,6 +113,7 @@ class Chef
         )
         cache_path = create_cache_path(path, false)
         raise Chef::Exceptions::FileNotFound, "Cannot find #{cache_path} for #{path}!" unless File.exists?(cache_path)
+
         if read
           File.read(cache_path)
         else
@@ -157,7 +158,7 @@ class Chef
       # === Returns
       # [String] - An array of file cache keys matching the glob
       def find(glob_pattern)
-        keys = Array.new
+        keys = []
         Dir[File.join(Chef::Util::PathHelper.escape_glob_dir(file_cache_path), glob_pattern)].each do |f|
           if File.file?(f)
             keys << f[/^#{Regexp.escape(Dir[Chef::Util::PathHelper.escape_glob_dir(file_cache_path)].first) + File::Separator}(.+)/, 1]

data/lib/chef/file_content_management/deploy.rb

@@ -27,9 +27,9 @@ class Chef
     class Deploy
       def self.strategy(atomic_update)
         if atomic_update
-          Chef::Platform.windows? ? MvWindows.new() : MvUnix.new()
+          Chef::Platform.windows? ? MvWindows.new : MvUnix.new
         else
-          Cp.new()
+          Cp.new
         end
       end
     end

data/lib/chef/formatters/base.rb

@@ -52,7 +52,7 @@ class Chef
     # TODO: is it too clever to be defining new() on a module like this?
     def self.new(name, out, err)
       formatter_class = by_name(name.to_s)
-      raise UnknownFormatter, "No output formatter found for #{name} (available: #{available_formatters.join(', ')})" unless formatter_class
+      raise UnknownFormatter, "No output formatter found for #{name} (available: #{available_formatters.join(", ")})" unless formatter_class
 
       formatter_class.new(out, err)
     end
@@ -146,8 +146,7 @@ class Chef
       # Formatters::Base can implement #file_loaded to do the same thing for
       # every kind of file that Chef loads from a recipe instead of
       # implementing all the per-filetype callbacks.
-      def file_loaded(path)
-      end
+      def file_loaded(path); end
 
       # Generic callback for any attribute/library/lwrp/recipe file throwing an
       # exception when loaded. Default behavior is to use CompileErrorInspector
@@ -222,7 +221,7 @@ class Chef
       end
 
       def is_structured_deprecation?(deprecation)
-        deprecation.kind_of?(Chef::Deprecated::Base)
+        deprecation.is_a?(Chef::Deprecated::Base)
       end
 
       def is_formatter?

data/lib/chef/formatters/doc.rb

@@ -53,7 +53,7 @@ class Chef
       def run_completed(node)
         @end_time = Time.now
         # Print out deprecations.
-        if !deprecations.empty?
+        unless deprecations.empty?
           puts_line ""
           puts_line "Deprecated features used!"
           deprecations.each do |message, details|
@@ -93,23 +93,19 @@ class Chef
       end
 
       # Called right after ohai runs.
-      def ohai_completed(node)
-      end
+      def ohai_completed(node); end
 
       # Already have a client key, assuming this node has registered.
-      def skipping_registration(node_name, config)
-      end
+      def skipping_registration(node_name, config); end
 
       # About to attempt to register as +node_name+
       def registration_start(node_name, config)
         puts_line "Creating a new client identity for #{node_name} using the validator key."
       end
 
-      def registration_completed
-      end
+      def registration_completed; end
 
-      def node_load_start(node_name, config)
-      end
+      def node_load_start(node_name, config); end
 
       # Failed to load node data from the server
       def node_load_failed(node_name, exception, config)
@@ -118,8 +114,7 @@ class Chef
 
       # Default and override attrs from roles have been computed, but not yet applied.
       # Normal attrs from JSON have been added to the node.
-      def node_load_completed(node, expanded_run_list, config)
-      end
+      def node_load_completed(node, expanded_run_list, config); end
 
       def policyfile_loaded(policy)
         puts_line "Using policy '#{policy["name"]}' at revision '#{policy["revision_id"]}'"
@@ -137,22 +132,18 @@ class Chef
       end
 
       # Called when the cookbook collection is returned from the server.
-      def cookbook_resolution_complete(cookbook_collection)
-      end
+      def cookbook_resolution_complete(cookbook_collection); end
 
       # Called before unneeded cookbooks are removed
-      def cookbook_clean_start
-      end
+      def cookbook_clean_start; end
 
       # Called after the file at +path+ is removed. It may be removed if the
       # cookbook containing it was removed from the run list, or if the file was
       # removed from the cookbook.
-      def removed_cookbook_file(path)
-      end
+      def removed_cookbook_file(path); end
 
       # Called when cookbook cleaning is finished.
-      def cookbook_clean_complete
-      end
+      def cookbook_clean_complete; end
 
       # Called before cookbook sync starts
       def cookbook_sync_start(cookbook_count)
@@ -166,8 +157,7 @@ class Chef
       end
 
       # Called when an individual file in a cookbook has been updated
-      def updated_cookbook_file(cookbook_name, path)
-      end
+      def updated_cookbook_file(cookbook_name, path); end
 
       # Called after all cookbooks have been sync'd.
       def cookbook_sync_complete
@@ -206,12 +196,10 @@ class Chef
       end
 
       # Called after a file in a cookbook is loaded.
-      def file_loaded(path)
-      end
+      def file_loaded(path); end
 
       # Called when recipes have been loaded.
-      def recipe_load_complete
-      end
+      def recipe_load_complete; end
 
       # Called before convergence starts
       def converge_start(run_context)
@@ -263,8 +251,7 @@ class Chef
       end
 
       # Called when a resource fails, but will retry.
-      def resource_failed_retriable(resource, action, retry_count, exception)
-      end
+      def resource_failed_retriable(resource, action, retry_count, exception); end
 
       # Called when a resource fails and will not be retried.
       def resource_failed(resource, action, exception)
@@ -281,8 +268,7 @@ class Chef
       end
 
       # Called after #load_current_resource has run.
-      def resource_current_state_loaded(resource, action, current_resource)
-      end
+      def resource_current_state_loaded(resource, action, current_resource); end
 
       # Called when a resource has no converge actions, e.g., it was already correct.
       def resource_up_to_date(resource, action)
@@ -296,8 +282,7 @@ class Chef
         unindent
       end
 
-      def output_record(line)
-      end
+      def output_record(line); end
 
       # Called when a change has been made to a resource. May be called multiple
       # times per resource, e.g., a file may have its content updated, and then
@@ -306,10 +291,11 @@ class Chef
         prefix = Chef::Config[:why_run] ? "Would " : ""
         Array(update).each do |line|
           next if line.nil?
+
           output_record line
-          if line.kind_of? String
+          if line.is_a? String
             start_line "- #{prefix}#{line}", :green
-          elsif line.kind_of? Array
+          elsif line.is_a? Array
             # Expanded output - delta
             # @todo should we have a resource_update_delta callback?
             line.each do |detail|
@@ -358,6 +344,7 @@ class Chef
       # in whyrun mode, in order to allow execution to continue
       def whyrun_assumption(action, resource, message)
         return unless message
+
         [ message ].flatten.each do |line|
           start_line("* #{line}", :yellow)
         end
@@ -366,6 +353,7 @@ class Chef
       # Called when an assertion declared by a provider fails
       def provider_requirement_failed(action, resource, exception, message)
         return unless message
+
         color = Chef::Config[:why_run] ? :yellow : :red
         [ message ].flatten.each do |line|
           start_line("* #{line}", color)

data/lib/chef/formatters/error_inspectors/cookbook_resolve_error_inspector.rb

@@ -143,14 +143,15 @@ class Chef
           # "{\"error\":[\"{\\\"non_existent_cookbooks\\\":[\\\"nope\\\"],\\\"cookbooks_with_no_versions\\\":[],\\\"message\\\":\\\"Run list contains invalid items: no such cookbook nope.\\\"}\"]}"
 
           wrapped_error_message = attempt_json_parse(exception.response.body)
-          unless wrapped_error_message.kind_of?(Hash) && wrapped_error_message.key?("error")
+          unless wrapped_error_message.is_a?(Hash) && wrapped_error_message.key?("error")
             return wrapped_error_message.to_s
           end
 
           error_description = Array(wrapped_error_message["error"]).first
-          if error_description.kind_of?(Hash)
+          if error_description.is_a?(Hash)
             return error_description
           end
+
           attempt_json_parse(error_description)
         end
 

data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb

@@ -55,7 +55,7 @@ class Chef
           if Chef::Platform.windows?
             require_relative "../../win32/security"
 
-            if !Chef::ReservedNames::Win32::Security.has_admin_privileges?
+            unless Chef::ReservedNames::Win32::Security.has_admin_privileges?
               error_description.section("Missing Windows Admin Privileges", "#{Chef::Dist::CLIENT} doesn't have administrator privileges. This can be a possible reason for the resource failure.")
             end
           end
@@ -63,9 +63,11 @@ class Chef
 
         def recipe_snippet
           return nil if dynamic_resource?
+
           @snippet ||= begin
             if (file = parse_source) && (line = parse_line(file))
               return nil unless ::File.exists?(file)
+
               lines = IO.readlines(file)
 
               relevant_lines = ["# In #{file}\n\n"]