puppet 8.4.0 → 8.5.0

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

@@ -99,7 +99,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     when Model::BlockExpression
       c = container(idx)
       if !c.is_a?(Model::Program) &&
-        (definition.is_a?(Model::FunctionDefinition) || definition.is_a?(Model::TypeAlias) || definition.is_a?(Model::TypeDefinition))
+         (definition.is_a?(Model::FunctionDefinition) || definition.is_a?(Model::TypeAlias) || definition.is_a?(Model::TypeDefinition))
 
         # not ok. These can never be nested in a block
         acceptor.accept(Issues::NOT_ABSOLUTE_TOP_LEVEL, definition)
@@ -173,7 +173,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   end
 
   def assign_LiteralList(o, via_index)
-    o.values.each {|x| assign(x) }
+    o.values.each { |x| assign(x) }
   end
 
   def assign_Object(o, via_index)
@@ -206,9 +206,9 @@ class Checker4_0 < Evaluator::LiteralEvaluator
       assign(o.left_expr)
       rvalue(o.right_expr)
     when '+=', '-='
-      acceptor.accept(Issues::APPENDS_DELETES_NO_LONGER_SUPPORTED, o, {:operator => o.operator})
+      acceptor.accept(Issues::APPENDS_DELETES_NO_LONGER_SUPPORTED, o, { :operator => o.operator })
     else
-      acceptor.accept(Issues::UNSUPPORTED_OPERATOR, o, {:operator => o.operator})
+      acceptor.accept(Issues::UNSUPPORTED_OPERATOR, o, { :operator => o.operator })
     end
   end
 
@@ -225,7 +225,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
       # Append operator use is constrained
       p = container
       unless p.is_a?(Model::CollectExpression) || p.is_a?(Model::ResourceOverrideExpression)
-        acceptor.accept(Issues::ILLEGAL_ATTRIBUTE_APPEND, o, {:name=>o.attribute_name, :parent=>p})
+        acceptor.accept(Issues::ILLEGAL_ATTRIBUTE_APPEND, o, { :name => o.attribute_name, :parent => p })
       end
     end
     rvalue(o.value_expr)
@@ -244,7 +244,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
       # but it is not for a real program.
       parent2 = p.nil? ? o : container(-2)
       unless parent2.is_a?(Model::AbstractResource)
-        acceptor.accept(Issues::UNSUPPORTED_OPERATOR_IN_CONTEXT, parent2, :operator=>'* =>')
+        acceptor.accept(Issues::UNSUPPORTED_OPERATOR_IN_CONTEXT, parent2, :operator => '* =>')
       end
     end
     rvalue(o.expr)
@@ -280,7 +280,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def check_CallNamedFunctionExpression(o)
     functor = o.functor_expr
     if functor.is_a?(Model::QualifiedReference) ||
-      functor.is_a?(Model::AccessExpression) && functor.left_expr.is_a?(Model::QualifiedReference)
+       functor.is_a?(Model::AccessExpression) && functor.left_expr.is_a?(Model::QualifiedReference)
       # ok (a call to a type)
       return nil
     end
@@ -293,7 +293,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
       # helpful to point out this easy to make Epp error
       acceptor.accept(Issues::ILLEGAL_EPP_PARAMETERS, o)
     else
-      acceptor.accept(Issues::ILLEGAL_EXPRESSION, o.functor_expr, {:feature=>'function name', :container => o})
+      acceptor.accept(Issues::ILLEGAL_EXPRESSION, o.functor_expr, { :feature => 'function name', :container => o })
     end
   end
 
@@ -340,7 +340,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   def check_CollectExpression(o)
     unless o.type_expr.is_a? Model::QualifiedReference
-      acceptor.accept(Issues::ILLEGAL_EXPRESSION, o.type_expr, :feature=> 'type name', :container => o)
+      acceptor.accept(Issues::ILLEGAL_EXPRESSION, o.type_expr, :feature => 'type name', :container => o)
     end
   end
 
