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

data/lib/puppet/pops/types/types.rb

@@ -57,7 +57,7 @@ class TypedModelObject < Object
   def self.register_ptypes(loader, ir)
     types = [
       Annotation.register_ptype(loader, ir),
-      RubyMethod.register_ptype(loader, ir),
+      RubyMethod.register_ptype(loader, ir)
     ]
     Types.constants.each do |c|
       next if c == :PType || c == :PHostClassType
@@ -131,7 +131,7 @@ class PAnyType < TypedModelObject
       end
     when PVariantType
       # Assignable if all contained types are assignable, or if this is exactly Any
-      return true if self.instance_of?(PAnyType)
+      return true if instance_of?(PAnyType)
       # An empty variant may be assignable to NotUndef[T] if T is assignable to empty variant
       return _assignable?(o, guard) if is_a?(PNotUndefType) && o.types.empty?
 
@@ -342,7 +342,7 @@ class PAnyType < TypedModelObject
   # @raises ArgumentError
   #
   def self.new_function(type)
-    raise ArgumentError.new("Creation of new instance of type '#{type}' is not supported")
+    raise ArgumentError, "Creation of new instance of type '#{type}' is not supported"
   end
 
   # Answers the question if instances of this type can represent themselves as a string that
@@ -400,7 +400,7 @@ class PAnyType < TypedModelObject
     modified = false
     modified_types = types.map do |t|
       t_mod = t.send(method, *method_args)
-      modified = !t.equal?(t_mod) unless modified
+      modified ||= !t.equal?(t_mod)
       t_mod
     end
     if modified
@@ -737,7 +737,7 @@ class PScalarDataType < PScalarType
   end
 
   def instance?(o, guard = nil)
-    return o.instance_of?(String) || o.is_a?(Integer) || o.is_a?(Float) || o.is_a?(TrueClass) || o.is_a?(FalseClass)
+    o.instance_of?(String) || o.is_a?(Integer) || o.is_a?(Float) || o.is_a?(TrueClass) || o.is_a?(FalseClass)
   end
 
   DEFAULT = PScalarDataType.new
@@ -919,9 +919,9 @@ class PNumericType < PScalarDataType
 
             Puppet::Pops::Utils.to_n(from)
           rescue TypeError => e
-            raise TypeConversionError.new(e.message)
+            raise TypeConversionError, e.message
           rescue ArgumentError => e
-            raise TypeConversionError.new(e.message)
+            raise TypeConversionError, e.message
           end
         end
       end
@@ -952,7 +952,7 @@ class PNumericType < PScalarDataType
   # @return [Boolean] `true` if this range intersects with the other range
   # @api public
   def intersect?(o)
-    self.instance_of?(o.class) && !(@to < o.numeric_from || o.numeric_to < @from)
+    instance_of?(o.class) && !(@to < o.numeric_from || o.numeric_to < @from)
   end
 
   # Returns the lower bound of the numeric range or `nil` if no lower bound is set.
@@ -1088,7 +1088,11 @@ class PIntegerType < PNumericType
   # numbers are converted to zero
   # @return [PIntegerType] a positive range
   def to_size
-    @from >= 0 ? self : PIntegerType.new(0, @to < 0 ? 0 : @to)
+    if @from >= 0
+      self
+    else
+      PIntegerType.new(0, @to < 0 ? 0 : @to)
+    end
   end
 
   def new_function
@@ -1142,7 +1146,7 @@ class PIntegerType < PNumericType
           begin
             radix == :default ? Integer(from) : Integer(from, radix)
           rescue TypeError => e
-            raise TypeConversionError.new(e.message)
+            raise TypeConversionError, e.message
           rescue ArgumentError => e
             # Test for special case where there is whitespace between sign and number
             match = Patterns::WS_BETWEEN_SIGN_AND_NUMBER.match(from)
@@ -1154,7 +1158,7 @@ class PIntegerType < PNumericType
                 # Ignored to retain original error
               end
             end
-            raise TypeConversionError.new(e.message)
+            raise TypeConversionError, e.message
           end
         end
       end
@@ -1184,7 +1188,7 @@ class PIntegerType < PNumericType
         when 2, 8, 10, 16
           # do nothing
         else
