puppet 8.5.1 → 8.6.0

data/lib/puppet/type/file/mode.rb

@@ -76,7 +76,7 @@ module Puppet
     EOT
 
     validate do |value|
-      if !value.is_a?(String)
+      unless value.is_a?(String)
         raise Puppet::Error, "The file mode specification must be a string, not '#{value.class.name}'"
       end
       unless value.nil? or valid_symbolic_mode?(value)
@@ -111,9 +111,9 @@ module Puppet
     def dirmask(value)
       if FileTest.directory?(resource[:path]) and value =~ /^\d+$/ then
         value = value.to_i(8)
-        value |= 0100 if value & 0400 != 0
-        value |= 010 if value & 040 != 0
-        value |= 01 if value & 04 != 0
+        value |= 0o100 if value & 0o400 != 0
+        value |= 0o10 if value & 0o40 != 0
+        value |= 0o1 if value & 0o4 != 0
         value = value.to_s(8)
       end
 
@@ -131,10 +131,10 @@ module Puppet
       end
       stat = @resource.stat
       if stat && stat.ftype == "link" && @resource[:links] != :follow
-        self.debug _("Not managing symlink mode")
-        return true
+        debug _("Not managing symlink mode")
+        true
       else
-        return super(currentvalue)
+        super(currentvalue)
       end
     end
 
@@ -153,7 +153,7 @@ module Puppet
     # been synced.
     def retrieve
       if @resource.stat
-        @should &&= @should.collect { |s| self.dirmask(s) }
+        @should &&= @should.collect { |s| dirmask(s) }
       end
 
       super
@@ -163,7 +163,7 @@ module Puppet
     # don't have access to the calculated "desired" value here, or the
     # "current" value, only the "should" value we need to retrieve again.
     def sync
-      current = @resource.stat ? @resource.stat.mode : 0644
+      current = @resource.stat ? @resource.stat.mode : 0o644
       set(desired_mode_from_current(@should[0], current).to_s(8))
     end
 

data/lib/puppet/type/file/mtime.rb

@@ -2,8 +2,8 @@
 
 module Puppet
   Puppet::Type.type(:file).newproperty(:mtime) do
-    desc %q{A read-only state to check the file mtime. On \*nix-like systems, this
-      is the time of the most recent change to the content of the file.}
+    desc %q(A read-only state to check the file mtime. On \*nix-like systems, this
+      is the time of the most recent change to the content of the file.)
 
     def retrieve
       current_value = :absent

data/lib/puppet/type/file/selcontext.rb

@@ -30,10 +30,10 @@ module Puppet
     def retrieve
       return :absent unless @resource.stat
 
-      context = self.get_selinux_current_context(@resource[:path])
+      context = get_selinux_current_context(@resource[:path])
       is = parse_selinux_context(name, context)
       if name == :selrange and selinux_support?
-        self.selinux_category_to_label(is)
+        selinux_category_to_label(is)
       else
         is
       end
@@ -44,21 +44,21 @@ module Puppet
         return nil
       end
 
-      context = self.get_selinux_default_context(@resource[:path], @resource[:ensure])
+      context = get_selinux_default_context(@resource[:path], @resource[:ensure])
       unless context
         return nil
       end
 
-      property_default = self.parse_selinux_context(property, context)
-      self.debug "Found #{property} default '#{property_default}' for #{@resource[:path]}" if not property_default.nil?
+      property_default = parse_selinux_context(property, context)
+      debug "Found #{property} default '#{property_default}' for #{@resource[:path]}" unless property_default.nil?
       property_default
     end
 
     def insync?(value)
-      if not selinux_support?
+      if !selinux_support?
         debug("SELinux bindings not found. Ignoring parameter.")
         true
-      elsif not selinux_label_support?(@resource[:path])
+      elsif !selinux_label_support?(@resource[:path])
         debug("SELinux not available for this filesystem. Ignoring parameter.")
         true
       else
@@ -67,19 +67,19 @@ module Puppet
     end
 
     def unsafe_munge(should)