@@ -349,7 +349,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def check_NamedAccessExpression(o)
     name = o.right_expr
     unless name.is_a? Model::QualifiedName
-      acceptor.accept(Issues::ILLEGAL_EXPRESSION, name, :feature=> 'function name', :container => container)
+      acceptor.accept(Issues::ILLEGAL_EXPRESSION, name, :feature => 'function name', :container => container)
     end
   end
 
@@ -392,7 +392,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def check_NamedDefinition(o)
     top(o)
     if o.name !~ Patterns::CLASSREF_DECL
-      acceptor.accept(Issues::ILLEGAL_DEFINITION_NAME, o, {:name=>o.name})
+      acceptor.accept(Issues::ILLEGAL_DEFINITION_NAME, o, { :name => o.name })
     end
 
     internal_check_file_namespace(o)
@@ -403,7 +403,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def check_TypeAlias(o)
     top(o)
     if o.name !~ Patterns::CLASSREF_EXT_DECL
-      acceptor.accept(Issues::ILLEGAL_DEFINITION_NAME, o, {:name=>o.name})
+      acceptor.accept(Issues::ILLEGAL_DEFINITION_NAME, o, { :name => o.name })
     end
     internal_check_reserved_type_name(o, o.name)
     internal_check_type_ref(o, o.type_expr)
@@ -472,6 +472,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     internal_check_parameter_name_uniqueness(o)
     internal_check_reserved_params(o)
     internal_check_no_idem_last(o)
+    internal_check_parameter_type_literal(o)
   end
 
   def check_ResourceTypeDefinition(o)
@@ -482,6 +483,18 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     internal_check_no_idem_last(o)
   end
 
+  def internal_check_parameter_type_literal(o)
+    o.parameters.each do |p|
+      next unless p.type_expr
+
+      type = nil
+      catch :not_literal do
+        type = literal(p.type_expr)
+      end
+      acceptor.accept(Issues::ILLEGAL_NONLITERAL_PARAMETER_TYPE, p, { name: p.name, type_class: p.type_expr.class }) if type.nil?
+    end
+  end
+
   def internal_check_return_type(o)
     r = o.return_type
     internal_check_type_ref(o, r) unless r.nil?
@@ -499,15 +512,15 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def internal_check_no_idem_last(o)
     violator = ends_with_idem(o.body)
     if violator
-      acceptor.accept(Issues::IDEM_NOT_ALLOWED_LAST, violator, {:container => o}) unless resource_without_title?(violator)
+      acceptor.accept(Issues::IDEM_NOT_ALLOWED_LAST, violator, { :container => o }) unless resource_without_title?(violator)
     end
   end
 
   def internal_check_capture_last(o)
-    accepted_index = o.parameters.size() -1
+    accepted_index = o.parameters.size() - 1
     o.parameters.each_with_index do |p, index|
       if p.captures_rest && index != accepted_index
-        acceptor.accept(Issues::CAPTURES_REST_NOT_LAST, p, {:param_name => p.name})
+        acceptor.accept(Issues::CAPTURES_REST_NOT_LAST, p, { :param_name => p.name })
       end
     end
   end
@@ -515,20 +528,20 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def internal_check_no_capture(o, container = o)
     o.parameters.each do |p|
       if p.captures_rest
-        acceptor.accept(Issues::CAPTURES_REST_NOT_SUPPORTED, p, {:container => container, :param_name => p.name})
+        acceptor.accept(Issues::CAPTURES_REST_NOT_SUPPORTED, p, { :container => container, :param_name => p.name })
       end
     end
   end
 
   def internal_check_reserved_type_name(o, name)
     if RESERVED_TYPE_NAMES[name]
-      acceptor.accept(Issues::RESERVED_TYPE_NAME, o, {:name => name})
+      acceptor.accept(Issues::RESERVED_TYPE_NAME, o, { :name => name })
     end
   end
 
   def internal_check_future_reserved_word(o, name)
     if FUTURE_RESERVED_WORDS[name]
