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

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

@@ -54,6 +54,7 @@ class Chef
 
         def set_members(members)
           return if members.empty?
+
           shell_out!("chgrpmem", "-m", "=", members.join(","), new_resource.group_name)
         end
 
@@ -65,6 +66,7 @@ class Chef
           opts = []
           { gid: "id" }.sort_by { |a| a[0] }.each do |field, option|
             next unless current_resource.send(field) != new_resource.send(field)
+
             if new_resource.send(field)
               logger.trace("#{new_resource} setting #{field} to #{new_resource.send(field)}")
               opts << "#{option}=#{new_resource.send(field)}"

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

@@ -40,6 +40,7 @@ class Chef
           return "" if ( args.first =~ /^delete/ ) && ( result[1].exitstatus != 0 )
           raise(Chef::Exceptions::Group, "dscl error: #{result.inspect}") unless result[1].exitstatus == 0
           raise(Chef::Exceptions::Group, "dscl error: #{result.inspect}") if result[2] =~ /No such key: /
+
           result[2]
         end
 
@@ -88,6 +89,7 @@ class Chef
 
         def gid_used?(gid)
           return false unless gid
+
           search_gids = safe_dscl("search", "/Groups", "PrimaryGroupID", gid.to_s)
 
           # dscl -search should not return anything if the gid doesn't exist,
@@ -99,13 +101,14 @@ class Chef
         def set_gid
           new_resource.gid(get_free_gid) if [nil, ""].include? new_resource.gid
           raise(Chef::Exceptions::Group, "gid is already in use") if gid_used?(new_resource.gid)
+
           safe_dscl("create", "/Groups/#{new_resource.group_name}", "PrimaryGroupID", new_resource.gid)
         end
 
         def set_members
           # First reset the memberships if the append is not set
           unless new_resource.append
-            logger.trace("#{new_resource} removing group members #{current_resource.members.join(' ')}") unless current_resource.members.empty?
+            logger.trace("#{new_resource} removing group members #{current_resource.members.join(" ")}") unless current_resource.members.empty?
             safe_dscl("create", "/Groups/#{new_resource.group_name}", "GroupMembers", "") # clear guid list
             safe_dscl("create", "/Groups/#{new_resource.group_name}", "GroupMembership", "") # clear user list
             current_resource.members([ ])
@@ -118,7 +121,7 @@ class Chef
               members_to_be_added << member unless current_resource.members.include?(member)
             end
             unless members_to_be_added.empty?
-              logger.trace("#{new_resource} setting group members #{members_to_be_added.join(', ')}")
+              logger.trace("#{new_resource} setting group members #{members_to_be_added.join(", ")}")
               safe_dscl("append", "/Groups/#{new_resource.group_name}", "GroupMembership", *members_to_be_added)
             end
           end
@@ -130,7 +133,7 @@ class Chef
               members_to_be_removed << member if current_resource.members.include?(member)
             end
             unless members_to_be_removed.empty?
-              logger.trace("#{new_resource} removing group members #{members_to_be_removed.join(', ')}")
+              logger.trace("#{new_resource} removing group members #{members_to_be_removed.join(", ")}")
               safe_dscl("delete", "/Groups/#{new_resource.group_name}", "GroupMembership", *members_to_be_removed)
             end
           end

data/lib/chef/provider/group/groupadd.rb

@@ -111,6 +111,7 @@ class Chef
           { gid: "-g" }.sort_by { |a| a[0] }.each do |field, option|
             next unless current_resource.send(field) != new_resource.send(field)
             next unless new_resource.send(field)
+
             opts << option
             opts << new_resource.send(field)
             logger.trace("#{new_resource} set #{field} to #{new_resource.send(field)}")

data/lib/chef/provider/group/groupmod.rb

@@ -84,7 +84,7 @@ class Chef
 
         # Adds a list of usernames to the group using `user mod`
         def add_group_members(members)
-          logger.trace("#{new_resource} adding members #{members.join(', ')}") unless members.empty?
+          logger.trace("#{new_resource} adding members #{members.join(", ")}") unless members.empty?
           members.each do |user|
             shell_out!("user", "mod", "-G", new_resource.group_name, user)
           end

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