-      if not selinux_support?
+      unless selinux_support?
         return should
       end
 
       if name == :selrange
-        self.selinux_category_to_label(should)
+        selinux_category_to_label(should)
       else
         should
       end
     end
 
     def sync
-      self.set_selinux_context(@resource[:path], @should, name)
+      set_selinux_context(@resource[:path], @should, name)
       :file_changed
     end
   end
@@ -103,7 +103,7 @@ module Puppet
       enabled."
 
     @event = :file_changed
-    defaultto { self.retrieve_default_context(:seluser) }
+    defaultto { retrieve_default_context(:seluser) }
   end
 
   Puppet::Type.type(:file).newproperty(:selrole, :parent => Puppet::SELFileContext) do
@@ -114,7 +114,7 @@ module Puppet
       enabled."
 
     @event = :file_changed
-    defaultto { self.retrieve_default_context(:selrole) }
+    defaultto { retrieve_default_context(:selrole) }
   end
 
   Puppet::Type.type(:file).newproperty(:seltype, :parent => Puppet::SELFileContext) do
@@ -125,7 +125,7 @@ module Puppet
       enabled."
 
     @event = :file_changed
-    defaultto { self.retrieve_default_context(:seltype) }
+    defaultto { retrieve_default_context(:seltype) }
   end
 
   Puppet::Type.type(:file).newproperty(:selrange, :parent => Puppet::SELFileContext) do
@@ -137,6 +137,6 @@ module Puppet
       Security)."
 
     @event = :file_changed
-    defaultto { self.retrieve_default_context(:selrange) }
+    defaultto { retrieve_default_context(:selrange) }
   end
 end

data/lib/puppet/type/file/source.rb

@@ -96,7 +96,7 @@ module Puppet
 
         self.fail "Cannot use relative URLs '#{source}'" unless uri.absolute?
         self.fail "Cannot use opaque URLs '#{source}'" unless uri.hierarchical?
-        unless %w{file puppet http https}.include?(uri.scheme)
+        unless %w[file puppet http https].include?(uri.scheme)
           self.fail "Cannot use URLs of type '#{uri.scheme}' as source for fileserving"
         end
       end
@@ -130,9 +130,9 @@ module Puppet
     def change_to_s(currentvalue, newvalue)
       # newvalue = "{md5}#{@metadata.checksum}"
       if resource.property(:ensure).retrieve == :absent
-        return "creating from source #{metadata.source} with contents #{metadata.checksum}"
+        "creating from source #{metadata.source} with contents #{metadata.checksum}"
       else
-        return "replacing from source #{metadata.source} with contents #{metadata.checksum}"
+        "replacing from source #{metadata.source} with contents #{metadata.checksum}"
       end
     end
 
@@ -189,25 +189,23 @@ module Puppet
       return nil unless value
 
       value.each do |source|
-        begin
-          options = {
-            :environment => resource.catalog.environment_instance,
-            :links => resource[:links],
-            :checksum_type => resource[:checksum],
-            :source_permissions => resource[:source_permissions]
-          }
+        options = {
+          :environment => resource.catalog.environment_instance,
+          :links => resource[:links],
+          :checksum_type => resource[:checksum],
+          :source_permissions => resource[:source_permissions]
+        }
 
-          data = Puppet::FileServing::Metadata.indirection.find(source, options)
-          if data
-            @metadata = data
-            @metadata.source = source
-            break
-          end
-        rescue => detail
-          self.fail Puppet::Error, "Could not retrieve file metadata for #{source}: #{detail}", detail
+        data = Puppet::FileServing::Metadata.indirection.find(source, options)
+        if data
+          @metadata = data
+          @metadata.source = source
+          break
         end
+      rescue => detail
+        self.fail Puppet::Error, "Could not retrieve file metadata for #{source}: #{detail}", detail
       end
-      self.fail "Could not retrieve information from environment #{resource.catalog.environment} source(s) #{value.join(", ")}" unless @metadata
+      self.fail "Could not retrieve information from environment #{resource.catalog.environment} source(s) #{value.join(', ')}" unless @metadata
       @metadata
     end
 
