puppet 8.3.1-universal-darwin → 8.5.0-universal-darwin

data/lib/puppet/pops/visitable.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Visitable is a mix-in module that makes a class visitable by a Visitor
 module Puppet::Pops::Visitable
   def accept(visitor, *arguments)

data/lib/puppet/pops/visitor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Pops
 # A Visitor performs delegation to a given receiver based on the configuration of the Visitor.
 # A new visitor is created with a given receiver, a method prefix, min, and max argument counts.
@@ -13,7 +14,8 @@ 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
 
@@ -34,6 +36,7 @@ class Visitor
   # Visit an explicit receiver
   def visit_this(receiver, thing, args)
     raise "Visitor Error: Too few arguments passed. min = #{@min_args}" unless args.length >= @min_args
+
     if @max_args
       raise "Visitor Error: Too many arguments passed. max = #{@max_args}" unless args.length <= @max_args
     end
@@ -44,18 +47,22 @@ class Visitor
       thing.class.ancestors().each do |ancestor|
         name = ancestor.name
         next if name.nil?
+
         method_name = :"#{@message}_#{name.split(DOUBLE_COLON).last}"
         next unless receiver.respond_to?(method_name, true)
+
         @cache[thing.class] = method_name
         return receiver.send(method_name, thing, *args)
       end
     end
+
     raise "Visitor Error: the configured receiver (#{receiver.class}) can't handle instance of: #{thing.class}"
   end
 
   # Visit an explicit receiver
   def visit_this_class(receiver, clazz, args)
     raise "Visitor Error: Too few arguments passed. min = #{@min_args}" unless args.length >= @min_args
+
     if @max_args
       raise "Visitor Error: Too many arguments passed. max = #{@max_args}" unless args.length <= @max_args
     end
@@ -66,12 +73,15 @@ class Visitor
       clazz.ancestors().each do |ancestor|
         name = ancestor.name
         next if name.nil?
+
         method_name = :"#{@message}_#{name.split(DOUBLE_COLON).last}"
         next unless receiver.respond_to?(method_name, true)
+
         @cache[clazz] = method_name
         return receiver.send(method_name, clazz, *args)
       end
     end
+
     raise "Visitor Error: the configured receiver (#{receiver.class}) can't handle instance of: #{clazz}"
   end
 
@@ -83,6 +93,7 @@ class Visitor
     if method_name
       return receiver.send(method_name, thing)
     end
+
     visit_this(receiver, thing, NO_ARGS)
   end
 
@@ -94,6 +105,7 @@ class Visitor
     if method_name
       return receiver.send(method_name, thing, arg)
     end
+
     visit_this(receiver, thing, [arg])
   end
 
@@ -105,6 +117,7 @@ class Visitor
     if method_name
       return receiver.send(method_name, thing, arg1, arg2)
     end
+
     visit_this(receiver, thing, [arg1, arg2])
   end
 
@@ -116,8 +129,8 @@ class Visitor
     if method_name
       return receiver.send(method_name, thing, arg1, arg2, arg3)
     end
+
     visit_this(receiver, thing, [arg1, arg2, arg3])
   end
-
 end
 end

data/lib/puppet/pops.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   # The Pops language system. This includes the parser, evaluator, AST model, and
   # Binder.
@@ -61,6 +62,7 @@ module Puppet
     module Resource
       require_relative 'pops/resource/resource_type_impl'
     end
+
     module Evaluator
       require_relative 'pops/evaluator/literal_evaluator'
       require_relative 'pops/evaluator/callable_signature'

data/lib/puppet/property/boolean.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/coercion'
 
 class Puppet::Property::Boolean < Puppet::Property

data/lib/puppet/property/ensure.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/property'
 
 # This property is automatically added to any {Puppet::Type} that responds
@@ -39,7 +40,9 @@ class Puppet::Property::Ensure < Puppet::Property
     end
 
     # This doc will probably get overridden
+    # rubocop:disable Naming/MemoizedInstanceVariableName
     @doc ||= "The basic property that the resource should be in."
+    # rubocop:enable Naming/MemoizedInstanceVariableName
   end
 
   def self.inherited(sub)
@@ -95,7 +98,7 @@ class Puppet::Property::Ensure < Puppet::Property
 
   # If they're talking about the thing at all, they generally want to
   # say it should exist.
-  #defaultto :present
+  # defaultto :present
   defaultto do
     if @resource.managed?
       :present
@@ -104,4 +107,3 @@ class Puppet::Property::Ensure < Puppet::Property
     end
   end
 end
-

data/lib/puppet/property/keyvalue.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/property'
 
 module Puppet