@@ -44,7 +44,7 @@ class Chef
             # new or existing group. Because pw groupadd does not support the -m
             # and -d options used by manage_group, we treat group creation as a
             # special case and use -M.
-            logger.trace("#{new_resource} setting group members: #{new_resource.members.join(',')}")
+            logger.trace("#{new_resource} setting group members: #{new_resource.members.join(",")}")
             command += [ "-M", new_resource.members.join(",") ]
           end
 
@@ -119,12 +119,12 @@ class Chef
           end
 
           unless members_to_be_added.empty?
-            logger.trace("#{new_resource} adding group members: #{members_to_be_added.join(',')}")
+            logger.trace("#{new_resource} adding group members: #{members_to_be_added.join(",")}")
             opts << [ "-m", members_to_be_added.join(",") ]
           end
 
           unless members_to_be_removed.empty?
-            logger.trace("#{new_resource} removing group members: #{members_to_be_removed.join(',')}")
+            logger.trace("#{new_resource} removing group members: #{members_to_be_removed.join(",")}")
             opts << [ "-d", members_to_be_removed.join(",") ]
           end
 

data/lib/chef/provider/group/suse.rb

@@ -45,8 +45,8 @@ class Chef
                 false
               end
             end
-            a.failure_message Chef::Exceptions::Group, "Could not add users #{to_add(new_resource.members).join(', ')} to #{new_resource.group_name}: one of these users does not exist"
-            a.whyrun "Could not find one of these users: #{to_add(new_resource.members).join(', ')}. Assuming it will be created by a prior step"
+            a.failure_message Chef::Exceptions::Group, "Could not add users #{to_add(new_resource.members).join(", ")} to #{new_resource.group_name}: one of these users does not exist"
+            a.whyrun "Could not find one of these users: #{to_add(new_resource.members).join(", ")}. Assuming it will be created by a prior step"
           end
         end
 

data/lib/chef/provider/group/usermod.rb

@@ -59,6 +59,7 @@ class Chef
           unless new_resource.action.include?(:create)
             raise Chef::Exceptions::UnsupportedAction, "Setting members directly is not supported by #{self}"
           end
+
           members.each do |member|
             add_member(member)
           end

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

@@ -90,7 +90,7 @@ class Chef
         end
 
         def locally_qualified_name(account_name)
-          account_name.include?("\\") ? account_name : "#{ENV['COMPUTERNAME']}\\#{account_name}"
+          account_name.include?("\\") ? account_name : "#{ENV["COMPUTERNAME"]}\\#{account_name}"
         end
 
         def validate_member!(member)

data/lib/chef/provider/http_request.rb

@@ -120,7 +120,7 @@ class Chef
       private
 
       def check_message(message)
-        if message.kind_of?(Proc)
+        if message.is_a?(Proc)
           message.call
         else
           message

data/lib/chef/provider/ifconfig.rb

@@ -87,6 +87,7 @@ class Chef
             end
 
             next unless @interfaces.key?(new_resource.device)
+
             @interface = @interfaces.fetch(new_resource.device)
 
             current_resource.target(new_resource.target)
@@ -116,11 +117,11 @@ class Chef
                 @int_name = "nil"
               elsif line.match(addr_regex)[2] == ""
                 @int_name = line.match(addr_regex)[1]