@@ -266,7 +264,7 @@ module Puppet
         value = value.to_s(8) if param_name == :mode && value.is_a?(Numeric)
         resource[param_name] = value
 
-        if (metadata_method == :checksum)
+        if metadata_method == :checksum
           # If copying checksum, also copy checksum_type
           resource[:checksum] = metadata.checksum_type
         end
@@ -317,7 +315,7 @@ module Puppet
     def get_from_http_source(url, &block)
       client = Puppet.runtime[:http]
       client.get(url, options: { include_system_store: true }) do |response|
-        raise Puppet::HTTP::ResponseError.new(response) unless response.success?
+        raise Puppet::HTTP::ResponseError, response unless response.success?
 
         response.read_body(&block)
       end

data/lib/puppet/type/file/target.rb

@@ -25,7 +25,7 @@ module Puppet
 
     # Anything else, basically
     newvalue(/./) do
-      @resource[:ensure] = :link if !@resource.should(:ensure)
+      @resource[:ensure] = :link unless @resource.should(:ensure)
 
       # Only call mklink if ensure didn't call us in the first place.
       currentensure = @resource.property(:ensure).retrieve
@@ -34,9 +34,9 @@ module Puppet
 
     # Create our link.
     def mklink
-      raise Puppet::Error, "Cannot symlink on this platform version" if !provider.feature?(:manages_symlinks)
+      raise Puppet::Error, "Cannot symlink on this platform version" unless provider.feature?(:manages_symlinks)
 
-      target = self.should
+      target = should
 
       # Clean up any existing objects.  The argument is just for logging,
       # it doesn't determine what's removed.
@@ -48,7 +48,7 @@ module Puppet
         Puppet::Util::SUIDManager.asuser(@resource.asuser) do
           mode = @resource.should(:mode)
           if mode
-            Puppet::Util.withumask(000) do
+            Puppet::Util.withumask(0o00) do
               Puppet::FileSystem.symlink(target, @resource[:path])
             end
           else
@@ -63,12 +63,12 @@ module Puppet
     end
 
     def insync?(currentvalue)
-      if [:nochange, :notlink].include?(self.should) or @resource.recurse?
-        return true
+      if [:nochange, :notlink].include?(should) or @resource.recurse?
+        true
       elsif !@resource.replace? and Puppet::FileSystem.exist?(@resource[:path])
-        return true
+        true
       else
-        return super(currentvalue)
+        super(currentvalue)
       end
     end
 
@@ -76,12 +76,12 @@ module Puppet
       stat = @resource.stat
       if stat
         if stat.ftype == "link"
-          return Puppet::FileSystem.readlink(@resource[:path])
+          Puppet::FileSystem.readlink(@resource[:path])
         else
-          return :notlink
+          :notlink
         end
       else
-        return :absent
+        :absent
       end
     end
   end

data/lib/puppet/type/file.rb

@@ -264,7 +264,7 @@ Puppet::Type.newtype(:file) do
 
     validate do |value|
       unless value.is_a?(Array) or value.is_a?(String) or value == false
-        self.devfail "Ignore must be a string or an Array"
+        devfail "Ignore must be a string or an Array"
       end
     end
   end
@@ -387,7 +387,7 @@ Puppet::Type.newtype(:file) do
   autorequire(:file) do
     req = []
     path = Pathname.new(self[:path])
-    if !path.root?
+    unless path.root?
       # Start at our parent, to avoid autorequiring ourself
       parents = path.parent.enum_for(:ascend)
       found = parents.find { |p| catalog.resource(:file, p.to_s) }
@@ -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(&:to_s).join(", ") } if creator_count > 1
 
     self.fail _("You cannot specify a remote recursion without a source") if !self[:source] && self[:recurse] == :remote
 
@@ -442,7 +442,7 @@ Puppet::Type.newtype(:file) do
       self.fail _("You cannot specify content when using checksum '%{checksum_type}'") % { checksum_type: checksum_type } if self[:checksum] == checksum_type && !self[:content].nil?
     end
 