@@ -33,7 +34,7 @@ module Puppet
         hash_to_key_value_s(should_value)
       end
 
-      def is_to_s(current_value)
+      def is_to_s(current_value) # rubocop:disable Naming/PredicateName
         hash_to_key_value_s(current_value)
       end
 
@@ -50,22 +51,21 @@ 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
 
       def process_current_hash(current)
         return {} if current == :absent
 
-        #inclusive means we are managing everything so if it isn't in should, its gone
+        # inclusive means we are managing everything so if it isn't in should, its gone
         current.each_key { |key| current[key] = nil } if inclusive?
         current
       end
@@ -76,7 +76,7 @@ module Puppet
         members = hashify_should
         current = process_current_hash(retrieve)
 
-        #shared keys will get overwritten by members
+        # shared keys will get overwritten by members
         should_value = current.merge(members)
 
         # Figure out the keys that will actually change in our Puppet run.
@@ -87,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
@@ -107,7 +107,7 @@ module Puppet
       # @return [Hash] the hash from the provider, or `:absent`
       #
       def retrieve
-        #ok, some 'convention' if the keyvalue property is named properties, provider should implement a properties method
+        # 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
@@ -136,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
 
@@ -152,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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/property'
 
 module Puppet
@@ -7,8 +8,7 @@ module Puppet
     # For an ordered list see {Puppet::Property::OrderedList}.
     #
     class List < Property
-
-      def is_to_s(currentvalue)
+      def is_to_s(currentvalue) # rubocop:disable Naming/PredicateName
         currentvalue == :absent ? super(currentvalue) : currentvalue.join(delimiter)
       end
 
@@ -25,7 +25,7 @@ module Puppet
         @resource[membership] == :inclusive
       end
 
-      #dearrayify was motivated because to simplify the implementation of the OrderedList property
+      # dearrayify was motivated because to simplify the implementation of the OrderedList property
       def dearrayify(array)
         array.sort.join(delimiter)
       end
@@ -34,8 +34,8 @@ module Puppet
         return nil unless @should
 
         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?
+        # inclusive means we are managing everything so if it isn't in should, its gone
+        members = add_should_with_current(members, retrieve) if !inclusive?
 
         dearrayify(members)
       end
@@ -45,7 +45,7 @@ module Puppet
       end
 
       def retrieve
-        #ok, some 'convention' if the list property is named groups, provider should implement a groups method
+        # 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)

data/lib/puppet/property/ordered_list.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/property/list'
 
 module Puppet
@@ -11,12 +12,11 @@ module Puppet
     # For an unordered list see {Puppet::Property::List}.
     #
     class OrderedList < List
-
       def add_should_with_current(should, current)
         if current.is_a?(Array)
-          #tricky trick
-          #Preserve all the current items in the list
-          #but move them to the back of the line
+          # tricky trick
+          # Preserve all the current items in the list
+          # but move them to the back of the line
           should = should + (current - should)
         end
         should

data/lib/puppet/property.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The virtual base class for properties, which are the self-contained building
 # blocks for actually doing work on the system.
 
@@ -96,8 +97,9 @@ class Puppet::Property < Puppet::Parameter
     #
     def array_matching=(value)
       value = value.intern if value.is_a?(String)
-      #TRANSLATORS 'Property#array_matching', 'first', and 'all' should not be translated
+      # TRANSLATORS 'Property#array_matching', 'first', and 'all' should not be translated
       raise ArgumentError, _("Supported values for Property#array_matching are 'first' and 'all'") unless [:first, :all].include?(value)
+
       @array_matching = value
     end
 
@@ -169,6 +171,7 @@ class Puppet::Property < Puppet::Parameter
         if instance_methods(false).include?(method)
           raise ArgumentError, _("Attempt to redefine method %{method} with block") % { method: method }
         end
+
         define_method(method, &value.block)
       else
         # Let the method be an alias for calling the providers setter unless we already have this method
@@ -231,11 +234,10 @@ class Puppet::Property < Puppet::Parameter
     name == :ensure or return (name.to_s + "_changed").to_sym
 
     return (resource.type.to_s + case value
-    when :present; "_created"
-    when :absent; "_removed"
-    else
-      "_changed"
-    end).to_sym
+                                 when :present; "_created"
+                                 when :absent;  "_removed"
+                                 else           "_changed"
+                                 end).to_sym
   end
 
   # Produces an event describing a change of this property.
@@ -255,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
@@ -338,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
 
@@ -367,9 +369,9 @@ class Puppet::Property < Puppet::Parameter
     rescue
       # Certain operations may fail, but we don't want to fail the transaction if we can
       # avoid it