-                @interfaces[@int_name] = Hash.new
+                @interfaces[@int_name] = {}
                 @interfaces[@int_name]["mtu"] = (line =~ /mtu (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /mtu/ && @interfaces[@int_name]["mtu"].nil?
               else
                 @int_name = "#{line.match(addr_regex)[1]}:#{line.match(addr_regex)[2]}"
-                @interfaces[@int_name] = Hash.new
+                @interfaces[@int_name] = {}
                 @interfaces[@int_name]["mtu"] = (line =~ /mtu (\S+)/ ? Regexp.last_match(1) : "nil") if line =~ /mtu/ && @interfaces[@int_name]["mtu"].nil?
               end
             else
@@ -132,6 +133,7 @@ class Chef
             end
 
             next unless @interfaces.key?(new_resource.device)
+
             @interface = @interfaces.fetch(new_resource.device)
 
             current_resource.target(new_resource.target)
@@ -144,6 +146,7 @@ class Chef
             current_resource.metric(@interface["metric"])
           end
         end
+
         current_resource
       end
 
@@ -162,7 +165,7 @@ class Chef
         unless current_resource.inet_addr
           unless new_resource.device == loopback_device
             command = add_command
-            converge_by("run #{command.join(' ')} to add #{new_resource}") do
+            converge_by("run #{command.join(" ")} to add #{new_resource}") do
               shell_out!(command)
               logger.info("#{new_resource} added")
             end
@@ -177,8 +180,9 @@ class Chef
         # enables, but does not manage config files
         return if current_resource.inet_addr
         return if new_resource.device == loopback_device
+
         command = enable_command
-        converge_by("run #{command.join(' ')} to enable #{new_resource}") do
+        converge_by("run #{command.join(" ")} to enable #{new_resource}") do
           shell_out!(command)
           logger.info("#{new_resource} enabled")
         end
@@ -188,7 +192,7 @@ class Chef
         # check to see if load_current_resource found the interface
         if current_resource.device
           command = delete_command
-          converge_by("run #{command.join(' ')} to delete #{new_resource}") do
+          converge_by("run #{command.join(" ")} to delete #{new_resource}") do
             shell_out!(command)
             logger.info("#{new_resource} deleted")
           end
@@ -203,7 +207,7 @@ class Chef
         # disables, but leaves config files in place.
         if current_resource.device
           command = disable_command
-          converge_by("run #{command.join(' ')} to disable #{new_resource}") do
+          converge_by("run #{command.join(" ")} to disable #{new_resource}") do
             shell_out!(command)
             logger.info("#{new_resource} disabled")
           end
@@ -222,6 +226,7 @@ class Chef
 
       def generate_config
         return unless can_generate_config?
+
         b = binding
         template = ::ERB.new(@config_template)
         config = resource_for_config(@config_path)
@@ -232,6 +237,7 @@ class Chef
 
       def delete_config
         return unless can_generate_config?
+
         config = resource_for_config(@config_path)
         config.run_action(:delete)
         new_resource.updated_by_last_action(true) if config.updated?

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

@@ -66,6 +66,7 @@ class Chef
         def add_command
           # ifconfig changes are temporary, chdev persist across reboots.
           raise Chef::Exceptions::Ifconfig, "interface metric property cannot be set for :add action" if new_resource.metric
+
           command = [ "chdev", "-l", new_resource.device, "-a", "netaddr=#{new_resource.name}" ]
           command += [ "-a", "netmask=#{new_resource.mask}" ] if new_resource.mask
           command += [ "-a", "mtu=#{new_resource.mtu}" ] if new_resource.mtu

data/lib/chef/provider/ifconfig/debian.rb

@@ -65,6 +65,7 @@ iface <%= new_resource.device %> <%= new_resource.family %> static
         def enforce_interfaces_dot_d_sanity
           # on ubuntu 18.04 there's no interfaces file and it uses interfaces.d by default
           return if ::File.directory?(INTERFACES_DOT_D_DIR) && !::File.exist?(INTERFACES_FILE)
+
           # create /etc/network/interfaces.d via dir resource (to get reporting, etc)
           dir = Chef::Resource::Directory.new(INTERFACES_DOT_D_DIR, run_context)
           dir.run_action(:create)

data/lib/chef/provider/launchd.rb

@@ -29,18 +29,18 @@ class Chef
       extend Forwardable
       provides :launchd, os: "darwin"
 
-      def_delegators :new_resource, *[
-        :backup,
-        :cookbook,
-        :group,
-        :label,
-        :mode,
-        :owner,
-        :path,
-        :source,
-        :session_type,
-        :type,
-      ]
+      def_delegators :new_resource, *%i{
+        backup
+        cookbook
+        group
+        label
+        mode
+        owner
+        path
+        source
+        session_type
+        type
+      }
 
       def load_current_resource
         current_resource = Chef::Resource::Launchd.new(new_resource.name)
@@ -90,6 +90,7 @@ class Chef
 
       def manage_plist(action)
         return unless manage_agent?(action)
+
         if source
           res = cookbook_file_resource
         else
@@ -102,6 +103,7 @@ class Chef
 
       def manage_service(action)
         return unless manage_agent?(action)
+
         res = service_resource
         res.run_action(action)
         new_resource.updated_by_last_action(true) if res.updated?
@@ -112,7 +114,7 @@ class Chef
         console_user = Etc.getpwuid(::File.stat("/dev/console").uid).name
         root = console_user == "root"
         agent = type == "agent"
-        invalid_action = [:delete, :disable, :enable, :restart].include?(action)
+        invalid_action = %i{delete disable enable restart}.include?(action)
         lltstype = ""
         if new_resource.limit_load_to_session_type
           lltstype = new_resource.limit_load_to_session_type
@@ -179,6 +181,7 @@ class Chef
 
       def gen_hash
         return nil unless new_resource.program || new_resource.program_arguments
+
         {
           "label" => "Label",
           "program" => "Program",

data/lib/chef/provider/lwrp_base.rb

@@ -42,8 +42,7 @@ class Chef
       # no-op `load_current_resource`. Allows simple LWRP providers to work
       # without defining this method explicitly (silences
       # Chef::Exceptions::Override exception)
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       # class methods
       class <<self

data/lib/chef/provider/mount.rb

@@ -167,6 +167,7 @@ class Chef
           if (tries -= 1) < 0
             raise Chef::Exceptions::Mount, "Retries exceeded waiting for filesystem to unmount"
           end
+
           sleep 0.1
         end
       end

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

@@ -110,7 +110,7 @@ class Chef
             when /#{search_device}\s+#{Regexp.escape(@new_resource.mount_point)}/
               mounted = true
               logger.trace("Special device #{device_logstring} mounted as #{@new_resource.mount_point}")
-            when /^[\/\w]+\s+#{Regexp.escape(@new_resource.mount_point)}\s+/
+            when %r{^[/\w]+\s+#{Regexp.escape(@new_resource.mount_point)}\s+}
               mounted = false
               logger.trace("Found conflicting mount point #{@new_resource.mount_point} in /etc/fstab")
             end
@@ -123,7 +123,7 @@ class Chef
             mountable?
             command = [ "mount", "-v", @new_resource.fstype ]
 
-            if !(@new_resource.options.nil? || @new_resource.options.empty?)
+            unless @new_resource.options.nil? || @new_resource.options.empty?
               command << "-o"
               command << @new_resource.options.join(",")
             end
@@ -146,7 +146,7 @@ class Chef
 
         def remount_command
           if !(@new_resource.options.nil? || @new_resource.options.empty?)
-            [ "mount", "-o", "remount,#{@new_resource.options.join(',')}", @new_resource.device, @new_resource.mount_point ]
+            [ "mount", "-o", "remount,#{@new_resource.options.join(",")}", @new_resource.device, @new_resource.mount_point ]
           else
             [ "mount", "-o", "remount", @new_resource.device, @new_resource.mount_point ]
           end
@@ -174,7 +174,7 @@ class Chef
             end
             fstab.puts("\tvfs\t\t= #{@new_resource.fstype}")
             fstab.puts("\tmount\t\t= false")
-            fstab.puts "\toptions\t\t= #{@new_resource.options.join(',')}" unless @new_resource.options.nil? || @new_resource.options.empty?
+            fstab.puts "\toptions\t\t= #{@new_resource.options.join(",")}" unless @new_resource.options.nil? || @new_resource.options.empty?
             logger.trace("#{@new_resource} is enabled at #{@new_resource.mount_point}")
           end
         end
@@ -196,14 +196,14 @@ class Chef
             found_device = false
             ::File.open("/etc/filesystems", "r").each_line do |line|
               case line
-              when /^\/.+:\s*$/
+              when %r{^/.+:\s*$}
                 if line =~ /#{Regexp.escape(@new_resource.mount_point)}+:/
                   found_device = true
                 else
                   found_device = false
                 end
               end
-              if !found_device
+              unless found_device
                 contents << line
               end
             end

data/lib/chef/provider/mount/mount.rb

@@ -47,6 +47,7 @@ class Chef
           elsif @new_resource.mount_point != "none" && !::File.exists?(@new_resource.mount_point)
             raise Chef::Exceptions::Mount, "Mount point #{@new_resource.mount_point} does not exist"
           end
+
           true
         end
 
@@ -70,7 +71,7 @@ class Chef
               @current_resource.pass($5.to_i)
               logger.trace("Found mount #{device_fstab} to #{@new_resource.mount_point} in /etc/fstab")
               next
-            when /^[\/\w]+\s+#{Regexp.escape(@new_resource.mount_point)}\s+/
+            when %r{^[/\w]+\s+#{Regexp.escape(@new_resource.mount_point)}\s+}
               enabled = false
               logger.trace("Found conflicting mount point #{@new_resource.mount_point} in /etc/fstab")
             end
@@ -95,7 +96,7 @@ class Chef
             when /^#{device_mount_regex}\s+on\s+#{Regexp.escape(real_mount_point)}\s/
               mounted = true
               logger.trace("Special device #{device_logstring} mounted as #{real_mount_point}")
-            when /^([\/\w])+\son\s#{Regexp.escape(real_mount_point)}\s+/
+            when %r{^([/\w])+\son\s#{Regexp.escape(real_mount_point)}\s+}
               mounted = false
               logger.trace("Special device #{$~[1]} mounted as #{real_mount_point}")
             end
@@ -137,7 +138,7 @@ class Chef
         end
 
         def remount_command
-          [ "mount", "-o", "remount,#{@new_resource.options.join(',')}", @new_resource.mount_point ]
+          [ "mount", "-o", "remount,#{@new_resource.options.join(",")}", @new_resource.mount_point ]
         end
 
         def remount_fs
@@ -200,7 +201,7 @@ class Chef
         end
 
         def network_device?
-          @new_resource.device =~ /:/ || @new_resource.device =~ /\/\//
+          @new_resource.device =~ /:/ || @new_resource.device =~ %r{//}
         end
 
         def device_should_exist?

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

@@ -93,7 +93,7 @@ class Chef
           # FIXME: Should remount always do the remount or only if the options change?
           actual_options = native_options(options)
           actual_options.delete("-")
-          mount_options = actual_options.empty? ? "" : ",#{actual_options.join(',')}"
+          mount_options = actual_options.empty? ? "" : ",#{actual_options.join(",")}"
           shell_out!("mount", "-o", "remount#{mount_options}", mount_point)
         end
 
@@ -158,7 +158,7 @@ class Chef
             when /^#{device_regex}\s+on\s+#{Regexp.escape(mount_point)}\s+/
               logger.trace("Special device #{device} is mounted as #{mount_point}")
               mounted = true
-            when /^([\/\w]+)\son\s#{Regexp.escape(mount_point)}\s+/
+            when %r{^([/\w]+)\son\s#{Regexp.escape(mount_point)}\s+}
               logger.trace("Special device #{Regexp.last_match[1]} is mounted as #{mount_point}")
               mounted = false
             end
@@ -180,7 +180,7 @@ class Chef
               # solaris /etc/vfstab format:
               # device         device          mount           FS      fsck    mount   mount
               # to mount       to fsck         point           type    pass    at boot options
-            when /^#{device_regex}\s+[-\/\w]+\s+#{Regexp.escape(mount_point)}\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)/
+            when %r{^#{device_regex}\s+[-/\w]+\s+#{Regexp.escape(mount_point)}\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)}
               enabled = true
               fstype = Regexp.last_match[1]
               options = Regexp.last_match[4]
@@ -196,7 +196,7 @@ class Chef
               pass = (Regexp.last_match[2] == "-") ? 0 : Regexp.last_match[2].to_i
               logger.trace("Found mount #{device} to #{mount_point} in #{VFSTAB}")
               next
-            when /^[-\/\w]+\s+[-\/\w]+\s+#{Regexp.escape(mount_point)}\s+/
+            when %r{^[-/\w]+\s+[-/\w]+\s+#{Regexp.escape(mount_point)}\s+}
               # if we find a mountpoint on top of our mountpoint, then we are not enabled
               enabled = false
               logger.trace("Found conflicting mount point #{mount_point} in #{VFSTAB}")