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

data/lib/chef/provider/service/upstart.rb

@@ -32,7 +32,7 @@ class Chef
           Chef::Platform::ServiceHelpers.service_resource_providers.include?(:upstart)
         end
 
-        UPSTART_STATE_FORMAT = /\S+ \(?(start|stop)?\)? ?[\/ ](\w+)/.freeze
+        UPSTART_STATE_FORMAT = %r{\S+ \(?(start|stop)?\)? ?[/ ](\w+)}.freeze
 
         # Returns true if the configs for the service name has upstart variable
         def self.supports?(resource, action)
@@ -51,6 +51,7 @@ class Chef
         def initialize(new_resource, run_context)
           # TODO: re-evaluate if this is needed after integrating cookbook fix
           raise ArgumentError, "run_context cannot be nil" unless run_context
+
           super
 
           run_context.node
@@ -82,7 +83,7 @@ class Chef
           # Do not call super, only call shared requirements
           shared_resource_requirements
           requirements.assert(:all_actions) do |a|
-            if !@command_success
+            unless @command_success
               whyrun_msg = if @new_resource.status_command
                              "Provided status command #{@new_resource.status_command} failed."
                            else

data/lib/chef/provider/service/windows.rb

@@ -103,7 +103,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
               if ex.errno == ERROR_SERVICE_LOGON_FAILED
                 logger.error ex.message
                 raise Chef::Exceptions::Service,
-                "Service #{@new_resource} did not start due to a logon failure (error #{ERROR_SERVICE_LOGON_FAILED}): possibly the specified user '#{@new_resource.run_as_user}' does not have the 'log on as a service' privilege, or the password is incorrect."
+                  "Service #{@new_resource} did not start due to a logon failure (error #{ERROR_SERVICE_LOGON_FAILED}): possibly the specified user '#{@new_resource.run_as_user}' does not have the 'log on as a service' privilege, or the password is incorrect."
               else
                 raise ex
               end
@@ -209,10 +209,10 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
     end
 
     converge_if_changed :service_type, :startup_type, :error_control,
-                        :binary_path_name, :load_order_group, :dependencies,
-                        :run_as_user, :display_name, :description do
-      Win32::Service.configure(windows_service_config(:configure))
-    end
+      :binary_path_name, :load_order_group, :dependencies,
+      :run_as_user, :display_name, :description do
+        Win32::Service.configure(windows_service_config(:configure))
+      end
 
     converge_delayed_start
   end
@@ -307,7 +307,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
 
   # remove characters that make for broken or wonky filenames.
   def clean_username_for_path(username)
-    username.gsub(/[\/\\. ]+/, "_")
+    username.gsub(%r{[/\\. ]+}, "_")
   end
 
   def canonicalize_username(username)
@@ -330,6 +330,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
     loop do
       break if current_state == desired_state
       raise Timeout::Error if ( retries += 1 ) > resource_timeout
+
       sleep 1
     end
   end

data/lib/chef/provider/subversion.rb

@@ -36,7 +36,7 @@ class Chef
       def load_current_resource
         @current_resource = Chef::Resource::Subversion.new(new_resource.name)
 
-        unless [:export, :force_export].include?(Array(new_resource.action).first)
+        unless %i{export force_export}.include?(Array(new_resource.action).first)
           if current_revision = find_current_revision
             current_resource.revision current_revision
           end
@@ -137,6 +137,7 @@ class Chef
 
       def find_current_revision
         return nil unless ::File.exist?(::File.join(new_resource.destination, ".svn"))
+
         command = scm(:info)
         svn_info = shell_out!(command, run_options(cwd: cwd, returns: [0, 1])).stdout
 
@@ -175,6 +176,7 @@ class Chef
         rev = (repo_attrs["Last Changed Rev"] || repo_attrs["Revision"])
         rev.strip! if rev
         raise "Could not parse `svn info` data: #{svn_info}" if repo_attrs.empty?
+
         logger.trace "#{new_resource} resolved revision #{new_resource.revision} to #{rev}"
         rev
       end
@@ -185,6 +187,7 @@ class Chef
       # and will respond appropriately.
       def authentication
         return "" unless new_resource.svn_username