-          raise ArgumentError.new(_("Illegal radix: %{radix}, expected 2, 8, 10, 16, or default") % { radix: radix })
+          raise ArgumentError, _("Illegal radix: %{radix}, expected 2, 8, 10, 16, or default") % { radix: radix }
         end
         radix
       end
@@ -1277,7 +1281,7 @@ class PFloatType < PNumericType
             end
             Float(from)
           rescue TypeError => e
-            raise TypeConversionError.new(e.message)
+            raise TypeConversionError, e.message
           rescue ArgumentError => e
             # Test for special case where there is whitespace between sign and number
             match = Patterns::WS_BETWEEN_SIGN_AND_NUMBER.match(from)
@@ -1289,7 +1293,7 @@ class PFloatType < PNumericType
                 # Ignored to retain original error
               end
             end
-            raise TypeConversionError.new(e.message)
+            raise TypeConversionError, e.message
           end
         end
       end
@@ -1816,7 +1820,7 @@ class PPatternType < PScalarDataType
       else
         # the string in String type must match one of the patterns in Pattern type,
         # or Pattern represents all Patterns == all Strings
-        regexps = @patterns.map { |p| p.regexp }
+        regexps = @patterns.map(&:regexp)
         regexps.empty? || regexps.any? { |re| re.match(v) }
       end
     when PEnumType
@@ -1827,7 +1831,7 @@ class PPatternType < PScalarDataType
       else
         # all strings in String/Enum type must match one of the patterns in Pattern type,
         # or Pattern represents all Patterns == all Strings
-        regexps = @patterns.map { |p| p.regexp }
+        regexps = @patterns.map(&:regexp)
         regexps.empty? || o.values.all? { |s| regexps.any? { |re| re.match(s) } }
       end
     when PPatternType
@@ -1963,7 +1967,7 @@ class PStructElement < TypedModelObject
   end
 
   def <=>(o)
-    self.name <=> o.name
+    name <=> o.name
   end
 
   def eql?(o)
@@ -2045,8 +2049,8 @@ class PStructType < PAnyType
     else
       PIterableType.new(
         PTupleType.new([
-                         PVariantType.maybe_create(@elements.map { |se| se.key_type }),
-                         PVariantType.maybe_create(@elements.map { |se| se.value_type })
+                         PVariantType.maybe_create(@elements.map(&:key_type)),
+                         PVariantType.maybe_create(@elements.map(&:value_type))
                        ],
                        PHashType::KEY_PAIR_TUPLE_SIZE)
       )
@@ -2434,7 +2438,7 @@ class PCallableType < PAnyType
     return false unless @param_types.instance?(args)
 
     if @block_type.nil?
-      block == nil
+      block.nil?
     else
       @block_type.instance?(block)
     end
@@ -2842,7 +2846,7 @@ class PHashType < PCollectionType
             {}
           else
             unless from.size.even?
-              raise TypeConversionError.new(_('odd number of arguments for Hash'))
+              raise TypeConversionError, _('odd number of arguments for Hash')
             end
 
             Hash[*from]
@@ -2854,7 +2858,7 @@ class PHashType < PCollectionType
             Hash[*Iterable.on(from).to_a]
           else
             t = TypeCalculator.singleton.infer(from).generalize
-            raise TypeConversionError.new(_("Value of type %{type} cannot be converted to Hash") % { type: t })
+            raise TypeConversionError, _("Value of type %{type} cannot be converted to Hash") % { type: t }
           end
         end
       end
@@ -3054,7 +3058,7 @@ class PVariantType < PAnyType
       not_undefs = parts[0]
       if not_undefs.size > 1
         others = parts[1]
-        others << PNotUndefType.new(PVariantType.maybe_create(not_undefs.map { |not_undef| not_undef.type }).normalize)
+        others << PNotUndefType.new(PVariantType.maybe_create(not_undefs.map(&:type)).normalize)
         array = others
       end
     end
@@ -3097,7 +3101,7 @@ class PVariantType < PAnyType
       patterns = parts[0]
       if patterns.size > 1
         others = parts[1]
-        others << PPatternType.new(patterns.map { |pattern| pattern.patterns }.flatten.uniq)
+        others << PPatternType.new(patterns.map(&:patterns).flatten.uniq)
         array = others
       end
     end

data/lib/puppet/pops/utils.rb