-      acceptor.accept(Issues::FUTURE_RESERVED_WORD, o, {:word => name})
+      acceptor.accept(Issues::FUTURE_RESERVED_WORD, o, { :word => name })
     end
   end
 
@@ -545,7 +558,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
     # Downcasing here because check is case-insensitive
     if file_namespace == BAD_MODULE_FILE || !o.name.downcase.start_with?(file_namespace)
-      acceptor.accept(Issues::ILLEGAL_DEFINITION_LOCATION, o, {:name => o.name, :file => file})
+      acceptor.accept(Issues::ILLEGAL_DEFINITION_LOCATION, o, { :name => o.name, :file => file })
     end
   end
 
@@ -560,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)
@@ -651,14 +664,14 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     # and from the manifests dir there.  This may never get used...
     return BAD_MODULE_FILE unless dir == 'manifests' || dir == 'functions' || dir == 'types' || dir == 'plans'
 
-    names = path_components[2 .. -2] # Directories inside module
+    names = path_components[2..-2] # Directories inside module
     names.unshift(path_components[0]) # Name of the module itself
 
     # 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')
-      names.push(filename[0 .. -4]) # Remove .pp from filename
+      names.push(filename[0..-4]) # Remove .pp from filename
     end
 
     names
@@ -672,7 +685,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def internal_check_reserved_params(o)
     o.parameters.each do |p|
       if RESERVED_PARAMETERS[p.name]
-        acceptor.accept(Issues::RESERVED_PARAMETER, p, {:container => o, :param_name => p.name})
+        acceptor.accept(Issues::RESERVED_PARAMETER, p, { :container => o, :param_name => p.name })
       end
     end
   end
@@ -680,7 +693,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def internal_check_parameter_name_uniqueness(o)
     unique = Set.new
     o.parameters.each do |p|
-      acceptor.accept(Issues::DUPLICATE_PARAMETER, p, {:param_name => p.name}) unless unique.add?(p.name)
+      acceptor.accept(Issues::DUPLICATE_PARAMETER, p, { :param_name => p.name }) unless unique.add?(p.name)
     end
   end
 
@@ -701,13 +714,13 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   end
 
   def check_LiteralList(o)
-    o.values.each {|v| rvalue(v) }
+    o.values.each { |v| rvalue(v) }
   end
 
   def check_LiteralInteger(o)
     v = o.value
     if v < MIN_INTEGER || v > MAX_INTEGER
-      acceptor.accept(Issues::NUMERIC_OVERFLOW, o, {:value => v})
+      acceptor.accept(Issues::NUMERIC_OVERFLOW, o, { :value => v })
     end
   end
 
@@ -717,7 +730,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     o.entries.each do |entry|
       catch(:not_literal) do
         literal_key = literal(entry.key)
-        acceptor.accept(Issues::DUPLICATE_KEY, entry, {:key => literal_key}) if unique.add?(literal_key).nil?
+        acceptor.accept(Issues::DUPLICATE_KEY, entry, { :key => literal_key }) if unique.add?(literal_key).nil?
       end
     end
   end
@@ -728,7 +741,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     top(o)
     violator = ends_with_idem(o.body)
     if violator
-      acceptor.accept(Issues::IDEM_NOT_ALLOWED_LAST, violator, {:container => o}) unless resource_without_title?(violator)
+      acceptor.accept(Issues::IDEM_NOT_ALLOWED_LAST, violator, { :container => o }) unless resource_without_title?(violator)
     end
     unless o.parent.nil?
       acceptor.accept(Issues::ILLEGAL_NODE_INHERITANCE, o.parent)
@@ -748,7 +761,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def check_QualifiedReference(o)
     # Is this a valid qualified name?
     if o.cased_value !~ Patterns::CLASSREF_EXT
-      acceptor.accept(Issues::ILLEGAL_CLASSREF, o, {:name=>o.cased_value})
+      acceptor.accept(Issues::ILLEGAL_CLASSREF, o, { :name => o.cased_value })
     end
   end
 
@@ -783,7 +796,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     else
       # recursively check all contents unless it's a lambda expression. A lambda may contain
       # local assignments
