puppet 8.5.0-universal-darwin → 8.6.0-universal-darwin

data/lib/puppet/util/selinux.rb

@@ -14,9 +14,9 @@ Puppet.features.selinux? # check, but continue even if it's not
 require 'pathname'
 
 module Puppet::Util::SELinux
-  S_IFREG = 0100000
-  S_IFDIR = 0040000
-  S_IFLNK = 0120000
+  S_IFREG = 0o100000
+  S_IFDIR = 0o040000
+  S_IFLNK = 0o120000
 
   def self.selinux_support?
     return false unless defined?(Selinux)
@@ -142,10 +142,10 @@ module Puppet::Util::SELinux
 
     retval = Selinux.lsetfilecon(file, context)
     if retval == 0
-      return true
+      true
     else
       Puppet.warning _("Failed to set SELinux context %{context} on %{file}") % { context: context, file: file }
-      return false
+      false
     end
   end
 
@@ -215,7 +215,7 @@ module Puppet::Util::SELinux
     fstype = find_fs(file)
     return false if fstype.nil?
 
-    filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs', 'btrfs', 'tmpfs', 'zfs']
+    filesystems = %w[ext2 ext3 ext4 gfs gfs2 xfs jfs btrfs tmpfs zfs]
     filesystems.include?(fstype)
   end
 
@@ -294,7 +294,7 @@ module Puppet::Util::SELinux
     end
 
     # Should never be reached...
-    return mounts['/']
+    mounts['/']
   end
 
   ##

data/lib/puppet/util/storage.rb

@@ -40,14 +40,14 @@ class Puppet::Util::Storage
     @@state = {}
   end
 
-  self.init
+  init
 
   def self.load
     Puppet.settings.use(:main) unless FileTest.directory?(Puppet[:statedir])
     filename = Puppet[:statefile]
 
     unless Puppet::FileSystem.exist?(filename)
-      self.init if @@state.nil?
+      init if @@state.nil?
       return
     end
     unless File.file?(filename)
@@ -55,22 +55,20 @@ class Puppet::Util::Storage
       return
     end
     Puppet::Util.benchmark(:debug, "Loaded state in %{seconds} seconds") do