-    self.warning _("Possible error: recurselimit is set but not recurse, no recursion will happen") if !self[:recurse] && self[:recurselimit]
+    warning _("Possible error: recurselimit is set but not recurse, no recursion will happen") if !self[:recurse] && self[:recurselimit]
 
     if @parameters[:content] && @parameters[:content].actual_content
       # Now that we know the checksum, update content (in case it was created before checksum was known).
@@ -453,7 +453,7 @@ Puppet::Type.newtype(:file) do
       self.fail _("Checksum value '%{value}' is not a valid checksum type %{checksum}") % { value: self[:checksum_value], checksum: self[:checksum] }
     end
 
-    self.warning _("Checksum value is ignored unless content or source are specified") if self[:checksum_value] && !self[:content] && !self[:source]
+    warning _("Checksum value is ignored unless content or source are specified") if self[:checksum_value] && !self[:content] && !self[:source]
 
     provider.validate if provider.respond_to?(:validate)
   end
@@ -461,11 +461,11 @@ Puppet::Type.newtype(:file) do
   def self.[](path)
     return nil unless path
 
-    super(path.gsub(/\/+/, '/').sub(/\/$/, ''))
+    super(path.gsub(%r{/+}, '/').sub(%r{/$}, ''))
   end
 
   def self.instances
-    return []
+    []
   end
 
   # Determine the user to write files as.
@@ -531,7 +531,7 @@ Puppet::Type.newtype(:file) do
 
   # Create any children via recursion or whatever.
   def eval_generate
-    return [] unless self.recurse?
+    return [] unless recurse?
 
     recurse
   end
@@ -616,12 +616,12 @@ Puppet::Type.newtype(:file) do
         # Remove the parent file name
         list = parent.pathbuilder
         list.pop # remove the parent's path info
-        return list << self.ref
+        list << ref
       else
-        return super
+        super
       end
     else
-      return [self.ref]
+      [ref]
     end
   end
 
@@ -639,7 +639,7 @@ Puppet::Type.newtype(:file) do
 
     # If we're purging resources, then delete any resource that isn't on the
     # remote system.
-    mark_children_for_purging(children) if self.purge?
+    mark_children_for_purging(children) if purge?
 
     result = children.values.sort_by { |a| a[:path] }
     remove_less_specific_files(result)
@@ -800,7 +800,7 @@ Puppet::Type.newtype(:file) do
       if can_backup?(current_type)
         backup_existing
       else
-        self.warning _("Could not back up file of type %{current_type}") % { current_type: current_type }
+        warning _("Could not back up file of type %{current_type}") % { current_type: current_type }
       end
     end
 
@@ -810,9 +810,9 @@ Puppet::Type.newtype(:file) do
 
     case current_type
     when "directory"
-      return remove_directory(wanted_type)
+      remove_directory(wanted_type)
     when "link", "file", "fifo", "socket"
-      return remove_file(current_type, wanted_type)
+      remove_file(current_type, wanted_type)
     else
       # Including: “blockSpecial”, “characterSpecial”, “unknown”
       self.fail _("Could not remove files of type %{current_type}") % { current_type: current_type }