-      o._pcore_contents {|model| internal_check_illegal_assignment(model) } unless o.is_a?(Model::LambdaExpression)
+      o._pcore_contents { |model| internal_check_illegal_assignment(model) } unless o.is_a?(Model::LambdaExpression)
     end
   end
 
@@ -848,7 +861,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   def check_SelectorExpression(o)
     rvalue(o.left_expr)
     # There can only be one LiteralDefault case option value
-    defaults = o.selectors.select {|v| v.matching_expr.is_a?(Model::LiteralDefault) }
+    defaults = o.selectors.select { |v| v.matching_expr.is_a?(Model::LiteralDefault) }
     unless defaults.size <= 1
       # Flag the second default as 'unreachable'
       acceptor.accept(Issues::DUPLICATE_DEFAULT, defaults[1].matching_expr, :container => o)
@@ -879,7 +892,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
     else
       # name must be either a decimal string value, or a valid NAME
       name = o.expr.value
-      if name[0,1] =~ /[0-9]/
+      if name[0, 1] =~ /[0-9]/
         unless name =~ Patterns::NUMERIC_VAR_NAME
           acceptor.accept(Issues::ILLEGAL_NUMERIC_VAR_NAME, o, :name => name)
         end
@@ -895,7 +908,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   # Transforms Array of host matching expressions into a (Ruby) array of AST::HostName
   def hostname_Array(o, semantic)
-    o.each {|x| hostname(x, semantic) }
+    o.each { |x| hostname(x, semantic) }
   end
 
   def hostname_String(o, semantic)
@@ -914,7 +927,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   def hostname_ConcatenatedString(o, semantic)
     # Puppet 3.1. only accepts a concatenated string without interpolated expressions
-    the_expr = o.segments.index {|s| s.is_a?(Model::TextExpression) }
+    the_expr = o.segments.index { |s| s.is_a?(Model::TextExpression) }
     if the_expr
       acceptor.accept(Issues::ILLEGAL_HOSTNAME_INTERPOLATION, o.segments[the_expr].expr)
     elsif o.segments.size() != 1
@@ -948,7 +961,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   end
 
   def hostname_Object(o, semantic)
-    acceptor.accept(Issues::ILLEGAL_EXPRESSION, o, {:feature => 'hostname', :container => semantic})
+    acceptor.accept(Issues::ILLEGAL_EXPRESSION, o, { :feature => 'hostname', :container => semantic })
   end
 
   #---QUERY CHECKS
@@ -1078,7 +1091,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   def idem_BlockExpression(o)
     # productive if there is at least one productive expression
-    ! o.statements.any? {|expr| !idem(expr) }
+    !o.statements.any? { |expr| !idem(expr) }
   end
 
   # Returns true even though there may be interpolated expressions that have side effect.
@@ -1106,14 +1119,14 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   end
 
   def idem_IfExpression(o)
-    [o.test, o.then_expr, o.else_expr].all? {|e| idem(e) }
+    [o.test, o.then_expr, o.else_expr].all? { |e| idem(e) }
   end
 
   # Case expression is idem, if test, and all options are idem
   def idem_CaseExpression(o)
     return false if !idem(o.test)
 
-    ! o.options.any? {|opt| !idem(opt) }
+    !o.options.any? { |opt| !idem(opt) }
   end
 
   # An option is idem if values and the then_expression are idem

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

@@ -22,7 +22,7 @@ class TasksChecker < Checker4_0
       if o.query.is_a?(Puppet::Pops::Model::VirtualQuery)
         super(o)
       else
-        acceptor.accept(Issues::EXPRESSION_NOT_SUPPORTED_WHEN_COMPILING, o, {:klass => o})
+        acceptor.accept(Issues::EXPRESSION_NOT_SUPPORTED_WHEN_COMPILING, o, { :klass => o })
       end
     else
       illegalTasksExpression(o)
@@ -79,12 +79,12 @@ class TasksChecker < Checker4_0
 
   def check_ApplyExpression(o)
     if in_ApplyExpression?
