puppet 6.0.5-x64-mingw32 → 8.8.1-x64-mingw32

data/lib/puppet/property/keyvalue.rb

@@ -1,4 +1,6 @@
-require 'puppet/property'
+# frozen_string_literal: true
+
+require_relative '../../puppet/property'
 
 module Puppet
   class Property
@@ -32,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
 
@@ -49,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
@@ -75,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.
@@ -86,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
@@ -106,11 +107,12 @@ 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
-        if key_hash = provider.send(name) and key_hash != :absent
-          return key_hash
+        # 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
+          key_hash
         else
-          return :absent
+          :absent
         end
       end
 
@@ -119,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
@@ -133,8 +135,8 @@ module Puppet
 
         next if value.is_a?(Hash)
 
-        unless value.include?("#{separator}")
-          raise ArgumentError, _("Key/value pairs must be separated by '%{separator}'") % {separator: separator}
+        unless value.include?(separator.to_s)
+          raise ArgumentError, _("Key/value pairs must be separated by '%{separator}'") % { separator: separator }
         end
       end
 
@@ -150,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,6 @@
-require 'puppet/property'
+# frozen_string_literal: true
+
+require_relative '../../puppet/property'
 
 module Puppet
   class Property
@@ -6,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
 
@@ -24,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
@@ -33,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) unless inclusive?
 
         dearrayify(members)
       end
@@ -44,11 +45,12 @@ module Puppet
       end
 
       def retrieve
-        #ok, some 'convention' if the list property is named groups, provider should implement a groups method
-        if provider and tmp = provider.send(name) and tmp != :absent
-          return tmp.split(delimiter)
+        # 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
+          tmp.instance_of?(Array) ? tmp : tmp.split(delimiter)
         else
-          return :absent
+          :absent
         end
       end
 
@@ -62,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

@@ -1,4 +1,6 @@
-require 'puppet/property/list'
+# frozen_string_literal: true
+
+require_relative '../../puppet/property/list'
 
 module Puppet
   class Property
@@ -10,13 +12,12 @@ 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
-          should = should + (current - should)
+          # tricky trick
+          # Preserve all the current items in the list
+          # but move them to the back of the line
+          should += (current - should)
         end
         should
       end

data/lib/puppet/property.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 # The virtual base class for properties, which are the self-contained building
 # blocks for actually doing work on the system.
 
-require 'puppet'
-require 'puppet/parameter'
+require_relative '../puppet'
+require_relative '../puppet/parameter'
 
 # The Property class is the implementation of a resource's attributes of _property_ kind.
 # A Property is a specialized Resource Type Parameter that has both an 'is' (current) state, and
@@ -39,7 +41,7 @@ require 'puppet/parameter'
 # @api public
 #
 class Puppet::Property < Puppet::Parameter
-  require 'puppet/property/ensure'
+  require_relative 'property/ensure'
 
   # Returns the original wanted value(s) _(should)_ unprocessed by munging/unmunging.
   # The original values are set by {#value=} or {#should=}.
@@ -95,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
 
@@ -123,9 +126,8 @@ class Puppet::Property < Puppet::Parameter
   # @api private
   #
   def self.value_name(name)
-    if value = value_collection.match?(name)
-      value.name
-    end
+    value = value_collection.match?(name)
+    value.name if value
   end
 
   # Returns the value of the given option (set when a valid value with the given "name" was defined).
@@ -137,9 +139,8 @@ class Puppet::Property < Puppet::Parameter
   # @api private
   #
   def self.value_option(name, option)
-    if value = value_collection.value(name)
-      value.send(option)
-    end
+    value = value_collection.value(name)
+    value.send(option) if value
   end
 
   # Defines a new valid value for this property.
@@ -170,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
@@ -201,21 +203,19 @@ class Puppet::Property < Puppet::Parameter
   # @raise [Puppet::DevError] if there were issues formatting the message
   #
   def change_to_s(current_value, newvalue)
