puppet 8.4.0-x64-mingw32 → 8.5.1-x64-mingw32

data/lib/puppet/type/file.rb

@@ -45,7 +45,7 @@ Puppet::Type.newtype(:file) do
   def self.title_patterns
     # strip trailing slashes from path but allow the root directory, including
     # for example "/" or "C:/"
-    [ [ %r{^(/|.+:/|.*[^/])/*\Z}m, [ [ :path ] ] ] ]
+    [[%r{^(/|.+:/|.*[^/])/*\Z}m, [[:path]]]]
   end
 
   newparam(:path) do
@@ -110,17 +110,17 @@ Puppet::Type.newtype(:file) do
       something like an out-of-band rsync task to synchronize the content on all
       primary servers.
 
-      > **Note**: Enabling and using the backup option, and by extension the 
-        filebucket resource, requires appropriate planning and management to ensure 
-        that sufficient disk space is available for the file backups. Generally, you 
+      > **Note**: Enabling and using the backup option, and by extension the
+        filebucket resource, requires appropriate planning and management to ensure
+        that sufficient disk space is available for the file backups. Generally, you
         can implement this using one of the following two options:
-        - Use a `find` command and `crontab` entry to retain only the last X days 
+        - Use a `find` command and `crontab` entry to retain only the last X days
         of file backups. For example:
-        
+
         ```
         find /opt/puppetlabs/server/data/puppetserver/bucket -type f -mtime +45 -atime +45 -print0 | xargs -0 rm
         ```
-        
+
         - Restrict the directory to a maximum size after which the oldest items are removed.
     EOT
 
@@ -401,7 +401,7 @@ Puppet::Type.newtype(:file) do
   end
 
   # Autorequire the owner and group of the file.
-  {:user => :owner, :group => :group}.each do |type, property|
+  { :user => :owner, :group => :group }.each do |type, property|
     autorequire(type) do
       if @parameters.include?(property)
         # The user/group property automatically converts to IDs
@@ -432,7 +432,7 @@ Puppet::Type.newtype(:file) do
     end
     creator_count += 1 if @parameters.include?(:source)
 
-    self.fail _("You cannot specify more than one of %{creators}") % { creators: CREATORS.collect { |p| p.to_s}.join(", ") } if creator_count > 1
+    self.fail _("You cannot specify more than one of %{creators}") % { creators: CREATORS.collect { |p| p.to_s }.join(", ") } if creator_count > 1
 
     self.fail _("You cannot specify a remote recursion without a source") if !self[:source] && self[:recurse] == :remote
 
@@ -470,7 +470,7 @@ Puppet::Type.newtype(:file) do
 
   # Determine the user to write files as.
   def asuser
-    if self.should(:owner) && ! self.should(:owner).is_a?(Symbol)
+    if self.should(:owner) && !self.should(:owner).is_a?(Symbol)
       writeable = Puppet::Util::SUIDManager.asuser(self.should(:owner)) {
         FileTest.writable?(::File.dirname(self[:path]))
       }
@@ -592,7 +592,7 @@ Puppet::Type.newtype(:file) do
     # or so.  Unfortunately, we don't have a straightforward way to manage
     # the different lifetimes of this data, so we kludge it like this.
     # The right-side hash wins in the merge.
-    options = @original_parameters.merge(:path => full_path).reject { |_param, value| value.nil? }
+    options = @original_parameters.merge(:path => full_path).compact
 
     # These should never be passed to our children.
     [:parent, :ensure, :recurse, :recurselimit, :max_files, :target, :alias, :source].each do |param|
@@ -660,15 +660,15 @@ Puppet::Type.newtype(:file) do
     # REVISIT: is this Windows safe?  AltSeparator?
     mypath = parent_path.split(::File::Separator)
     other_paths = existing_files
-      .select { |r| (yield r) != parent_path}
-      .collect { |r| (yield r).split(::File::Separator) }
-      .select  { |p| p[0,mypath.length] == mypath }
+                  .select { |r| (yield r) != parent_path }
+                  .collect { |r| (yield r).split(::File::Separator) }
+                  .select  { |p| p[0, mypath.length] == mypath }
 
     return files if other_paths.empty?
 
     files.reject { |file|
       path = (yield file).split(::File::Separator)
-      other_paths.any? { |p| path[0,p.length] == p }
+      other_paths.any? { |p| path[0, p.length] == p }
     }
   end
 
@@ -701,11 +701,10 @@ Puppet::Type.newtype(:file) do
     result = perform_recursion(self[:path])
     return {} unless result
 
-    result.inject({}) do |hash, meta|
+    result.each_with_object({}) do |meta, hash|
       next hash if meta.relative_path == "."
 
       hash[meta.relative_path] = newchild(meta.relative_path)
-      hash
     end
   end
 
@@ -752,7 +751,7 @@ Puppet::Type.newtype(:file) do
           data.source = "#{source}/#{data.relative_path}"
         end
       end
-      break result if result and ! result.empty? and sourceselect == :first
+      break result if result and !result.empty? and sourceselect == :first
 
       result
     end.flatten.compact
@@ -825,7 +824,7 @@ Puppet::Type.newtype(:file) do
     # metadata in `copy_source_values`, but so it only fails the resource and not
     # catalog validation (because that would be a breaking change from Puppet 4).
     if Puppet::Util::Platform.windows? && parameter(:source) &&
-      [:use, :use_when_creating].include?(self[:source_permissions])
+       [:use, :use_when_creating].include?(self[:source_permissions])
       # TRANSLATORS "source_permissions => ignore" should not be translated
       err_msg = _("Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore.")
       if self[:owner] == nil || self[:group] == nil || self[:mode] == nil
@@ -875,7 +874,7 @@ Puppet::Type.newtype(:file) do
     if self[:ensure] == :present
       return true unless stat
 
-      return(stat.ftype == "file" ? true : false)
+      return(stat.ftype == "file")
     end
 
     # If we've gotten here, then :ensure isn't set
@@ -899,7 +898,7 @@ Puppet::Type.newtype(:file) do
     method = :stat
 
     # Files are the only types that support links
-    if (self.class.name == :file and self[:links] != :follow) or self.class.name == :tidy
+    if (self.instance_of?(Puppet::Type::File) and self[:links] != :follow)
       method = :lstat
     end
 
@@ -964,7 +963,7 @@ Puppet::Type.newtype(:file) do
       end
     else
       umask = mode ? 000 : 022
-      Puppet::Util.withumask(umask) { ::File.open(self[:path], 'wb', mode_int ) { |f| property.write(f) if property } }
+      Puppet::Util.withumask(umask) { ::File.open(self[:path], 'wb', mode_int) { |f| property.write(f) if property } }
     end
 
     # make sure all of the modes are actually correct
@@ -1024,11 +1023,8 @@ Puppet::Type.newtype(:file) do
       # (#18110) Directories cannot be removed without :force,
       # so it doesn't make sense to back them up unless removing with :force.
       true
-    elsif type == "file" or type == "link"
-      true
     else
-      # Including: “blockSpecial”, “characterSpecial”, "fifo", "socket", “unknown”
-      false
+      type == "file" or type == "link"
     end
   end
 

data/lib/puppet/type/group.rb

@@ -125,7 +125,7 @@ module Puppet
         newvalue = munge_members_value(newvalue)
 
         if @resource[:auth_membership]
-          newvalue.uniq.sort 
+          newvalue.uniq.sort
         else
           (currentvalue + newvalue).uniq.sort
         end
@@ -218,7 +218,7 @@ module Puppet
                           :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
             being managed by some other Name Switch Service (NSS). For AIX, refer to the `ia_load_module` parameter.
-            
+
             This option relies on your operating system's implementation of `luser*` commands, such as `luseradd` , `lgroupadd`, and `lusermod`. The `forcelocal` option could behave unpredictably in some circumstances. If the tools it depends on are not available, it might have no effect at all."
       defaultto false
     end

data/lib/puppet/type/package.rb

@@ -343,10 +343,10 @@ module Puppet
     def self.title_patterns
       # This is the default title pattern for all types, except hard-wired to
       # set only name.
-      [ [ /(.*)/m, [ [:name] ] ] ]
+      [[/(.*)/m, [[:name]]]]
     end
 
-    newproperty(:package_settings, :required_features=>:package_settings) do
+    newproperty(:package_settings, :required_features => :package_settings) do
       desc "Settings that can change the contents or configuration of a package.
 
         The formatting and effects of package_settings are provider-specific; any
@@ -407,7 +407,7 @@ module Puppet
         if provider.respond_to?(:package_settings_change_to_s)
           provider.package_settings_change_to_s(currentvalue, newvalue)
         else
-          super(currentvalue,newvalue)
+          super(currentvalue, newvalue)
         end
       end
     end
@@ -652,16 +652,16 @@ module Puppet
     # that support the reinstall_on_refresh parameter.
     def refresh
       if provider.reinstallable? &&
-        @parameters[:reinstall_on_refresh].value == :true &&
-        @parameters[:ensure].value != :purged &&
-        @parameters[:ensure].value != :absent
+         @parameters[:reinstall_on_refresh].value == :true &&
+         @parameters[:ensure].value != :purged &&
+         @parameters[:ensure].value != :absent
 
         provider.reinstall
       end
     end
 
     newproperty(:mark, :required_features => :holdable) do
-      mark_doc='Valid values are: hold/none'
+      mark_doc = 'Valid values are: hold/none'
       desc <<-EOT
         Set to hold to tell Debian apt/Solaris pkg to hold the package version
 
@@ -680,7 +680,7 @@ module Puppet
         when "none", :none
           :none
         else
-          raise ArgumentError, _('Invalid hold value %{value}. %{doc}') % { value: value.inspect, doc: mark_doc}
+          raise ArgumentError, _('Invalid hold value %{value}. %{doc}') % { value: value.inspect, doc: mark_doc }
         end
       end
 

data/lib/puppet/type/resources.rb

@@ -119,14 +119,14 @@ Puppet::Type.newtype(:resources) do
     return [] unless self.purge?
 
     resource_type.instances
-      .reject { |r| catalog.resource_refs.include? r.ref }
-      .select { |r| check(r) }
-      .select { |r| r.class.validproperty?(:ensure) }
-      .select { |r| able_to_ensure_absent?(r) }
-      .each { |resource|
-        resource.copy_metaparams(@parameters)
-        resource.purging
-      }
+                 .reject { |r| catalog.resource_refs.include? r.ref }
+                 .select { |r| check(r) }
+                 .select { |r| r.class.validproperty?(:ensure) }
+                 .select { |r| able_to_ensure_absent?(r) }
+                 .each { |resource|
+      resource.copy_metaparams(@parameters)
+      resource.purging
+    }
   end
 
   def resource_type

data/lib/puppet/type/schedule.rb

@@ -101,7 +101,7 @@ module Puppet
         values = [values] unless values.is_a?(Array)
         values.each { |value|
           unless value.is_a?(String) and
-              value =~ /\d+(:\d+){0,2}\s*-\s*\d+(:\d+){0,2}/
+                 value =~ /\d+(:\d+){0,2}\s*-\s*\d+(:\d+){0,2}/
             self.fail _("Invalid range value '%{value}'") % { value: value }
           end
         }
@@ -222,7 +222,7 @@ module Puppet
 
         See the `periodmatch` attribute for tuning whether to match
         times by their distance apart or by their specific value.
-        
+
         > **Tip**: You can use `period => never,` to prevent a resource from being applied
         in the given `range`. This is useful if you need to create a blackout window to
         perform sensitive operations without interruption.
@@ -368,7 +368,7 @@ module Puppet
           when 0..6
             index = value
           else
-            index = weekdays[value[0,3].downcase]
+            index = weekdays[value[0, 3].downcase]
           end
           ret[index] = true
         end
@@ -428,7 +428,7 @@ module Puppet
       # Pull them in order
       self.class.allattrs.each { |param|
         if @parameters.include?(param) and
-          @parameters[param].respond_to?(:match?)
+           @parameters[param].respond_to?(:match?)
           return false unless @parameters[param].match?(previous, now)
         end
       }

data/lib/puppet/type/service.rb

@@ -60,9 +60,9 @@ module Puppet
         This property behaves differently depending on the platform;
         wherever possible, it relies on local tools to enable or disable
         a given service. Default values depend on the platform.
-        
+
         If you don't specify a value for the `enable` attribute, Puppet leaves
-        that aspect of the service alone and your operating system determines 
+        that aspect of the service alone and your operating system determines
         the behavior."
 
       newvalue(:true, :event => :service_enabled) do
@@ -258,7 +258,7 @@ module Puppet
       desc "The control variable used to manage services (originally for HP-UX).
         Defaults to the upcased service name plus `START` replacing dots with
         underscores, for those providers that support the `controllable` feature."
-      defaultto { resource.name.tr(".","_").upcase + "_START" if resource.provider.controllable? }
+      defaultto { resource.name.tr(".", "_").upcase + "_START" if resource.provider.controllable? }
     end
 
     newparam :hasrestart do
@@ -305,7 +305,7 @@ module Puppet
 
     validate do
       if @parameters[:logonpassword] && @parameters[:logonaccount].nil?
-        raise Puppet::Error.new(_"The 'logonaccount' parameter is mandatory when setting 'logonpassword'.")
+        raise Puppet::Error.new(_("The 'logonaccount' parameter is mandatory when setting 'logonpassword'."))
       end
     end
   end

data/lib/puppet/type/tidy.rb

@@ -110,7 +110,7 @@ Puppet::Type.newtype(:tidy) do
     def tidy?(path, stat)
       basename = File.basename(path)
       flags = File::FNM_DOTMATCH | File::FNM_PATHNAME
-      return(value.find {|pattern| File.fnmatch(pattern, basename, flags) } ? true : false)
+      return(value.find { |pattern| File.fnmatch(pattern, basename, flags) } ? true : false)
     end
   end
 
@@ -292,7 +292,7 @@ Puppet::Type.newtype(:tidy) do
       files = [self[:path]]
     end
     found_files = files.find_all { |path| tidy?(path) }.collect { |path| mkfile(path) }
-    result = found_files.each { |file| debug "Tidying #{file.ref}" }.sort { |a,b| b[:path] <=> a[:path] }
+    result = found_files.each { |file| debug "Tidying #{file.ref}" }.sort { |a, b| b[:path] <=> a[:path] }
     if found_files.size > 0
       # TRANSLATORS "Tidy" is a program name and should not be translated
       notice _("Tidying %{count} files") % { count: found_files.size }
@@ -304,9 +304,9 @@ Puppet::Type.newtype(:tidy) do
 
     # Now make sure that all directories require the files they contain, if all are available,
     # so that a directory is emptied before we try to remove it.
-    files_by_name = result.inject({}) { |hash, file| hash[file[:path]] = file; hash }
+    files_by_name = result.each_with_object({}) { |file, hash| hash[file[:path]] = file; }
 
-    files_by_name.keys.sort { |a,b| b <=> a }.each do |path|
+    files_by_name.keys.sort { |a, b| b <=> a }.each do |path|
       dir = ::File.dirname(path)
       resource = files_by_name[dir]
       next unless resource
@@ -328,7 +328,7 @@ Puppet::Type.newtype(:tidy) do
 
     basename = File.basename(path)
     flags = File::FNM_DOTMATCH | File::FNM_PATHNAME
-    if self[:matches].find {|pattern| File.fnmatch(pattern, basename, flags) }
+    if self[:matches].find { |pattern| File.fnmatch(pattern, basename, flags) }
       return true
     else
       debug "No specified patterns match #{path}, not tidying"
@@ -345,12 +345,12 @@ Puppet::Type.newtype(:tidy) do
     stat = self.stat(path)
     return false unless stat
 
-    return false if stat.ftype == "directory" and ! rmdirs?
+    return false if stat.ftype == "directory" and !rmdirs?
 
     # The 'matches' parameter isn't OR'ed with the other tests --
     # it's just used to reduce the list of files we can match.
     param = parameter(:matches)
-    return false if param && ! param.tidy?(path, stat)
+    return false if param && !param.tidy?(path, stat)
 
     tested = false
     [:age, :size].each do |name|

data/lib/puppet/type/user.rb

@@ -231,9 +231,9 @@ module Puppet
         * OS X 10.8 and higher use salted SHA512 PBKDF2 hashes. When managing passwords
           on these systems, the `salt` and `iterations` attributes need to be specified as
           well as the password.
-        * macOS 10.15 and higher require the salt to be 32-bytes. Since Puppet's user 
+        * macOS 10.15 and higher require the salt to be 32-bytes. Since Puppet's user
           resource requires the value to be hex encoded, the length of the salt's
-          string must be 64. 
+          string must be 64.
         * Windows passwords can be managed only in cleartext, because there is no Windows
           API for setting the password hash.
 
@@ -434,7 +434,7 @@ module Puppet
         run.
 
         Note that on Windows, this manages creation/deletion of the user profile instead of the
-        home directory. The user profile is stored in the `C:\Users\<username>` directory."
+        home directory. The user profile is stored in the `C:\\Users\\<username>` directory."
 
       defaultto false
 
@@ -471,7 +471,7 @@ module Puppet
       groups = obj.shouldorig if obj
       if groups
         groups = groups.collect { |group|
-          if group.is_a?(String) && group =~/^\d+$/
+          if group.is_a?(String) && group =~ /^\d+$/
             Integer(group)
           else
             group
@@ -633,16 +633,16 @@ module Puppet
     end
 
     newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
-      desc "Specify AIX attributes for the user in an array or hash of attribute = value pairs. 
-      
+      desc "Specify AIX attributes for the user in an array or hash of attribute = value pairs.
+
       For example:
-      
+
       ```
       ['minage=0', 'maxage=5', 'SYSTEM=compat']
       ```
-      
-      or 
-    
+
+      or
+
      ```
      attributes => { 'minage' => '0', 'maxage' => '5', 'SYSTEM' => 'compat' }
      ```
@@ -681,7 +681,7 @@ module Puppet
             newer."
 
       munge do |value|
-        if value.is_a?(String) and value =~/^[-0-9]+$/
+        if value.is_a?(String) and value =~ /^[-0-9]+$/
           Integer(value)
         else
           value
@@ -694,7 +694,7 @@ module Puppet
                           :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
             being managed by some other Name Service Switch (NSS). For AIX, refer to the `ia_load_module` parameter.
-            
+
             This option relies on your operating system's implementation of `luser*` commands, such as `luseradd` , and `lgroupadd`, `lusermod`. The `forcelocal` option could behave unpredictably in some circumstances. If the tools it depends on are not available, it might have no effect at all."
       defaultto false
     end
@@ -715,7 +715,7 @@ module Puppet
       desc "Whether to purge authorized SSH keys for this user if they are not managed
         with the `ssh_authorized_key` resource type. This parameter is a noop if the
         ssh_authorized_key type is not available.
-        
+
         Allowed values are:
 
         * `false` (default) --- don't purge SSH keys for this user.
@@ -733,11 +733,11 @@ module Puppet
       newvalues(:true, :false)
 
       validate do |value|
-        if [ :true, :false ].include? value.to_s.intern
+        if [:true, :false].include? value.to_s.intern
           return
         end
 
-        value = [ value ] if value.is_a?(String)
+        value = [value] if value.is_a?(String)
         if value.is_a?(Array)
           value.each do |entry|
             raise ArgumentError, _("Each entry for purge_ssh_keys must be a string, not a %{klass}") % { klass: entry.class } unless entry.is_a?(String)
@@ -758,12 +758,12 @@ module Puppet
           []
         when :true, true, "true"
           home = homedir
-          home ? [ "#{home}/.ssh/authorized_keys" ] : []
+          home ? ["#{home}/.ssh/authorized_keys"] : []
         else
           # value can be a string or array - munge each value
-          [ value ].flatten.map do |entry|
+          [value].flatten.filter_map do |entry|
             authorized_keys_path(entry)
-          end.compact
+          end
         end
       end
 
@@ -855,7 +855,8 @@ module Puppet
       names.map { |keyname|
         Puppet::Type.type(:ssh_authorized_key).new(
           :name => keyname,
-          :target => keyfile)
+          :target => keyfile
+        )
       }.reject { |res|
         catalog.resource_refs.include? res.ref
       }