-      acceptor.accept(Issues::EXPRESSION_NOT_SUPPORTED_WHEN_COMPILING, o, {:klass => o})
+      acceptor.accept(Issues::EXPRESSION_NOT_SUPPORTED_WHEN_COMPILING, o, { :klass => o })
     end
   end
 
   def illegalTasksExpression(o)
-    acceptor.accept(Issues::EXPRESSION_NOT_SUPPORTED_WHEN_SCRIPTING, o, {:klass => o})
+    acceptor.accept(Issues::EXPRESSION_NOT_SUPPORTED_WHEN_SCRIPTING, o, { :klass => o })
   end
 
   def resource_without_title?(o)

data/lib/puppet/pops/validation.rb

@@ -191,7 +191,7 @@ module Validation
       @label_provider     = label_provider
     end
 
-    def accept(issue, semantic, arguments={}, except=nil)
+    def accept(issue, semantic, arguments = {}, except = nil)
       return unless will_accept? issue
 
       # Set label provider unless caller provided a special label provider
@@ -206,7 +206,7 @@ module Validation
       if semantic.is_a?(StandardError)
         unless semantic.respond_to?(:file) && semantic.respond_to?(:line) && semantic.respond_to?(:pos)
           raise Puppet::DevError, _("Issue %{issue_code}: Cannot pass a %{class_name} as a semantic object when it does not support #pos(), #file() and #line()") %
-              { issue_code: issue.issue_code, class_name: semantic.class }
+                                  { issue_code: issue.issue_code, class_name: semantic.class }
         end
       end
 
@@ -230,7 +230,7 @@ module Validation
     attr_reader :file
     attr_reader :source_pos
 
-    def initialize severity, issue, file, source_pos, arguments={}, exception=nil
+    def initialize severity, issue, file, source_pos, arguments = {}, exception = nil
       @severity = severity
       @issue = issue
       @file = file
@@ -243,7 +243,7 @@ module Validation
 
     # Two diagnostics are considered equal if the have the same issue, location and severity
     # (arguments and exception are ignored)
-    # rubocop:disable Layout/ExtraSpacing
+    # rubocop:disable Layout
     def ==(o)
       self.class            == o.class             &&
         same_position?(o)                          &&
@@ -252,17 +252,17 @@ module Validation
         severity            == o.severity
     end
     alias eql? ==
-    # rubocop:enable Layout/ExtraSpacing
+    # rubocop:enable Layout
+
+    def hash
+      @hash ||= [file, source_pos.offset, issue.issue_code, severity].hash
+    end
 
     # Position is equal if the diagnostic is not located or if referring to the same offset
     def same_position?(o)
       source_pos.nil? && o.source_pos.nil? || source_pos.offset == o.source_pos.offset
     end
     private :same_position?
-
-    def hash
-      @hash ||= [file, source_pos.offset, issue.issue_code, severity].hash
-    end
   end
 
   # Formats a diagnostic for output.
@@ -370,7 +370,7 @@ module Validation
     #
     # TODO add semantic_label_provider
     #
-    def initialize()
+    def initialize
       @diagnostics = []
       @error_count = 0
       @warning_count = 0
@@ -393,29 +393,29 @@ module Validation
 
     # Returns the diagnosed errors in the order they were reported.
     def errors
-      @diagnostics.select {|d| d.severity == :error }
+      @diagnostics.select { |d| d.severity == :error }
     end
 
     # Returns the diagnosed warnings in the order they were reported.
     # (This includes :warning and :deprecation severity)
     def warnings
-      @diagnostics.select {|d| d.severity == :warning || d.severity == :deprecation }
+      @diagnostics.select { |d| d.severity == :warning || d.severity == :deprecation }
     end
 
     def errors_and_warnings
-      @diagnostics.select {|d| d.severity != :ignore }
+      @diagnostics.select { |d| d.severity != :ignore }
     end
 
     # Returns the ignored diagnostics in the order they were reported (if reported at all)
     def ignored