-    begin
-      if current_value == :absent
-        return "defined '#{name}' as #{should_to_s(newvalue)}"
-      elsif newvalue == :absent or newvalue == [:absent]
-        return "undefined '#{name}' from #{is_to_s(current_value)}"
-      else
-        return "#{name} changed #{is_to_s(current_value)} to #{should_to_s(newvalue)}"
-      end
-    rescue Puppet::Error, Puppet::DevError
-      raise
-    rescue => detail
-      message = _("Could not convert change '%{name}' to string: %{detail}") % { name: name, detail: detail }
-      Puppet.log_exception(detail, message)
-      raise Puppet::DevError, message, detail.backtrace
+    if current_value == :absent
+      "defined '#{name}' as #{should_to_s(newvalue)}"
+    elsif newvalue == :absent or newvalue == [:absent]
+      "undefined '#{name}' from #{is_to_s(current_value)}"
+    else
+      "#{name} changed #{is_to_s(current_value)} to #{should_to_s(newvalue)}"
     end
+  rescue Puppet::Error
+    raise
+  rescue => detail
+    message = _("Could not convert change '%{name}' to string: %{detail}") % { name: name, detail: detail }
+    Puppet.log_exception(detail, message)
+    raise Puppet::DevError, message, detail.backtrace
   end
 
   # Produces the name of the event to use to describe a change of this property's value.
@@ -225,18 +225,17 @@ class Puppet::Property < Puppet::Parameter
   # @return [String] the name of the event that describes the change
   #
   def event_name
-    value = self.should
+    value = should
 
     event_name = self.class.value_option(value, :event) and return event_name
 
     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
+    (resource.type.to_s + case value
+                          when :present; "_created"
+                          when :absent;  "_removed"
+                          else "_changed"
+                          end).to_sym
   end
 
   # Produces an event describing a change of this property.
@@ -255,9 +254,9 @@ class Puppet::Property < Puppet::Parameter
   # @see Puppet::Type#event
   def event(options = {})
     attrs = { :name => event_name, :desired_value => should, :property => self, :source_description => path }.merge(options)
-    if should and value = self.class.value_collection.match?(should)
-      attrs[:invalidate_refreshes] = true if value.invalidate_refreshes
-    end
+    value = self.class.value_collection.match?(should) if should
+
+    attrs[:invalidate_refreshes] = true if value && value.invalidate_refreshes
     attrs[:redacted] = @sensitive
     resource.event attrs
   end
@@ -307,7 +306,7 @@ class Puppet::Property < Puppet::Parameter
   # @api public
   #
   def insync?(is)
-    self.devfail "#{self.class.name}'s should is not array" unless @should.is_a?(Array)
+    devfail "#{self.class.name}'s should is not array" unless @should.is_a?(Array)
 
     # an empty array is analogous to no should values
     return true if @should.empty?
@@ -332,14 +331,14 @@ class Puppet::Property < Puppet::Parameter
       #
       # This does mean that property equality is not commutative, and will not
       # work unless the `is` value is carefully arranged to match the should.
-      return (is == @should or is == @should.map(&:to_s))
+      (is == @should or is == @should.map(&:to_s))
 
       # When we stop being idiots about this, and actually have meaningful
       # semantics, this version is the thing we actually want to do.
       #
       # return is.zip(@should).all? {|a, b| property_matches?(a, b) }
     else
-      return @should.any? {|want| property_matches?(is, want) }
+      @should.any? { |want| property_matches?(is, want) }
     end
   end
 
@@ -368,9 +367,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: resource.ref, name: name, should: should, is: is }
       Puppet.info(msg)
 
       # Return nil, ie. unknown
@@ -404,7 +403,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
 
@@ -415,9 +414,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
 
@@ -451,12 +450,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
 
@@ -486,9 +483,10 @@ class Puppet::Property < Puppet::Parameter
   def set(value)
     # Set a name for looking up associated options like the event.
     name = self.class.value_name(value)
-    if method = self.class.value_option(name, :method) and self.respond_to?(method)
+    method = self.class.value_option(name, :method)
+    if method && respond_to?(method)
       begin
-        self.send(method)
+        send(method)
       rescue Puppet::Error
         raise
       rescue => detail
@@ -498,12 +496,15 @@ class Puppet::Property < Puppet::Parameter
         Puppet.log_exception(detail, error.message)
         raise error
       end
-    elsif block = self.class.value_option(name, :block)
-      # FIXME It'd be better here to define a method, so that
-      # the blocks could return values.
-      self.instance_eval(&block)
     else
-      call_provider(value)
+      block = self.class.value_option(name, :block)
+      if block
+        # FIXME It'd be better here to define a method, so that
+        # the blocks could return values.
+        instance_eval(&block)
+      else
+        call_provider(value)
+      end
     end
   end
 
