puppet 8.5.1-universal-darwin → 8.7.0-universal-darwin

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? ==

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

@@ -24,19 +24,15 @@ module Puppet::Util::Windows::ADSI
     extend FFI::Library
 
     def connectable?(uri)
-      begin
-        !!connect(uri)
-      rescue
-        false
-      end
+      !!connect(uri)
+    rescue
+      false
     end
 
     def connect(uri)
-      begin
-        WIN32OLE.connect(uri)
-      rescue WIN32OLERuntimeError => e
-        raise Puppet::Error.new(_("ADSI connection error: %{e}") % { e: e }, e)
-      end
+      WIN32OLE.connect(uri)
+    rescue WIN32OLERuntimeError => e
+      raise Puppet::Error.new(_("ADSI connection error: %{e}") % { e: e }, e)
     end
 
     def create(name, resource_type)
@@ -58,7 +54,7 @@ module Puppet::Util::Windows::ADSI
             buffer_size.write_dword(max_length) # length in TCHARs
 
             if GetComputerNameW(buffer, buffer_size) == FFI::WIN32_FALSE
-              raise Puppet::Util::Windows::Error.new(_("Failed to get computer name"))
+              raise Puppet::Util::Windows::Error, _("Failed to get computer name")
             end
 
             @computer_name = buffer.read_wide_string(buffer_size.read_dword)
@@ -97,7 +93,7 @@ module Puppet::Util::Windows::ADSI
     # used for IAdsGroup::Add / IAdsGroup::Remove.  These URIs are not useable
     # to resolve an account with WIN32OLE.connect
     def sid_uri(sid)
-      raise Puppet::Error.new(_("Must use a valid SID::Principal")) if !sid.is_a?(Puppet::Util::Windows::SID::Principal)
+      raise Puppet::Error, _("Must use a valid SID::Principal") unless sid.is_a?(Puppet::Util::Windows::SID::Principal)
 
       "WinNT://#{sid.sid}"
     end
@@ -161,15 +157,15 @@ module Puppet::Util::Windows::ADSI
       end
 
       def parse_name(name)
-        if name =~ /\//
-          raise Puppet::Error.new(_("Value must be in DOMAIN\\%{object_class} style syntax") % { object_class: @object_class })
+        if name =~ %r{/}
+          raise Puppet::Error, _("Value must be in DOMAIN\\%{object_class} style syntax") % { object_class: @object_class }
         end
 
         matches = name.scan(/((.*)\\)?(.*)/)
         domain = matches[0][1] || '.'
         account = matches[0][2]
 
-        return account, domain
+        [account, domain]
       end
 
       # returns Puppet::Util::Windows::SID::Principal[]
@@ -195,7 +191,7 @@ module Puppet::Util::Windows::ADSI
 
         sids = names.map do |name|
           sid = Puppet::Util::Windows::SID.name_to_principal(name, allow_unresolved)
-          raise Puppet::Error.new(_("Could not resolve name: %{name}") % { name: name }) if !sid
+          raise Puppet::Error, _("Could not resolve name: %{name}") % { name: name } unless sid
 
           [sid.sid, sid]
         end
@@ -292,9 +288,7 @@ module Puppet::Util::Windows::ADSI
       rescue WIN32OLERuntimeError => e
         # ERROR_BAD_USERNAME 2202L from winerror.h
         if e.message =~ /8007089A/m
-          raise Puppet::Error.new(
-            _("Puppet is not able to create/delete domain %{object_class} objects with the %{object_class} resource.") % { object_class: object_class },
-          )
+          raise Puppet::Error, _("Puppet is not able to create/delete domain %{object_class} objects with the %{object_class} resource.") % { object_class: object_class }
         end
 
         raise Puppet::Error.new(_("%{object_class} update failed: %{error}") % { object_class: object_class.capitalize, error: e }, e)
@@ -323,7 +317,7 @@ module Puppet::Util::Windows::ADSI
 
       def create(name)
         # Windows error 1379: The specified local group already exists.
-        raise Puppet::Error.new(_("Cannot create user if group '%{name}' exists.") % { name: name }) if Puppet::Util::Windows::ADSI::Group.exists? name
+        raise Puppet::Error, _("Cannot create user if group '%{name}' exists.") % { name: name } if Puppet::Util::Windows::ADSI::Group.exists? name
 
         new(name, Puppet::Util::Windows::ADSI.create(name, @object_class))
       end
@@ -334,7 +328,11 @@ module Puppet::Util::Windows::ADSI
     end
 
     def add_flag(flag_name, value)
-      flag = native_object.Get(flag_name) rescue 0
+      flag = begin
+        native_object.Get(flag_name)
+      rescue
+        0
+      end
 
       native_object.Put(flag_name, flag | value)
 
@@ -342,7 +340,7 @@ module Puppet::Util::Windows::ADSI
     end
 
     def password=(password)
-      if !password.nil?
+      unless password.nil?
         native_object.SetPassword(password)
         commit
       end
@@ -356,7 +354,11 @@ module Puppet::Util::Windows::ADSI
       # WIN32OLE objects aren't enumerable, so no map
       groups = []
       # Setting WIN32OLE.codepage ensures values are returned as UTF-8
-      native_object.Groups.each { |g| groups << g.Name } rescue nil
+      begin
+        native_object.Groups.each { |g| groups << g.Name }
+      rescue
+        nil
+      end
       groups
     end
 