@@ -45,37 +45,35 @@ module Utils
   # @api public
   #
   def self.to_n_with_radix o
-    begin
-      case o
-      when String
-        match = Patterns::NUMERIC.match(relativize_name(o))
-        if !match
-          nil
-        elsif match[5].to_s.length > 0
-          fp_value = match_to_fp(match)
-          fp_value.nil? ? nil : [fp_value, 10]
-        else
-          # Set radix (default is decimal == 10)
-          radix = 10
-          if match[3].to_s.length > 0
-            radix = 16
-          elsif match[4].to_s.length > 1 && match[4][0, 1] == '0'
-            radix = 8
-          end
-          # Ruby 1.8.7 does not have a second argument to Kernel method that creates an
-          # integer from a string, it relies on the prefix 0x, 0X, 0 (and unsupported in puppet binary 'b')
-          # We have the correct string here, match[2] is safe to parse without passing on radix
-          match[1] == '-' ? [-Integer(match[2]), radix] : [Integer(match[2]), radix]
-        end
-      when Numeric
-        # Impossible to calculate radix, assume decimal
-        [o, 10]
-      else
+    case o
+    when String
+      match = Patterns::NUMERIC.match(relativize_name(o))
+      if !match
         nil
+      elsif match[5].to_s.length > 0
+        fp_value = match_to_fp(match)
+        fp_value.nil? ? nil : [fp_value, 10]
+      else
+        # Set radix (default is decimal == 10)
+        radix = 10
+        if match[3].to_s.length > 0
+          radix = 16
+        elsif match[4].to_s.length > 1 && match[4][0, 1] == '0'
+          radix = 8
+        end
+        # Ruby 1.8.7 does not have a second argument to Kernel method that creates an
+        # integer from a string, it relies on the prefix 0x, 0X, 0 (and unsupported in puppet binary 'b')
+        # We have the correct string here, match[2] is safe to parse without passing on radix
+        match[1] == '-' ? [-Integer(match[2]), radix] : [Integer(match[2]), radix]
       end
-    rescue ArgumentError
+    when Numeric
+      # Impossible to calculate radix, assume decimal
+      [o, 10]
+    else
       nil
     end
+  rescue ArgumentError
+    nil
   end
 
   # To Numeric (or already numeric)
@@ -84,25 +82,23 @@ module Utils
   # A leading '::' is accepted (and ignored)
   #
   def self.to_n o
-    begin
-      case o
-      when String
-        match = Patterns::NUMERIC.match(relativize_name(o))
-        if !match
-          nil
-        elsif match[5].to_s.length > 0
-          match_to_fp(match)
-        else
-          match[1] == '-' ? -Integer(match[2]) : Integer(match[2])
-        end
-      when Numeric
-        o
-      else
+    case o
+    when String
+      match = Patterns::NUMERIC.match(relativize_name(o))
+      if !match
         nil
+      elsif match[5].to_s.length > 0
+        match_to_fp(match)
+      else
+        match[1] == '-' ? -Integer(match[2]) : Integer(match[2])
       end
-    rescue ArgumentError
+    when Numeric
+      o
+    else
       nil
     end
+  rescue ArgumentError
+    nil
   end
 
   # is the name absolute (i.e. starts with ::)

data/lib/puppet/pops/validation/checker4_0.rb

@@ -325,11 +325,11 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     found_default = false
     o.options.each do |option|
       option.values.each do |value|
-        if value.is_a?(Model::LiteralDefault)
-          # Flag the second default as 'unreachable'
-          acceptor.accept(Issues::DUPLICATE_DEFAULT, value, :container => o) if found_default
-          found_default = true
-        end
+        next unless value.is_a?(Model::LiteralDefault)
+
+        # Flag the second default as 'unreachable'
+        acceptor.accept(Issues::DUPLICATE_DEFAULT, value, :container => o) if found_default
+        found_default = true
       end
     end
   end
@@ -573,7 +573,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     body = prog.body
     return if prog.body.is_a?(Model::Nop) # Ignore empty or comment-only files
 
-    if (body.is_a?(Model::BlockExpression))
+    if body.is_a?(Model::BlockExpression)
       body.statements.each { |s| acceptor.accept(Issues::ILLEGAL_TOP_CONSTRUCT_LOCATION, s) unless valid_top_construct?(s) }
     else
       acceptor.accept(Issues::ILLEGAL_TOP_CONSTRUCT_LOCATION, body) unless valid_top_construct?(body)