-      @diagnostics.select {|d| d.severity == :ignore }
+      @diagnostics.select { |d| d.severity == :ignore }
     end
 
     # Add a diagnostic, or all diagnostics from another acceptor to the set of diagnostics
     # @param diagnostic [Diagnostic, Acceptor] diagnostic(s) that should be accepted
     def accept(diagnostic)
       if diagnostic.is_a?(Acceptor)
-        diagnostic.diagnostics.each {|d| _accept(d)}
+        diagnostic.diagnostics.each { |d| _accept(d) }
       else
         _accept(diagnostic)
       end

data/lib/puppet/pops/visitor.rb

@@ -15,7 +15,7 @@ module Puppet::Pops
 class Visitor
   attr_reader :receiver, :message, :min_args, :max_args, :cache
 
-  def initialize(receiver, message, min_args=0, max_args=nil)
+  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
 

data/lib/puppet/property/ensure.rb

@@ -107,4 +107,3 @@ class Puppet::Property::Ensure < Puppet::Property
     end
   end
 end
-

data/lib/puppet/property/keyvalue.rb

@@ -51,15 +51,14 @@ module Puppet
         # passed in a hash for our property's should value, the should_value
         # parameter will be a single element array so we just extract our value
         # directly.
-        if ! @should.empty? && @should.first.is_a?(Hash)
+        if !@should.empty? && @should.first.is_a?(Hash)
           return @should.first
         end
 
         # Here, should is an array of key/value pairs.
-        @should.inject({}) do |hash, key_value|
+        @should.each_with_object({}) do |key_value, hash|
           tmp = key_value.split(separator)
           hash[tmp[0].strip.intern] = tmp[1]
-          hash
         end
       end
 
@@ -88,7 +87,7 @@ module Puppet
         # changed_or_new_keys once (since this property will only be synced once).
         #
         @changed_or_new_keys ||= should_value.keys.select do |key|
-          ! current.key?(key) || current[key] != should_value[key]
+          !current.key?(key) || current[key] != should_value[key]
         end
 
         should_value
@@ -137,7 +136,7 @@ module Puppet
         next if value.is_a?(Hash)
 
         unless value.include?("#{separator}")
-          raise ArgumentError, _("Key/value pairs must be separated by '%{separator}'") % {separator: separator}
+          raise ArgumentError, _("Key/value pairs must be separated by '%{separator}'") % { separator: separator }
         end
       end
 
@@ -153,7 +152,7 @@ module Puppet
           [hash_key.to_s.strip.to_sym, hash_value.to_s]
         end
 
-        Hash[munged_value]
+        munged_value.to_h
       end
     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) if !inclusive?
 
         dearrayify(members)
       end

data/lib/puppet/property.rb

@@ -257,8 +257,8 @@ class Puppet::Property < Puppet::Parameter
   def event(options = {})
     attrs = { :name => event_name, :desired_value => should, :property => self, :source_description => path }.merge(options)
     value = self.class.value_collection.match?(should) if should
-    
-    attrs[:invalidate_refreshes] = true if value && value.invalidate_refreshes 
+
+    attrs[:invalidate_refreshes] = true if value && value.invalidate_refreshes
     attrs[:redacted] = @sensitive
     resource.event attrs
   end
@@ -340,7 +340,7 @@ class Puppet::Property < Puppet::Parameter
       #
       # return is.zip(@should).all? {|a, b| property_matches?(a, b) }
     else
-      return @should.any? {|want| property_matches?(is, want) }
+      return @should.any? { |want| property_matches?(is, want) }
     end
   end
 
@@ -371,7 +371,7 @@ class Puppet::Property < Puppet::Parameter
       # avoid it
       # TRANSLATORS 'insync_values?' should not be translated
       msg = _("Unknown failure using insync_values? on type: %{type} / property: %{name} to compare values %{should} and %{is}") %
-          { type: self.resource.ref, name: self.name, should: should, is: is }
+            { type: self.resource.ref, name: self.name, should: should, is: is }
       Puppet.info(msg)
 
       # Return nil, ie. unknown