+
         result = "--username #{new_resource.svn_username} "
         result << "--password #{new_resource.svn_password} "
         result

data/lib/chef/provider/template.rb

@@ -51,6 +51,7 @@ class Chef
       def managing_content?
         return true if new_resource.checksum
         return true if !new_resource.source.nil? && @action != :create_if_missing
+
         false
       end
 

data/lib/chef/provider/user.rb

@@ -109,7 +109,7 @@ class Chef
       def compare_user
         return true if !new_resource.home.nil? && Pathname.new(new_resource.home).cleanpath != Pathname.new(current_resource.home).cleanpath
 
-        [ :comment, :shell, :password, :uid, :gid ].each do |user_attrib|
+        %i{comment shell password uid gid}.each do |user_attrib|
           return true if !new_resource.send(user_attrib).nil? && new_resource.send(user_attrib).to_s != current_resource.send(user_attrib).to_s
         end
 
@@ -132,6 +132,7 @@ class Chef
 
       def action_remove
         return unless @user_exists
+
         converge_by("remove user #{new_resource.username}") do
           remove_user
           logger.info("#{new_resource} removed")
@@ -140,6 +141,7 @@ class Chef
 
       def action_manage
         return unless @user_exists && compare_user
+
         converge_by("manage user #{new_resource.username}") do
           manage_user
           logger.info("#{new_resource} managed")
@@ -148,6 +150,7 @@ class Chef
 
       def action_modify
         return unless compare_user
+
         converge_by("modify user #{new_resource.username}") do
           manage_user
           logger.info("#{new_resource} modified")
@@ -213,6 +216,7 @@ class Chef
       def updating_home?
         return false if new_resource.home.nil?
         return true if current_resource.home.nil?
+
         # Pathname#cleanpath matches more edge conditions than File.expand_path()
         new_resource.home && Pathname.new(current_resource.home).cleanpath != Pathname.new(new_resource.home).cleanpath
       end

data/lib/chef/provider/user/aix.rb

@@ -32,6 +32,7 @@ class Chef
           add_password
           manage_home
           return if universal_options.empty? && usermod_options.empty?
+
           shell_out!("usermod", universal_options, usermod_options, new_resource.username)
         end
 
@@ -107,6 +108,7 @@ class Chef
 
         def add_password
           return unless current_resource.password != new_resource.password && new_resource.password
+
           logger.trace("#{new_resource.username} setting password to #{new_resource.password}")
           command = "echo '#{new_resource.username}:#{new_resource.password}' | chpasswd -e"
           shell_out!(command)
@@ -115,6 +117,7 @@ class Chef
         # Aix specific handling to update users home directory.
         def manage_home
           return unless updating_home? && new_resource.manage_home
+
           # -m option does not work on aix, so move dir.
           if ::File.directory?(current_resource.home)
             logger.trace("Changing users home directory from #{current_resource.home} to #{new_resource.home}")

data/lib/chef/provider/user/dscl.rb

@@ -128,7 +128,7 @@ in 'password', with the associated 'salt' and 'iterations'.")
                 # Convert the salt from Base64 encoding to hex before consuming them
                 current_resource.salt(shadow_hash["SALTED-SHA512-PBKDF2"]["salt"].string.unpack("H*").first)
               else
-                raise(Chef::Exceptions::User, "Unknown shadow_hash format: #{shadow_hash.keys.join(' ')}")
+                raise(Chef::Exceptions::User, "Unknown shadow_hash format: #{shadow_hash.keys.join(" ")}")
               end
             end
 
@@ -230,6 +230,7 @@ in 'password', with the associated 'salt' and 'iterations'.")
         #
         def uid_used?(uid)
           return false unless uid
+
           users_uids = run_dscl("list", "/Users", "uid").split("\n")
           uid_map = users_uids.each_with_object({}) do |tuid, tmap|
             x = tuid.split
@@ -290,7 +291,7 @@ in 'password', with the associated 'salt' and 'iterations'.")
         end
 
         def validate_home_dir_specification!