@@ -620,7 +620,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     # If a file comes from a module, but isn't in the right place, always error
     names = dir_to_names(relative_path)
 
-    return adapter.file_to_namespace[file] = (names == BAD_MODULE_FILE ? BAD_MODULE_FILE : names.join("::").freeze)
+    adapter.file_to_namespace[file] = (names == BAD_MODULE_FILE ? BAD_MODULE_FILE : names.join("::").freeze)
   end
 
   def initial_manifest?(path, manifest_setting)
@@ -647,7 +647,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     parent_dir_path = Pathname.new(parent_dir)
     clean_parent = parent_dir_path.cleanpath.to_s + File::SEPARATOR
 
-    return child_dir.start_with?(clean_parent)
+    child_dir.start_with?(clean_parent)
   end
   private :is_parent_dir_of?
 
@@ -670,7 +670,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     # Do not include name of module init file at top level of module
     # e.g. <module name>/manifests/init.pp
     filename = path_components[-1]
-    if !(path_components.length == 3 && filename == 'init.pp')
+    unless path_components.length == 3 && filename == 'init.pp'
       names.push(filename[0..-4]) # Remove .pp from filename
     end
 
@@ -1124,7 +1124,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   # Case expression is idem, if test, and all options are idem
   def idem_CaseExpression(o)
-    return false if !idem(o.test)
+    return false unless idem(o.test)
 
     !o.options.any? { |opt| !idem(opt) }
   end

data/lib/puppet/pops/validation/tasks_checker.rb

@@ -8,7 +8,7 @@ class TasksChecker < Checker4_0
   def in_ApplyExpression?
     top = container(0)
     step = -1
-    until container(step) == top do
+    until container(step) == top
       return true if container(step).is_a? Puppet::Pops::Model::ApplyBlockExpression
 
       step -= 1

data/lib/puppet/pops/validation/validator_factory_4_0.rb

@@ -36,6 +36,8 @@ class ValidatorFactory_4_0 < Factory
     p[Issues::NAME_WITH_HYPHEN]               = :error
     p[Issues::EMPTY_RESOURCE_SPECIALIZATION]  = :ignore
     p[Issues::CLASS_NOT_VIRTUALIZABLE]        = :error
+
+    p[Issues::ILLEGAL_NONLITERAL_PARAMETER_TYPE] = :deprecation
     p
   end
 end

data/lib/puppet/pops/validation.rb

@@ -126,13 +126,13 @@ module Validation
     #
     def []=(issue, level)
       unless issue.is_a? Issues::Issue
-        raise Puppet::DevError.new(_("Attempt to set validation severity for something that is not an Issue. (Got %{issue})") % { issue: issue.class })
+        raise Puppet::DevError, _("Attempt to set validation severity for something that is not an Issue. (Got %{issue})") % { issue: issue.class }
       end
       unless SEVERITIES[level]
-        raise Puppet::DevError.new(_("Illegal severity level: %{level} for '%{issue_code}'") % { issue_code: issue.issue_code, level: level })
+        raise Puppet::DevError, _("Illegal severity level: %{level} for '%{issue_code}'") % { issue_code: issue.issue_code, level: level }
       end
       unless issue.demotable? || level == :error
-        raise Puppet::DevError.new(_("Attempt to demote the hard issue '%{issue_code}' to %{level}") % { issue_code: issue.issue_code, level: level })
+        raise Puppet::DevError, _("Attempt to demote the hard issue '%{issue_code}' to %{level}") % { issue_code: issue.issue_code, level: level }
       end
 
       @severities[issue] = level
@@ -153,7 +153,7 @@ module Validation
     #
     def assert_issue issue
       unless issue.is_a? Issues::Issue
-        raise Puppet::DevError.new(_("Attempt to get validation severity for something that is not an Issue. (Got %{issue})") % { issue: issue.class })
+        raise Puppet::DevError, _("Attempt to get validation severity for something that is not an Issue. (Got %{issue})") % { issue: issue.class }
       end
     end
   end

data/lib/puppet/pops/visitor.rb