+      @@state = Puppet::Util::Yaml.safe_load_file(filename, [Symbol, Time])
+    rescue Puppet::Util::Yaml::YamlLoadError => detail
+      Puppet.err _("Checksumfile %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail }
+
       begin
-        @@state = Puppet::Util::Yaml.safe_load_file(filename, [Symbol, Time])
-      rescue Puppet::Util::Yaml::YamlLoadError => detail
-        Puppet.err _("Checksumfile %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail }
-
-        begin
-          File.rename(filename, filename + ".bad")
-        rescue
-          raise Puppet::Error, _("Could not rename corrupt %{filename}; remove manually") % { filename: filename }, detail.backtrace
-        end
+        File.rename(filename, filename + ".bad")
+      rescue
+        raise Puppet::Error, _("Could not rename corrupt %{filename}; remove manually") % { filename: filename }, detail.backtrace
       end
     end
 
     unless @@state.is_a?(Hash)
       Puppet.err _("State got corrupted")
-      self.init
+      init
     end
   end
 

data/lib/puppet/util/suidmanager.rb

@@ -25,23 +25,21 @@ module Puppet::Util::SUIDManager
   module_function :osx_maj_ver
 
   def groups=(grouplist)
-    begin
-      Process.groups = grouplist
-    rescue Errno::EINVAL => e
-      # We catch Errno::EINVAL as some operating systems (OS X in particular) can
-      # cause troubles when using Process#groups= to change *this* user / process
-      # list of supplementary groups membership.  This is done via Ruby's function
-      # "static VALUE proc_setgroups(VALUE obj, VALUE ary)" which is effectively
-      # a wrapper for "int setgroups(size_t size, const gid_t *list)" (part of SVr4
-      # and 4.3BSD but not in POSIX.1-2001) that fails and sets errno to EINVAL.
-      #
-      # This does not appear to be a problem with Ruby but rather an issue on the
-      # operating system side.  Therefore we catch the exception and look whether
-      # we run under OS X or not -- if so, then we acknowledge the problem and
-      # re-throw the exception otherwise.
-      if !osx_maj_ver || osx_maj_ver.empty?
-        raise e
-      end
+    Process.groups = grouplist
+  rescue Errno::EINVAL => e
+    # We catch Errno::EINVAL as some operating systems (OS X in particular) can
+    # cause troubles when using Process#groups= to change *this* user / process
+    # list of supplementary groups membership.  This is done via Ruby's function
+    # "static VALUE proc_setgroups(VALUE obj, VALUE ary)" which is effectively
+    # a wrapper for "int setgroups(size_t size, const gid_t *list)" (part of SVr4
+    # and 4.3BSD but not in POSIX.1-2001) that fails and sets errno to EINVAL.
+    #
+    # This does not appear to be a problem with Ruby but rather an issue on the
+    # operating system side.  Therefore we catch the exception and look whether
+    # we run under OS X or not -- if so, then we acknowledge the problem and
+    # re-throw the exception otherwise.
+    if !osx_maj_ver || osx_maj_ver.empty?
+      raise e
     end
   end
   module_function :groups=
@@ -67,7 +65,8 @@ module Puppet::Util::SUIDManager
     return yield unless root?
     return yield unless new_uid or new_gid
 
-    old_euid, old_egid = self.euid, self.egid
+    old_euid = euid
+    old_egid = egid
     begin
       change_privileges(new_uid, new_gid, false)
 
@@ -147,7 +146,7 @@ module Puppet::Util::SUIDManager
     raise ArgumentError, _("Invalid id type %{type}") % { type: type } unless map.include?(type)
 
     ret = Puppet::Util.send(type, id)
-    if ret == nil
+    if ret.nil?
       raise Puppet::Error, _("Invalid %{klass}: %{id}") % { klass: map[type], id: id }
     end
 

data/lib/puppet/util/symbolic_file_mode.rb

@@ -19,7 +19,7 @@ module SymbolicFileMode
     return true if value =~ /^0?[0-7]{1,4}$/
     return true if value =~ /^([ugoa]*[-=+][-=+rstwxXugo]*)(,[ugoa]*[-=+][-=+rstwxXugo]*)*$/
 
-    return false
+    false
   end
 
   def display_mode(value)
@@ -60,12 +60,12 @@ module SymbolicFileMode
     fail _("non-numeric current mode (%{mode})") % { mode: to_mode.inspect } unless to_mode.is_a?(Numeric)
 
     original_mode = {
-      's' => (to_mode & 07000) >> 9,
-      'u' => (to_mode & 00700) >> 6,
-      'g' => (to_mode & 00070) >> 3,
-      'o' => (to_mode & 00007) >> 0,
+      's' => (to_mode & 0o7000) >> 9,
+      'u' => (to_mode & 0o0700) >> 6,
+      'g' => (to_mode & 0o0070) >> 3,
+      'o' => (to_mode & 0o0007) >> 0,
       # Are there any execute bits set in the original mode?
-      'any x?' => (to_mode & 00111) != 0
+      'any x?' => (to_mode & 0o0111) != 0
     }
     final_mode = {
       's' => original_mode['s'],
@@ -75,85 +75,81 @@ module SymbolicFileMode
     }
 
     modification.split(/\s*,\s*/).each do |part|
-      begin
-        _, to, dsl = /^([ugoa]*)([-+=].*)$/.match(part).to_a
-        if dsl.nil? then raise Puppet::Error, _('Missing action') end
-
-        to = "a" unless to and to.length > 0
-
-        # We want a snapshot of the mode before we start messing with it to
-        # make actions like 'a-g' atomic.  Various parts of the DSL refer to
-        # the original mode, the final mode, or the current snapshot of the
-        # mode, for added fun.
-        snapshot_mode = {}
-        final_mode.each { |k, v| snapshot_mode[k] = v }
-
-        to.gsub('a', 'ugo').split('').uniq.each do |who|
-          value = snapshot_mode[who]
-
-          action = '!'
-          actions = {
-            '!' => ->(_, _) { raise Puppet::Error, _('Missing operation (-, =, or +)') },
-            '=' => ->(m, v) { m | v },
-            '+' => ->(m, v) { m | v },
-            '-' => ->(m, v) { m & ~v },
-          }
-
-          dsl.split('').each do |op|
-            case op
-            when /[-+=]/
-              action = op
-              # Clear all bits, if this is assignment
-              value  = 0 if op == '='
-
-            when /[ugo]/
-              value = actions[action].call(value, snapshot_mode[op])
-
-            when /[rwx]/
-              value = actions[action].call(value, SymbolicMode[op])
-
-            when 'X'
-              # Only meaningful in combination with "set" actions.
-              if action != '+'
-                raise Puppet::Error, _("X only works with the '+' operator")
-              end
-
-              # As per the BSD manual page, set if this is a directory, or if
-              # any execute bit is set on the original (unmodified) mode.
-              # Ignored otherwise; it is "add if", not "add or clear".
-              if is_a_directory or original_mode['any x?']
-                value = actions[action].call(value, ExecBit)
-              end
-
-            when /[st]/
-              bit = SymbolicSpecialToBit[op][who] or fail _("internal error")
-              final_mode['s'] = actions[action].call(final_mode['s'], bit)
-
-            else
-              raise Puppet::Error, _('Unknown operation')
+      _, to, dsl = /^([ugoa]*)([-+=].*)$/.match(part).to_a
+      if dsl.nil? then raise Puppet::Error, _('Missing action') end
+
+      to = "a" unless to and to.length > 0
+
+      # We want a snapshot of the mode before we start messing with it to
+      # make actions like 'a-g' atomic.  Various parts of the DSL refer to
+      # the original mode, the final mode, or the current snapshot of the
+      # mode, for added fun.
+      snapshot_mode = {}
+      final_mode.each { |k, v| snapshot_mode[k] = v }
+
+      to.gsub('a', 'ugo').split('').uniq.each do |who|
+        value = snapshot_mode[who]
+
+        action = '!'
+        actions = {
+          '!' => ->(_, _) { raise Puppet::Error, _('Missing operation (-, =, or +)') },
+          '=' => ->(m, v) { m | v },
+          '+' => ->(m, v) { m | v },
+          '-' => ->(m, v) { m & ~v },
+        }
+
+        dsl.split('').each do |op|
+          case op
+          when /[-+=]/
+            action = op
+            # Clear all bits, if this is assignment
+            value  = 0 if op == '='
+
+          when /[ugo]/
+            value = actions[action].call(value, snapshot_mode[op])
+
+          when /[rwx]/
+            value = actions[action].call(value, SymbolicMode[op])
+
+          when 'X'
+            # Only meaningful in combination with "set" actions.
+            if action != '+'
+              raise Puppet::Error, _("X only works with the '+' operator")
             end
-          end
 
-          # Now, assign back the value.
-          final_mode[who] = value
-        end
-      rescue Puppet::Error => e
-        if part.inspect != modification.inspect
-          rest = " at #{part.inspect}"
-        else
-          rest = ''
+            # As per the BSD manual page, set if this is a directory, or if
+            # any execute bit is set on the original (unmodified) mode.
+            # Ignored otherwise; it is "add if", not "add or clear".
+            if is_a_directory or original_mode['any x?']
+              value = actions[action].call(value, ExecBit)
+            end
+
+          when /[st]/
+            bit = SymbolicSpecialToBit[op][who] or fail _("internal error")
+            final_mode['s'] = actions[action].call(final_mode['s'], bit)
+
+          else
+            raise Puppet::Error, _('Unknown operation')
+          end
         end
 
-        raise Puppet::Error, _("%{error}%{rest} in symbolic mode %{modification}") % { error: e, rest: rest, modification: modification.inspect }, e.backtrace
+        # Now, assign back the value.
+        final_mode[who] = value
       end
+    rescue Puppet::Error => e
+      if part.inspect != modification.inspect
+        rest = " at #{part.inspect}"
+      else
+        rest = ''
+      end
+
+      raise Puppet::Error, _("%{error}%{rest} in symbolic mode %{modification}") % { error: e, rest: rest, modification: modification.inspect }, e.backtrace
     end
 
-    result =
-      final_mode['s'] << 9 |
+    final_mode['s'] << 9 |
       final_mode['u'] << 6 |
       final_mode['g'] << 3 |
       final_mode['o'] << 0
-    return result
   end
 end
 end

data/lib/puppet/util/tag_set.rb

@@ -7,7 +7,7 @@ class Puppet::Util::TagSet < Set
   include Puppet::Network::FormatSupport
 
   def self.from_yaml(yaml)
-    self.new(Puppet::Util::Yaml.safe_load(yaml, [Symbol]))
+    new(Puppet::Util::Yaml.safe_load(yaml, [Symbol]))
   end
 
   def to_yaml
@@ -15,7 +15,7 @@ class Puppet::Util::TagSet < Set
   end
 
   def self.from_data_hash(data)
-    self.new(data)
+    new(data)
   end
 
   # TODO: A method named #to_data_hash should not return an array

data/lib/puppet/util/tagging.rb

@@ -71,7 +71,7 @@ module Puppet::Util::Tagging
   # @return [Boolean] true if this instance is tagged with at least one of the provided tags
   #
   def raw_tagged?(tag_array)
-    my_tags = self.tags
+    my_tags = tags
     !tag_array.index { |t| my_tags.include?(t) }.nil?
   end
 
@@ -109,16 +109,14 @@ module Puppet::Util::Tagging
   end
 
   def valid_tag?(maybe_tag)
-    begin
-      tag_enc = maybe_tag.encoding
-      if tag_enc == Encoding::UTF_8 || tag_enc == Encoding::ASCII
-        maybe_tag =~ ValidTagRegex
-      else
-        maybe_tag.encode(Encoding::UTF_8) =~ ValidTagRegex
-      end
-    rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-      false
+    tag_enc = maybe_tag.encoding
+    if tag_enc == Encoding::UTF_8 || tag_enc == Encoding::ASCII
+      maybe_tag =~ ValidTagRegex
+    else
+      maybe_tag.encode(Encoding::UTF_8) =~ ValidTagRegex
     end
+  rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
+    false
   end
 
   private

data/lib/puppet/util/terminal.rb

@@ -8,11 +8,11 @@ module Puppet::Util::Terminal
   # @return [Number] The column width of the terminal.  Defaults to 80 columns.
   def self.width
     if Puppet.features.posix?
-      result = %x{stty size 2>/dev/null}.split[1] ||
-               %x{tput cols 2>/dev/null}.split[0]
+      result = %x(stty size 2>/dev/null).split[1] ||
+               %x(tput cols 2>/dev/null).split[0]
     end
-    return (result || '80').to_i
+    (result || '80').to_i
   rescue
-    return 80
+    80
   end
 end

data/lib/puppet/util/user_attr.rb

@@ -9,14 +9,14 @@ class UserAttr
 
       token = line.split(':')
 
-      if token[0] == name
-        attributes = { :name => name }
-        token[4].split(';').each do |attr|
-          key_value = attr.split('=')
-          attributes[key_value[0].intern] = key_value[1].strip
-        end
-        break
+      next unless token[0] == name
+
+      attributes = { :name => name }
+      token[4].split(';').each do |attr|
+        key_value = attr.split('=')
+        attributes[key_value[0].intern] = key_value[1].strip
       end
+      break
     end
     attributes
   end

data/lib/puppet/util/watcher.rb

@@ -8,11 +8,9 @@ module Puppet::Util::Watcher
   module Common
     def self.file_ctime_change_watcher(filename)
       Puppet::Util::Watcher::ChangeWatcher.watch(lambda do
-        begin
-          Puppet::FileSystem.stat(filename).ctime
-        rescue Errno::ENOENT, Errno::ENOTDIR
-          :absent
-        end
+        Puppet::FileSystem.stat(filename).ctime
+      rescue Errno::ENOENT, Errno::ENOTDIR
+        :absent
       end)
     end
   end

data/lib/puppet/util/windows/access_control_list.rb

@@ -109,7 +109,7 @@ class Puppet::Util::Windows::AccessControlList
 
   def ==(other)
     self.class == other.class &&
-      self.to_a == other.to_a
+      to_a == other.to_a
   end
 
   alias eql? ==