-          unless new_resource.home =~ /^\//
+          unless new_resource.home =~ %r{^/}
             raise(Chef::Exceptions::InvalidHomeDirectory, "invalid path spec for User: '#{new_resource.username}', home directory: '#{new_resource.home}'")
           end
         end
@@ -343,7 +344,7 @@ in 'password', with the associated 'salt' and 'iterations'.")
           # Shadow info is saved as binary plist. Convert the info to binary plist.
           shadow_info_binary = StringIO.new
           shell_out("plutil", "-convert", "binary1", "-o", "-", "-",
-                            input: shadow_info.to_plist, live_stream: shadow_info_binary)
+            input: shadow_info.to_plist, live_stream: shadow_info_binary)
 
           if user_info.nil?
             # User is  just created. read_user_info() will read the fresh information
@@ -562,6 +563,7 @@ in 'password', with the associated 'salt' and 'iterations'.")
         #
         def dscl_set(user_hash, key, value)
           raise "Unknown dscl key #{key}" unless DSCL_PROPERTY_MAP.keys.include?(key)
+
           user_hash[DSCL_PROPERTY_MAP[key]] = [ value ]
           user_hash
         end
@@ -571,6 +573,7 @@ in 'password', with the associated 'salt' and 'iterations'.")
         #
         def dscl_get(user_hash, key)
           raise "Unknown dscl key #{key}" unless DSCL_PROPERTY_MAP.keys.include?(key)
+
           # DSCL values are set as arrays
           value = user_hash[DSCL_PROPERTY_MAP[key]]
           value.nil? ? value : value.first
@@ -585,12 +588,14 @@ in 'password', with the associated 'salt' and 'iterations'.")
           return "" if ( args.first =~ /^delete/ ) && ( result.exitstatus != 0 )
           raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") unless result.exitstatus == 0
           raise(Chef::Exceptions::DsclCommandFailed, "dscl error: #{result.inspect}") if result.stdout =~ /No such key: /
+
           result.stdout
         end
 
         def run_plutil(*args)
           result = shell_out("plutil", "-#{args[0]}", args[1..-1])
           raise(Chef::Exceptions::PlistUtilCommandFailed, "plutil error: #{result.inspect}") unless result.exitstatus == 0
+
           if result.stdout.encoding == Encoding::ASCII_8BIT
             result.stdout.encode("utf-8", "binary", undef: :replace, invalid: :replace, replace: "?")
           else

data/lib/chef/provider/user/linux.rb

@@ -93,6 +93,7 @@ class Chef
           # checking "does not exist" has to come before exit code handling since centos and ubuntu differ in exit codes
           if passwd_s.stderr =~ /does not exist/
             return false if whyrun_mode?
+
             raise Chef::Exceptions::User, "User #{new_resource.username} does not exist when checking lock status for #{new_resource}"
           end
 

data/lib/chef/provider/user/pw.rb

@@ -77,6 +77,7 @@ class Chef
           field_list.sort_by { |a| a[0] }.each do |field, option|
             field_symbol = field.to_sym
             next unless current_resource.send(field_symbol) != new_resource.send(field_symbol)
+
             if new_resource.send(field_symbol)
               logger.trace("#{new_resource} setting #{field} to #{new_resource.send(field_symbol)}")
               opts << option

data/lib/chef/provider/user/solaris.rb

@@ -37,6 +37,7 @@ class Chef
         def manage_user
           manage_password
           return if universal_options.empty? && usermod_options.empty?
+
           shell_out!("usermod", universal_options, usermod_options, new_resource.username)
         end
 
@@ -112,6 +113,7 @@ class Chef
 
         def manage_password
           return unless current_resource.password != new_resource.password && new_resource.password
+
           logger.trace("#{new_resource} setting password to #{new_resource.password}")
           write_shadow_file
         end

data/lib/chef/provider/user/windows.rb

@@ -65,7 +65,7 @@ class Chef
             logger.trace("#{new_resource} password has changed")
             return true
           end
-          [ :uid, :comment, :home, :shell, :full_name ].any? do |user_attrib|
+          %i{uid comment home shell full_name}.any? do |user_attrib|
             !new_resource.send(user_attrib).nil? && new_resource.send(user_attrib) != current_resource.send(user_attrib)
           end
         end