@@ -16,8 +16,8 @@ class Visitor
   attr_reader :receiver, :message, :min_args, :max_args, :cache
 
   def initialize(receiver, message, min_args = 0, max_args = nil)
-    raise ArgumentError.new("min_args must be >= 0") if min_args < 0
-    raise ArgumentError.new("max_args must be >= min_args or nil") if max_args && max_args < min_args
+    raise ArgumentError, "min_args must be >= 0" if min_args < 0
+    raise ArgumentError, "max_args must be >= min_args or nil" if max_args && max_args < min_args
 
     @receiver = receiver
     @message = message

data/lib/puppet/property/ensure.rb

@@ -52,19 +52,17 @@ class Puppet::Property::Ensure < Puppet::Property
   end
 
   def change_to_s(currentvalue, newvalue)
-    begin
-      if currentvalue == :absent || currentvalue.nil?
-        return _("created")
-      elsif newvalue == :absent
-        return _("removed")
-      else
-        return _('%{name} changed %{is} to %{should}') % { name: name, is: is_to_s(currentvalue), should: should_to_s(newvalue) }
-      end
-    rescue Puppet::Error
-      raise
-    rescue => detail
-      raise Puppet::DevError, _("Could not convert change %{name} to string: %{detail}") % { name: self.name, detail: detail }, detail.backtrace
+    if currentvalue == :absent || currentvalue.nil?
+      _("created")
+    elsif newvalue == :absent
+      _("removed")
+    else
+      _('%{name} changed %{is} to %{should}') % { name: name, is: is_to_s(currentvalue), should: should_to_s(newvalue) }
     end
+  rescue Puppet::Error
+    raise
+  rescue => detail
+    raise Puppet::DevError, _("Could not convert change %{name} to string: %{detail}") % { name: name, detail: detail }, detail.backtrace
   end
 
   # Retrieves the _is_ value for the ensure property.
@@ -90,9 +88,9 @@ class Puppet::Property::Ensure < Puppet::Property
       raise Puppet::DevError, _("No ability to determine if %{name} exists") % { name: @resource.class.name }
     end
     if result
-      return :present
+      :present
     else
-      return :absent
+      :absent
     end
   end
 

data/lib/puppet/property/keyvalue.rb

@@ -110,9 +110,9 @@ module Puppet
         # ok, some 'convention' if the keyvalue property is named properties, provider should implement a properties method
         key_hash = provider.send(name) if provider
         if key_hash && key_hash != :absent
-          return key_hash
+          key_hash
         else
-          return :absent
+          :absent
         end
       end
 
@@ -121,7 +121,7 @@ module Puppet
       def insync?(is)
         return true unless is
 
-        (is == self.should)
+        (is == should)
       end
 
       # We only accept an array of key/value pairs (strings), a single
@@ -135,7 +135,7 @@ module Puppet
 
         next if value.is_a?(Hash)
 
-        unless value.include?("#{separator}")
+        unless value.include?(separator.to_s)
           raise ArgumentError, _("Key/value pairs must be separated by '%{separator}'") % { separator: separator }
         end
       end

data/lib/puppet/property/list.rb

@@ -35,7 +35,7 @@ module Puppet
 
         members = @should
         # inclusive means we are managing everything so if it isn't in should, its gone
-        members = add_should_with_current(members, retrieve) if !inclusive?
+        members = add_should_with_current(members, retrieve) unless inclusive?
 
         dearrayify(members)
       end
@@ -48,9 +48,9 @@ module Puppet
         # ok, some 'convention' if the list property is named groups, provider should implement a groups method
         tmp = provider.send(name) if provider
         if tmp && tmp != :absent
-          return tmp.instance_of?(Array) ? tmp : tmp.split(delimiter)
+          tmp.instance_of?(Array) ? tmp : tmp.split(delimiter)
         else
-          return :absent
+          :absent
         end
       end
 
@@ -64,7 +64,7 @@ module Puppet
       def insync?(is)
         return true unless is
 
-        (prepare_is_for_comparison(is) == self.should)
+        (prepare_is_for_comparison(is) == should)
       end
     end
   end

data/lib/puppet/property/ordered_list.rb

@@ -17,7 +17,7 @@ module Puppet
           # tricky trick
           # Preserve all the current items in the list
           # but move them to the back of the line
-          should = should + (current - should)
+          should += (current - should)
         end
         should
       end