@@ -375,12 +377,12 @@ module Puppet::Util::Windows::ADSI
     alias remove_from_group remove_from_groups
 
     def add_group_sids(*sids)
-      group_names = sids.map { |s| s.domain_account }
+      group_names = sids.map(&:domain_account)
       add_to_groups(*group_names)
     end
 
     def remove_group_sids(*sids)
-      group_names = sids.map { |s| s.domain_account }
+      group_names = sids.map(&:domain_account)
       remove_from_groups(*group_names)
     end
 
@@ -397,18 +399,18 @@ module Puppet::Util::Windows::ADSI
 
       desired_groups = desired_groups.split(',').map(&:strip)
 
-      current_hash = self.group_sids.to_h { |sid| [sid.sid, sid] }
+      current_hash = group_sids.to_h { |sid| [sid.sid, sid] }
       desired_hash = self.class.name_sid_hash(desired_groups)
 
       # First we add the user to all the groups it should be in but isn't
-      if !desired_groups.empty?
+      unless desired_groups.empty?
         groups_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
         add_group_sids(*groups_to_add)
       end
 
       # Then we remove the user from all groups it is in but shouldn't be, if
       # that's been requested
-      if !minimum
+      unless minimum
         if desired_hash.empty?
           groups_to_remove = current_hash.values
         else
@@ -508,7 +510,7 @@ module Puppet::Util::Windows::ADSI
           buffer_size.write_dword(max_length) # length in TCHARs
 
           if GetUserNameW(buffer, buffer_size) == FFI::WIN32_FALSE
-            raise Puppet::Util::Windows::Error.new(_("Failed to get user name"))
+            raise Puppet::Util::Windows::Error, _("Failed to get user name")
           end
 
           # buffer_size includes trailing NULL
@@ -583,17 +585,15 @@ module Puppet::Util::Windows::ADSI
 
   class UserProfile
     def self.delete(sid)
-      begin
-        Puppet::Util::Windows::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
-      rescue WIN32OLERuntimeError => e
-        # https://social.technet.microsoft.com/Forums/en/ITCG/thread/0f190051-ac96-4bf1-a47f-6b864bfacee5
-        # Prior to Vista SP1, there's no built-in way to programmatically
-        # delete user profiles (except for delprof.exe). So try to delete
-        # but warn if we fail
-        raise e unless e.message.include?('80041010')
+      Puppet::Util::Windows::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
+    rescue WIN32OLERuntimeError => e
+      # https://social.technet.microsoft.com/Forums/en/ITCG/thread/0f190051-ac96-4bf1-a47f-6b864bfacee5
+      # Prior to Vista SP1, there's no built-in way to programmatically
+      # delete user profiles (except for delprof.exe). So try to delete
+      # but warn if we fail
+      raise e unless e.message.include?('80041010')
 
-        Puppet.warning _("Cannot delete user profile for '%{sid}' prior to Vista SP1") % { sid: sid }
-      end
+      Puppet.warning _("Cannot delete user profile for '%{sid}' prior to Vista SP1") % { sid: sid }
     end
   end
 
@@ -609,7 +609,7 @@ module Puppet::Util::Windows::ADSI
 
       def create(name)
         # Windows error 2224: The account already exists.
-        raise Puppet::Error.new(_("Cannot create group if user '%{name}' exists.") % { name: name }) if Puppet::Util::Windows::ADSI::User.exists?(name)
+        raise Puppet::Error, _("Cannot create group if user '%{name}' exists.") % { name: name } if Puppet::Util::Windows::ADSI::User.exists?(name)
 
         new(name, Puppet::Util::Windows::ADSI.create(name, @object_class))
       end
@@ -638,11 +638,11 @@ module Puppet::Util::Windows::ADSI
     def set_members(desired_members, inclusive = true)
       return if desired_members.nil?
 
-      current_hash = self.member_sids.to_h { |sid| [sid.sid, sid] }
+      current_hash = member_sids.to_h { |sid| [sid.sid, sid] }
       desired_hash = self.class.name_sid_hash(desired_members)
 
       # First we add all missing members
-      if !desired_hash.empty?
+      unless desired_hash.empty?
         members_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
         add_member_sids(*members_to_add)
       end

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

@@ -141,7 +141,7 @@ module Puppet::Util::Windows::COM
 
         self::VTBL.members.each do |name|
           define_method(name) do |*args|
-            if Puppet::Util::Windows::COM.FAILED(result = @vtbl[name].call(self, *args))
+            if Puppet::Util::Windows::COM.FAILED((result = @vtbl[name].call(self, *args)))
               raise Puppet::Util::Windows::Error.new(_("Failed to call %{klass}::%{name} with HRESULT: %{result}.") % { klass: self, name: name, result: result }, result)
             end
 
@@ -183,7 +183,7 @@ module Puppet::Util::Windows::COM
 
         self::VTBL.members.each do |name|
           define_method(name) do |*args|
-            if Puppet::Util::Windows::COM.FAILED(result = @vtbl[name].call(self, *args))
+            if Puppet::Util::Windows::COM.FAILED((result = @vtbl[name].call(self, *args)))
               raise Puppet::Util::Windows::Error.new(_("Failed to call %{klass}::%{name} with HRESULT: %{result}.") % { klass: self, name: name, result: result }, result)
             end