-      #TRANSLATORS 'insync_values?' should not be translated
+      # 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
@@ -403,7 +405,7 @@ class Puppet::Property < Puppet::Parameter
   # are not already in suitable form.
   # @param value [Object] the value to format as a string
   # @return [String] a pretty printing string
-  def is_to_s(value)
+  def is_to_s(value) # rubocop:disable Naming/PredicateName
     self.class.format_value_for_display(value)
   end
 
@@ -414,9 +416,9 @@ class Puppet::Property < Puppet::Parameter
   #
   def log(msg)
     Puppet::Util::Log.create(
-      :level   => resource[:loglevel],
+      :level => resource[:loglevel],
       :message => msg,
-      :source  => self
+      :source => self
     )
   end
 
@@ -450,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
 
@@ -593,9 +593,9 @@ class Puppet::Property < Puppet::Parameter
       features = Array(features)
       needed_features = features.collect { |f| f.to_s }.join(", ")
       unless provider.satisfies?(features)
-        #TRANSLATORS 'Provider' refers to a Puppet provider class
+        # 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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Common code for AIX user/group providers.
 class Puppet::Provider::AixObject < Puppet::Provider
   desc "Generic AIX resource provider"
@@ -94,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
@@ -170,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
@@ -257,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
@@ -300,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] = {}
@@ -334,6 +335,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     raise ArgumentError, _("Cannot have both 'forcelocal' and 'ia_load_module' at the same time!") if @resource[:ia_load_module] && @resource[:forcelocal]
     return ["-R", @resource[:ia_load_module].to_s] if @resource[:ia_load_module]
     return ["-R", "files"] if @resource[:forcelocal]
+
     []
   end
 
@@ -358,12 +360,13 @@ 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
   def get(property)
     return :absent unless exists?
+
     object_info[property] || :absent
   end
 
@@ -399,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 }
@@ -417,7 +420,8 @@ 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
 
     begin
@@ -453,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
@@ -464,6 +468,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     mappings[:aix_attribute].each do |property, aix_attribute|
       property_should = @resource.should(property)
       next if property_should.nil?
+
       attributes[aix_attribute.name] = aix_attribute.convert_property_value(property_should)
     end
 

data/lib/puppet/provider/command.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A command that can be executed on the system
 class Puppet::Provider::Command
   attr_reader :executable

data/lib/puppet/provider/confine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Confines have been moved out of the provider as they are also used for other things.
 # This provides backwards compatibility for people still including this old location.
 require_relative '../../puppet/provider'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
@@ -37,6 +38,7 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
       elsif !File.executable?(exe)
         raise ArgumentError, _("'%{exe}' is not executable") % { exe: exe }
       end
+
       return
     end
 
@@ -53,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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:exec).provide :shell, :parent => :posix do
   include Puppet::Util::Execution
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
-
   confine    'os.name' => :windows
   defaultfor 'os.name' => :windows
 
@@ -42,6 +42,7 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
       elsif !File.file?(exe)
         raise ArgumentError, _("'%{exe}' is a %{klass}, not a file") % { exe: exe, klass: File.ftype(exe) }
       end
+
       return
     end
 

data/lib/puppet/provider/exec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/provider'
 require_relative '../../puppet/util/execution'
 
@@ -28,7 +29,7 @@ class Puppet::Provider::Exec < Puppet::Provider
       end
 
       if value.nil? || value.empty?
-        msg = _("Empty environment setting '%{var}'") % {var: var}
+        msg = _("Empty environment setting '%{var}'") % { var: var }
         Puppet.warn_once('undefined_variables', "empty_env_var_#{var}", msg, resource.file, resource.line)
       end
 
@@ -44,14 +45,14 @@ class Puppet::Provider::Exec < Puppet::Provider
 
     checkexe(command)
 
-    debug "Executing#{check ? " check": ""} '#{sensitive ? '[redacted]' : command}'"
+    debug "Executing#{check ? " check" : ""} '#{sensitive ? '[redacted]' : command}'"
 
     # Ruby 2.1 and later interrupt execution in a way that bypasses error
     # handling by default. Passing Timeout::Error causes an exception to be
     # raised that can be rescued inside of the block by cleanup routines.
     #
     # This is backwards compatible all the way to Ruby 1.8.7.
-    Timeout::timeout(resource[:timeout], Timeout::Error) do
+    Timeout.timeout(resource[:timeout], Timeout::Error) do
       cwd = resource[:cwd]
       # It's ok if cwd is nil. In that case Puppet::Util::Execution.execute() simply will not attempt to
       # change the working directory, which is exactly the right behavior when no cwd parameter is

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Puppet::Type.type(:file).provide :posix do
   desc "Uses POSIX functionality to manage file ownership and permissions."