@@ -452,12 +452,10 @@ class Puppet::Property < Puppet::Parameter
     # This is only here to make testing easier.
     if @resource.respond_to?(:noop?)
       @resource.noop?
+    elsif defined?(@noop)
+      @noop
     else
-      if defined?(@noop)
-        @noop
-      else
-        Puppet[:noop]
-      end
+      Puppet[:noop]
     end
   end
 
@@ -597,7 +595,7 @@ class Puppet::Property < Puppet::Parameter
       unless provider.satisfies?(features)
         # TRANSLATORS 'Provider' refers to a Puppet provider class
         raise ArgumentError, _("Provider %{provider} must have features '%{needed_features}' to set '%{property}' to '%{value}'") %
-            { provider: provider.class.name, needed_features: needed_features, property: self.class.name, value: value }
+                             { provider: provider.class.name, needed_features: needed_features, property: self.class.name, value: value }
       end
     end
   end

data/lib/puppet/provider/aix_object.rb

@@ -95,7 +95,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     # NOTE: 'Impure' lambdas are useful in case we need to generate more specific error
     # messages or pass-in instance-specific command-line arguments.
     def mapping(info = {})
-      identity_fn = lambda { |x| x }
+      identity_fn = ->(x) { x }
       info[:aix_attribute] ||= info[:puppet_property]
       info[:property_to_attribute] ||= identity_fn
       info[:attribute_to_property] ||= identity_fn
@@ -171,7 +171,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
     # This helper splits a list separated by sep into its corresponding
     # items. Note that a key precondition here is that none of the items
-    # in the list contain sep. 
+    # in the list contain sep.
     #
     # Let A be the return value. Then one of our postconditions is:
     #   A.join(sep) == list
@@ -258,11 +258,11 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
         values = parse_colon_separated_list(values_line.chomp)
 
-        attributes_hash = Hash[attributes.zip(values)]
+        attributes_hash = attributes.zip(values).to_h
 
         object_name = attributes_hash.delete(:name)
 
-        Hash[[[:name, object_name.to_s], [:attributes, attributes_hash]]]
+        [[:name, object_name.to_s], [:attributes, attributes_hash]].to_h
       end
 
       objects
@@ -301,7 +301,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # that need our provider instance.
   def mappings
     return @mappings if @mappings
-    
+
     @mappings = {}
     self.class.mappings.each do |type, mapped_objects|
       @mappings[type] = {}
@@ -360,7 +360,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # Modifies the AIX object by setting its new attributes.
   def modify_object(new_attributes)
     execute(modifycmd(new_attributes))
-    object_info(true) 
+    object_info(true)
   end
 
   # Gets a Puppet property's value from object_info
@@ -402,7 +402,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     properties, attributes = conflicts.keys.map do |key|
       conflicts[key].map! { |name| "'#{name}'" }.join(', ')
     end
-      
+
     detail = _("attributes is setting the %{properties} properties via. the %{attributes} attributes, respectively! Please specify these property values in the resource declaration instead.") % { properties: properties, attributes: attributes }
 
     raise Puppet::Error, _("Could not set attributes on %{resource}[%{name}]: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }
@@ -420,7 +420,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # Collects the current property values of all mapped properties +
   # the attributes property.
   def object_info(refresh = false)
-    return @object_info if @object_info && ! refresh
+    return @object_info if @object_info && !refresh
 
     @object_info = nil
 
@@ -457,7 +457,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
   # Check that the AIX object exists
   def exists?
-    ! object_info.nil?
+    !object_info.nil?
   end
 
   # Creates a new instance of the resource

data/lib/puppet/provider/exec/posix.rb

@@ -55,7 +55,7 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
 
   def run(command, check = false)
     if resource[:umask]
-      Puppet::Util::withumask(resource[:umask]) { super(command, check) }
+      Puppet::Util.withumask(resource[:umask]) { super(command, check) }
     else
       super(command, check)
     end