@@ -110,6 +110,7 @@ class Chef
             field_symbol = field.to_sym
             next unless current_resource.send(field_symbol) != new_resource.send(field_symbol)
             next unless new_resource.send(field_symbol)
+
             unless field_symbol == :password
               logger.trace("#{new_resource} setting #{field} to #{new_resource.send(field_symbol)}")
             end

data/lib/chef/provider/windows_env.rb

@@ -67,6 +67,7 @@ class Chef
           new_values.inject(0) do |index, val|
             next_index = current_values.find_index val
             return true if next_index.nil? || next_index < index
+
             next_index
           end
           false
@@ -99,6 +100,7 @@ class Chef
       #           after we removed the element.
       def delete_element
         return false unless new_resource.delim # no delim: delete the key
+
         needs_delete = new_values.any? { |v| current_values.include?(v) }
         if !needs_delete
           logger.trace("#{new_resource} element '#{new_resource.value}' does not exist")
@@ -191,6 +193,7 @@ class Chef
 
       def env_obj(key_name)
         return @env_obj if @env_obj
+
         wmi = WmiLite::Wmi.new
         # Note that by design this query is case insensitive with regard to key_name
         environment_variables = wmi.query("select * from Win32_Environment where name = '#{key_name}'")

data/lib/chef/provider/windows_script.rb

@@ -58,7 +58,7 @@ class Chef
         rescue
           raise
         ensure
-          if ! wow64_redirection_state.nil?
+          unless wow64_redirection_state.nil?
             restore_wow64_file_redirection(@run_context.node, wow64_redirection_state)
           end
         end

data/lib/chef/provider/windows_task.rb

@@ -446,7 +446,7 @@ class Chef
         def days_of_month
           days_of_month = []
           if new_resource.day
-            days = new_resource.day.split(",")
+            days = new_resource.day.to_s.split(",")
             days.map! { |day| day.to_s.strip.upcase }
             days.delete("LAST") if days.include?("LAST")
             days.delete("LASTDAY") if days.include?("LASTDAY")
@@ -466,7 +466,7 @@ class Chef
           if new_resource.day
             # this line of code is just to support backward compatibility of wild card *
             new_resource.day = "mon, tue, wed, thu, fri, sat, sun" if new_resource.day == "*" && new_resource.frequency == :weekly
-            days = new_resource.day.split(",")
+            days = new_resource.day.to_s.split(",")
             days.map! { |day| day.to_s.strip.upcase }
             weeks_days = get_binary_values_from_constants(days, DAYS_OF_WEEK)
           else
@@ -603,7 +603,8 @@ class Chef
           validate << "Command" if new_resource.command.nil? || new_resource.command.empty?
           validate << "Task Name" if new_resource.task_name.nil? || new_resource.task_name.empty?
           return true if validate.empty?
-          raise Chef::Exceptions::ValidationFailed.new "Value for '#{validate.join(', ')}' option cannot be empty"
+
+          raise Chef::Exceptions::ValidationFailed.new "Value for '#{validate.join(", ")}' option cannot be empty"
         end
 
         # rubocop:disable Style/StringLiteralsInInterpolation

data/lib/chef/provider/yum_repository.rb

@@ -30,8 +30,7 @@ class Chef
         which "yum"
       end
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :create do
         declare_resource(:template, "/etc/yum.repos.d/#{new_resource.repositoryid}.repo") do

data/lib/chef/provider/zypper_repository.rb

@@ -28,8 +28,7 @@ class Chef
     class ZypperRepository < Chef::Provider
       provides :zypper_repository, platform_family: "suse"
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :create do
         if new_resource.gpgautoimportkeys
@@ -135,7 +134,7 @@ class Chef
       def key_fingerprint(key_path)
         so = shell_out!("gpg --with-fingerprint #{key_path}")
         # expected output and match: http://rubular.com/r/BpfMjxySQM