@@ -523,12 +524,12 @@ class Puppet::Property < Puppet::Parameter
   def should
     return nil unless defined?(@should)
 
-    self.devfail "should for #{self.class.name} on #{resource.name} is not an array" unless @should.is_a?(Array)
+    devfail "should for #{self.class.name} on #{resource.name} is not an array" unless @should.is_a?(Array)
 
     if match_all?
-      return @should.collect { |val| self.unmunge(val) }
+      @should.collect { |val| unmunge(val) }
     else
-      return self.unmunge(@should[0])
+      unmunge(@should[0])
     end
   end
 
@@ -546,7 +547,7 @@ class Puppet::Property < Puppet::Parameter
     @shouldorig = values
 
     values.each { |val| validate(val) }
-    @should = values.collect { |val| self.munge(val) }
+    @should = values.collect { |val| munge(val) }
   end
 
   # Produces a pretty printing string for the given value.
@@ -585,20 +586,21 @@ class Puppet::Property < Puppet::Parameter
   # @api private
   #
   def validate_features_per_value(value)
-    if features = self.class.value_option(self.class.value_name(value), :required_features)
+    features = self.class.value_option(self.class.value_name(value), :required_features)
+    if features
       features = Array(features)
-      needed_features = features.collect { |f| f.to_s }.join(", ")
+      needed_features = features.collect(&: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
 
   # @return [Object, nil] Returns the wanted _(should)_ value of this property.
   def value
-    self.should
+    should
   end
 
   # (see #should=)

data/lib/puppet/provider/aix_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Common code for AIX user/group providers.
 class Puppet::Provider::AixObject < Puppet::Provider
   desc "Generic AIX resource provider"
@@ -93,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
@@ -129,7 +131,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
       # AIX will do the right validation to ensure numeric attributes
       # can't be set to non-numeric values, so no need for the extra clutter.
-      info[:attribute_to_property] = lambda do |value|
+      info[:attribute_to_property] = lambda do |value| # rubocop:disable Style/SymbolProc
         value.to_i
       end
 
@@ -169,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
@@ -256,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
@@ -279,7 +281,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
         name = object[:name]
         id = object[:attributes].delete(:id)
 
-        Hash[[[:name, name,],[:id, id]]]
+        { name: name, id: id }
       end
     end
 
@@ -299,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] = {}
@@ -330,8 +332,11 @@ class Puppet::Provider::AixObject < Puppet::Provider
   end
 
   def ia_module_args
-    return [] unless @resource[:ia_load_module]
-    ["-R", @resource[:ia_load_module].to_s]
+    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
 
   def lscmd
@@ -355,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
 
@@ -396,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 }
@@ -414,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
@@ -450,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
@@ -461,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,3 +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,6 +1,8 @@
+# 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 'puppet/provider'
-require 'puppet/confine'
+require_relative '../../puppet/provider'
+require_relative '../../puppet/confine'
 
 Puppet::Provider::Confine = Puppet::Confine

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

@@ -1,4 +1,6 @@
-require 'puppet/provider/exec'
+# frozen_string_literal: true
+
+require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
   has_feature :umask
@@ -6,10 +8,22 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
   defaultfor :feature => :posix
 
   desc <<-EOT
-    Executes external binaries directly, without passing through a shell or
-    performing any interpolation. This is a safer and more predictable way
-    to execute most commands, but prevents the use of globbing and shell
-    built-ins (including control logic like "for" and "if" statements).
+    Executes external binaries by invoking Ruby's `Kernel.exec`.
+    When the command is a string, it will be executed directly,
+    without a shell, if it follows these rules:
+     - no meta characters
+     - no shell reserved word and no special built-in
+
+    When the command is an Array of Strings, passed as `[cmdname, arg1, ...]`
+    it will be executed directly(the first element is taken as a command name
+    and the rest are passed as parameters to command with no shell expansion)
+    This is a safer and more predictable way to execute most commands,
+    but prevents the use of globbing and shell built-ins (including control
+    logic like "for" and "if" statements).
+
+    If the use of globbing and shell built-ins is desired, please check
+    the `shell` provider
+
   EOT
 
   # Verify that we have the executable
@@ -24,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
 
@@ -40,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