@@ -827,13 +827,13 @@ Puppet::Type.newtype(:file) do
        [: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
+      if self[:owner].nil? || self[:group].nil? || self[:mode].nil?
         # Fail on Windows if source permissions are being used and the file resource
         # does not have mode owner, group, and mode all set (which would take precedence).
         self.fail err_msg
       else
         # Warn if use source permissions is specified on Windows
-        self.warning err_msg
+        warning err_msg
       end
     end
 
@@ -898,7 +898,7 @@ Puppet::Type.newtype(:file) do
     method = :stat
 
     # Files are the only types that support links
-    if (self.instance_of?(Puppet::Type::File) and self[:links] != :follow)
+    if instance_of?(Puppet::Type::File) and self[:links] != :follow
       method = :lstat
     end
 
@@ -937,7 +937,7 @@ Puppet::Type.newtype(:file) do
         validate_callback = proc { |path|
           output = Puppet::Util::Execution.execute(self[:validate_cmd].gsub(self[:validate_replacement], path), :failonfail => true, :combine => true)
           output.split(/\n/).each { |line|
-            self.debug(line)
+            debug(line)
           }
         }
       end
@@ -962,7 +962,7 @@ Puppet::Type.newtype(:file) do
         fail_if_checksum_is_wrong(property, file.path, content_checksum)
       end
     else
-      umask = mode ? 000 : 022
+      umask = mode ? 0o00 : 0o22
       Puppet::Util.withumask(umask) { ::File.open(self[:path], 'wb', mode_int) { |f| property.write(f) if property } }
     end
 
@@ -972,7 +972,7 @@ Puppet::Type.newtype(:file) do
 
   private
 
-  # Carry the context of sensitive parameters to the the properties that will actually handle that
+  # Carry the context of sensitive parameters to the properties that will actually handle that
   # sensitive data.
   #
   # The file type can accept file content from a number of origins and depending on the current

data/lib/puppet/type/filebucket.rb

@@ -75,7 +75,7 @@ module Puppet
           raise ArgumentError, _("You can only have one filebucket path")
         end
 
-        if value.is_a? String and not Puppet::Util.absolute_path?(value)
+        if value.is_a? String and !Puppet::Util.absolute_path?(value)
           raise ArgumentError, _("Filebucket paths must be absolute")
         end
 
@@ -113,11 +113,11 @@ module Puppet
         @bucket = Puppet::FileBucket::Dipper.new(args)
       rescue => detail
         message = _("Could not create %{type} filebucket: %{detail}") % { type: type, detail: detail }
-        self.log_exception(detail, message)
+        log_exception(detail, message)
         self.fail(message)
       end
 
-      @bucket.name = self.name
+      @bucket.name = name
     end
   end
 end

data/lib/puppet/type/group.rb

@@ -56,10 +56,10 @@ module Puppet
       end
 
       def sync
-        if self.should == :absent
+        if should == :absent
           raise Puppet::DevError, _("GID cannot be deleted")
         else
-          provider.gid = self.should
+          provider.gid = should
         end
       end
 
@@ -73,7 +73,7 @@ module Puppet
           end
         when Symbol
           unless gid == :absent
-            self.devfail "Invalid GID #{gid}"
+            devfail "Invalid GID #{gid}"
           end
         end
 

data/lib/puppet/type/notify.rb

@@ -12,14 +12,14 @@ module Puppet
     newproperty(:message, :idempotent => false) do
       desc "The message to be sent to the log. Note that the value specified must be a string."
       def sync
-        message = @sensitive ? 'Sensitive [value redacted]' : self.should
+        message = @sensitive ? 'Sensitive [value redacted]' : should
         case @resource["withpath"]
         when :true
           send(@resource[:loglevel], message)
         else
           Puppet.send(@resource[:loglevel], message)
         end
-        return
+        nil
       end
 
       def retrieve

data/lib/puppet/type/package.rb

@@ -119,7 +119,7 @@ module Puppet
         # Because yum always exits with a 0 exit code, there's a retrieve
         # in the "install" method.  So, check the current state now,
         # to compare against later.
-        current = self.retrieve
+        current = retrieve
         begin
           provider.update
         rescue => detail
@@ -140,7 +140,7 @@ module Puppet
           self.fail Puppet::Error, _("Could not update: %{detail}") % { detail: detail }, detail
         end
 
-        if self.retrieve == :absent
+        if retrieve == :absent
           :package_installed
         else
           :package_changed
@@ -188,7 +188,7 @@ module Puppet
               # that can't query versions.
               return true
             else
-              self.debug "#{@resource.name} #{is.inspect} is installed, latest is #{@latest.inspect}"
+              debug "#{@resource.name} #{is.inspect} is installed, latest is #{@latest.inspect}"
             end
 
           when :absent
@@ -270,7 +270,7 @@ module Puppet
       isnamevar
 
       validate do |value|
-        if !value.is_a?(String)
+        unless value.is_a?(String)
           raise ArgumentError, _("Name must be a String not %{klass}") % { klass: value.class }
         end
       end

data/lib/puppet/type/resources.rb

@@ -18,7 +18,7 @@ Puppet::Type.newtype(:resources) do
       raise ArgumentError, _("Could not find resource type '%{name}'") % { name: name } unless Puppet::Type.type(name)
     end
 
-    munge { |v| v.to_s }
+    munge(&:to_s)
   end
 
   newparam(:purge, :boolean => true, :parent => Puppet::Parameter::Boolean) do
@@ -100,9 +100,9 @@ Puppet::Type.newtype(:resources) do
     @checkmethod ||= "#{self[:name]}_check"
     @hascheck ||= respond_to?(@checkmethod)
     if @hascheck
-      return send(@checkmethod, resource)
+      send(@checkmethod, resource)
     else
-      return true
+      true
     end
   end
 
@@ -116,7 +116,7 @@ Puppet::Type.newtype(:resources) do
   # Generate any new resources we need to manage.  This is pretty hackish
   # right now, because it only supports purging.
   def generate
-    return [] unless self.purge?
+    return [] unless purge?
 
     resource_type.instances
                  .reject { |r| catalog.resource_refs.include? r.ref }
@@ -163,7 +163,7 @@ Puppet::Type.newtype(:resources) do
   end
 
   def system_users
-    %w{root nobody bin noaccess daemon sys}
+    %w[root nobody bin noaccess daemon sys]
   end
 
   def self.system_users_max_uid
@@ -172,7 +172,7 @@ Puppet::Type.newtype(:resources) do
     # First try to read the minimum user id from login.defs
     if Puppet::FileSystem.exist?('/etc/login.defs')
       @system_users_max_uid = Puppet::FileSystem.each_line '/etc/login.defs' do |line|
-        break $1.to_i - 1 if line =~ /^\s*UID_MIN\s+(\d+)(\s*#.*)?$/
+        break Regexp.last_match(1).to_i - 1 if line =~ /^\s*UID_MIN\s+(\d+)(\s*#.*)?$/
       end
     end
 

data/lib/puppet/type/schedule.rb

@@ -116,7 +116,7 @@ module Puppet
           # Split each range value into a hour, minute, second triad
           value.split(/\s*-\s*/).each { |val|
             # Add the values as an array.
-            range << val.split(":").collect { |n| n.to_i }
+            range << val.split(":").collect(&:to_i)
           }
 
           self.fail _("Invalid range %{value}") % { value: value } if range.length != 2
@@ -232,9 +232,9 @@ module Puppet
 
       ScheduleScales = {
         :hourly => 3600,
-        :daily => 86400,
-        :weekly => 604800,
-        :monthly => 2592000
+        :daily => 86_400,
+        :weekly => 604_800,
+        :monthly => 2_592_000
       }
       ScheduleMethods = {
         :hourly => :hour,
@@ -255,10 +255,10 @@ module Puppet
         when :number
           method = ScheduleMethods[value]
           if method.is_a?(Proc)
-            return method.call(previous, now)
+            method.call(previous, now)
           else
             # We negate it, because if they're equal we don't run
-            return now.send(method) != previous.send(method)
+            now.send(method) != previous.send(method)
           end
         when :distance
           scale = ScheduleScales[value]
@@ -267,7 +267,7 @@ module Puppet
           # than the unit of time, we match.  We divide the scale
           # by the repeat, so that we'll repeat that often within
           # the scale.
-          return (now.to_i - previous.to_i) >= (scale / @resource[:repeat])
+          (now.to_i - previous.to_i) >= (scale / @resource[:repeat])
         end
       end
     end
@@ -401,7 +401,7 @@ module Puppet
 
       Puppet.debug "Creating default schedules"
 
-      result << self.new(
+      result << new(
         :name => "puppet",
         :period => :hourly,
 
@@ -410,7 +410,7 @@ module Puppet
 
       # And then one for every period
       @parameters.find { |p| p.name == :period }.value_collection.values.each { |value|
-        result << self.new(
+        result << new(
           :name => value.to_s,
           :period => value
         )