-        fingerprint = /pub\s*\S*\/(\S*)/.match(so.stdout)[1].downcase
+        fingerprint = %r{pub\s*\S*/(\S*)}.match(so.stdout)[1].downcase
         logger.trace("GPG fingerprint of key at #{key_path} is #{fingerprint}")
         fingerprint
       end

data/lib/chef/recipe.rb

@@ -47,6 +47,7 @@ class Chef
         [ $1.to_sym, $2 ]
       when /^::(.+)/
         raise "current_cookbook is nil, cannot resolve #{recipe_name}" if current_cookbook.nil?
+
         [ current_cookbook.to_sym, $1 ]
       else
         [ recipe_name.to_sym, "default" ]
@@ -58,7 +59,7 @@ class Chef
       @recipe_name = recipe_name
       @run_context = run_context
       # TODO: 5/19/2010 cw/tim: determine whether this can be removed
-      @params = Hash.new
+      @params = {}
     end
 
     # Used in DSL mixins

data/lib/chef/resource.rb

@@ -121,7 +121,7 @@ class Chef
                 end
 
       @before = nil
-      @params = Hash.new
+      @params = {}
       @provider = nil
       @allowed_actions = self.class.allowed_actions.to_a
       @action = self.class.default_action
@@ -516,6 +516,7 @@ class Chef
         result[property.name] = send(property.name)
       end
       return result.values.first if identity_properties.size == 1
+
       result
     end
 
@@ -581,6 +582,7 @@ class Chef
 
       begin
         return if should_skip?(action)
+
         provider_for_action(action).run_action
       rescue StandardError => e
         if ignore_failure
@@ -629,6 +631,7 @@ class Chef
 
     def to_text
       return "suppressed sensitive resource output" if sensitive
+
       text = "# Declared in #{@source_line}\n\n"
       text << "#{resource_name}(\"#{name}\") do\n"
 
@@ -641,7 +644,7 @@ class Chef
         end
       end
 
-      ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS
+      ivars = instance_variables.map(&:to_sym) - HIDDEN_IVARS
       ivars.each do |ivar|
         iv = ivar.to_s.sub(/^@/, "")
         if all_props.keys.include?(iv)
@@ -662,7 +665,7 @@ class Chef
     end
 
     def inspect
-      ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
+      ivars = instance_variables.map(&:to_sym) - FORBIDDEN_IVARS
       ivars.inject("<#{self}") do |str, ivar|
         str << " #{ivar}: #{instance_variable_get(ivar).inspect}"
       end << ">"
@@ -672,8 +675,8 @@ class Chef
     # is loaded. activesupport will call as_json and skip over to_json. This ensure
     # json is encoded as expected
     def as_json(*a)
-      safe_ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
-      instance_vars = Hash.new
+      safe_ivars = instance_variables.map(&:to_sym) - FORBIDDEN_IVARS
+      instance_vars = {}
       safe_ivars.each do |iv|
         instance_vars[iv.to_s.sub(/^@/, "")] = instance_variable_get(iv)
       end
@@ -695,10 +698,11 @@ class Chef
       self.class.state_properties.each do |p|
         result[p.name] = p.get(self)
       end
-      safe_ivars = instance_variables.map { |ivar| ivar.to_sym } - FORBIDDEN_IVARS
+      safe_ivars = instance_variables.map(&:to_sym) - FORBIDDEN_IVARS
       safe_ivars.each do |iv|
         key = iv.to_s.sub(/^@/, "").to_sym
         next if result.key?(key)
+
         result[key] = instance_variable_get(iv)
       end
       result
@@ -746,7 +750,7 @@ class Chef
     # @see Chef::Resource.action_class
     #
     def provider(arg = nil)
-      klass = if arg.kind_of?(String) || arg.kind_of?(Symbol)
+      klass = if arg.is_a?(String) || arg.is_a?(Symbol)
                 lookup_provider_constant(arg)
               else
                 arg
@@ -779,7 +783,7 @@ class Chef
     # @return [Array<Symbol>] All property names with desired state.
     #
     def self.state_attrs(*names)
-      state_properties(*names).map { |property| property.name }
+      state_properties(*names).map(&:name)
     end
 
     #
@@ -809,8 +813,9 @@ class Chef
     def self.identity_property(name = nil)
       result = identity_properties(*Array(name))
       if result.size > 1
-        raise Chef::Exceptions::MultipleIdentityError, "identity_property cannot be called on an object with more than one identity property (#{result.map { |r| r.name }.join(", ")})."
+        raise Chef::Exceptions::MultipleIdentityError, "identity_property cannot be called on an object with more than one identity property (#{result.map(&:name).join(", ")})."
       end
+
       result.first
     end
 
@@ -830,7 +835,8 @@ class Chef
     #
     def self.identity_attr(name = nil)
       property = identity_property(name)
-      return nil if !property
+      return nil unless property
+
       property.name
     end
 
@@ -951,7 +957,7 @@ class Chef
         if name
           name = name.to_sym
           # If our class is not already providing this name, provide it.
-          if !Chef::ResourceResolver.includes_handler?(name, self)
+          unless Chef::ResourceResolver.includes_handler?(name, self)
             provides name, canonical: true
           end
           @resource_name = name
@@ -1104,6 +1110,7 @@ class Chef
       if provider.whyrun_mode? && !provider.whyrun_supported?
         raise "Cannot retrieve #{self.class.current_resource} in why-run mode: #{provider} does not support why-run"
       end
+
       provider.load_current_resource
       provider.current_resource
     end
@@ -1190,9 +1197,9 @@ class Chef
     #
 
     # FORBIDDEN_IVARS do not show up when the resource is converted to JSON (ie. hidden from data_collector and sending to the chef server via #to_json/to_h/as_json/inspect)
-    FORBIDDEN_IVARS = [:@run_context, :@logger, :@not_if, :@only_if, :@enclosing_provider, :@description, :@introduced, :@examples, :@validation_message, :@deprecated, :@default_description, :@skip_docs, :@executed_by_runner].freeze
+    FORBIDDEN_IVARS = %i{@run_context @logger @not_if @only_if @enclosing_provider @description @introduced @examples @validation_message @deprecated @default_description @skip_docs @executed_by_runner}.freeze
     # HIDDEN_IVARS do not show up when the resource is displayed to the user as text (ie. in the error inspector output via #to_text)
-    HIDDEN_IVARS = [:@allowed_actions, :@resource_name, :@source_line, :@run_context, :@logger, :@name, :@not_if, :@only_if, :@elapsed_time, :@enclosing_provider, :@description, :@introduced, :@examples, :@validation_message, :@deprecated, :@default_description, :@skip_docs, :@executed_by_runner].freeze
+    HIDDEN_IVARS = %i{@allowed_actions @resource_name @source_line @run_context @logger @name @not_if @only_if @elapsed_time @enclosing_provider @description @introduced @examples @validation_message @deprecated @default_description @skip_docs @executed_by_runner}.freeze
 
     include Chef::Mixin::ConvertToClassName
     extend Chef::Mixin::ConvertToClassName
@@ -1289,7 +1296,7 @@ class Chef
     # life as well.
     @@sorted_descendants = nil
     def self.sorted_descendants
-      @@sorted_descendants ||= descendants.sort_by { |x| x.to_s }
+      @@sorted_descendants ||= descendants.sort_by(&:to_s)
     end
 
     def self.inherited(child)
@@ -1376,6 +1383,7 @@ class Chef
     # the declared key we want to fall back on the old to_s key.
     def declared_key
       return to_s if declared_type.nil?
+
       "#{declared_type}[#{@name}]"
     end
 
@@ -1542,6 +1550,7 @@ class Chef
     def self.resource_for_node(short_name, node)
       klass = Chef::ResourceResolver.resolve(short_name, node: node)
       raise Chef::Exceptions::NoSuchResourceType.new(short_name, node) if klass.nil?
+
       klass
     end
 
@@ -1580,7 +1589,7 @@ class Chef
     def self.remove_canonical_dsl
       if @resource_name
         remaining = Chef.resource_handler_map.delete_canonical(@resource_name, self)
-        if !remaining
+        unless remaining
           Chef::DSL::Resources.remove_resource_dsl(@resource_name)
         end
       end