openvox 7.37.1 → 8.19.0

data/lib/puppet/parser/functions/type.rb

@@ -1,53 +1,55 @@
-Puppet::Parser::Functions::newfunction(
+# frozen_string_literal: true
+
+Puppet::Parser::Functions.newfunction(
   :type,
   :type => :rvalue,
   :arity => -1,
-  :doc => <<-DOC
-Returns the data type of a given value with a given degree of generality.
+  :doc => <<~DOC
+    Returns the data type of a given value with a given degree of generality.
 
-```puppet
-type InferenceFidelity = Enum[generalized, reduced, detailed]
+    ```puppet
+    type InferenceFidelity = Enum[generalized, reduced, detailed]
 
-function type(Any $value, InferenceFidelity $fidelity = 'detailed') # returns Type
-```
+    function type(Any $value, InferenceFidelity $fidelity = 'detailed') # returns Type
+    ```
 
- **Example:** Using `type`
+     **Example:** Using `type`
 
- ``` puppet
- notice type(42) =~ Type[Integer]
- ```
+     ``` puppet
+     notice type(42) =~ Type[Integer]
+     ```
 
- Would notice `true`.
+     Would notice `true`.
 
- By default, the best possible inference is made where all details are retained.
- This is good when the type is used for further type calculations but is overwhelmingly
- rich in information if it is used in a error message.
+     By default, the best possible inference is made where all details are retained.
+     This is good when the type is used for further type calculations but is overwhelmingly
+     rich in information if it is used in a error message.
 
- The optional argument `$fidelity` may be given as (from lowest to highest fidelity):
+     The optional argument `$fidelity` may be given as (from lowest to highest fidelity):
 
- * `generalized` - reduces to common type and drops size constraints
- * `reduced` - reduces to common type in collections
- * `detailed` - (default) all details about inferred types is retained
+     * `generalized` - reduces to common type and drops size constraints
+     * `reduced` - reduces to common type in collections
+     * `detailed` - (default) all details about inferred types is retained
 
- **Example:** Using `type()` with different inference fidelity:
+     **Example:** Using `type()` with different inference fidelity:
 
- ``` puppet
- notice type([3.14, 42], 'generalized')
- notice type([3.14, 42], 'reduced'')
- notice type([3.14, 42], 'detailed')
- notice type([3.14, 42])
- ```
+     ``` puppet
+     notice type([3.14, 42], 'generalized')
+     notice type([3.14, 42], 'reduced'')
+     notice type([3.14, 42], 'detailed')
+     notice type([3.14, 42])
+     ```
 
- Would notice the four values:
+     Would notice the four values:
 
- 1. 'Array[Numeric]'
- 2. 'Array[Numeric, 2, 2]'
- 3. 'Tuple[Float[3.14], Integer[42,42]]]'
- 4. 'Tuple[Float[3.14], Integer[42,42]]]'
+     1. 'Array[Numeric]'
+     2. 'Array[Numeric, 2, 2]'
+     3. 'Tuple[Float[3.14], Integer[42,42]]]'
+     4. 'Tuple[Float[3.14], Integer[42,42]]]'
 
- * Since 4.4.0
+     * Since 4.4.0
 
-DOC
-) do |args|
+  DOC
+) do |_args|
   Puppet::Parser::Functions::Error.is4x('type')
 end

data/lib/puppet/parser/functions/versioncmp.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/package'
 
-Puppet::Parser::Functions::newfunction( :versioncmp, :type => :rvalue, :arity => 2, :doc =>
+Puppet::Parser::Functions.newfunction(:versioncmp, :type => :rvalue, :arity => 2, :doc =>
 "Compares two version numbers.
 
 Prototype:
@@ -25,6 +27,5 @@ This function uses the same version comparison algorithm used by Puppet's
 `package` type.
 
 ") do |args|
-
   return Puppet::Util::Package.versioncmp(args[0], args[1])
 end

data/lib/puppet/parser/functions/with.rb

@@ -1,28 +1,30 @@
-Puppet::Parser::Functions::newfunction(
+# frozen_string_literal: true
+
+Puppet::Parser::Functions.newfunction(
   :with,
   :type => :rvalue,
   :arity => -1,
-  :doc => <<-DOC
-Call a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
-with the given arguments and return the result. Since a lambda's scope is
-local to the lambda, you can use the `with` function to create private blocks
-of code within a class using variables whose values cannot be accessed outside
-of the lambda.
+  :doc => <<~DOC
+    Call a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
+    with the given arguments and return the result. Since a lambda's scope is
+    local to the lambda, you can use the `with` function to create private blocks
+    of code within a class using variables whose values cannot be accessed outside
+    of the lambda.
 
-**Example**: Using `with`
+    **Example**: Using `with`
 
-~~~ puppet
-# Concatenate three strings into a single string formatted as a list.
-$fruit = with("apples", "oranges", "bananas") |$x, $y, $z| {
-  "${x}, ${y}, and ${z}"
-}
-$check_var = $x
-# $fruit contains "apples, oranges, and bananas"
-# $check_var is undefined, as the value of $x is local to the lambda.
-~~~
+    ~~~ puppet
+    # Concatenate three strings into a single string formatted as a list.
+    $fruit = with("apples", "oranges", "bananas") |$x, $y, $z| {
+      "${x}, ${y}, and ${z}"
+    }
+    $check_var = $x
+    # $fruit contains "apples, oranges, and bananas"
+    # $check_var is undefined, as the value of $x is local to the lambda.
+    ~~~
 
-- Since 4.0.0
-DOC
-) do |args|
+    - Since 4.0.0
+  DOC
+) do |_args|
   Puppet::Parser::Functions::Error.is4x('with')
 end

data/lib/puppet/parser/functions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/autoload'
 require_relative '../../puppet/parser/scope'
 require_relative '../../puppet/pops/adaptable'
@@ -48,7 +50,7 @@ module Puppet::Parser::Functions
 
     def load(name, env = Puppet.lookup(:current_environment))
       if Puppet[:strict] != :off
-        Puppet.warn_once('deprecations', "Puppet::Parser::Functions#load('#{name}')", _("The method 'Puppet::Parser::Functions.autoloader#load(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'.") % {name: name})
+        Puppet.warn_once('deprecations', "Puppet::Parser::Functions#load('#{name}')", _("The method 'Puppet::Parser::Functions.autoloader#load(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'.") % { name: name })
       end
 
       @delegatee.load(name, env)
@@ -56,7 +58,7 @@ module Puppet::Parser::Functions
 
     def loaded?(name)
       if Puppet[:strict] != :off
-        Puppet.warn_once('deprecations', "Puppet::Parser::Functions.loaded?('#{name}')", _("The method 'Puppet::Parser::Functions.autoloader#loaded?(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'.") % {name: name})
+        Puppet.warn_once('deprecations', "Puppet::Parser::Functions.loaded?('#{name}')", _("The method 'Puppet::Parser::Functions.autoloader#loaded?(\"%{name}\")' is deprecated in favor of using 'Scope#call_function'.") % { name: name })
       end
 
       @delegatee.loaded?(name)
@@ -209,10 +211,11 @@ module Puppet::Parser::Functions
         if args[0].is_a? Array
           if arity >= 0 and args[0].size != arity
             raise ArgumentError, _("%{name}(): Wrong number of arguments given (%{arg_count} for %{arity})") % { name: name, arg_count: args[0].size, arity: arity }
-          elsif arity < 0 and args[0].size < (arity+1).abs
-            raise ArgumentError, _("%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})") % { name: name, arg_count: args[0].size, min_arg_count: (arity+1).abs }
+          elsif arity < 0 and args[0].size < (arity + 1).abs
+            raise ArgumentError, _("%{name}(): Wrong number of arguments given (%{arg_count} for minimum %{min_arg_count})") % { name: name, arg_count: args[0].size, min_arg_count: (arity + 1).abs }
           end
-          r = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.convert_return(self.send(real_fname, args[0]))
+
+          r = Puppet::Pops::Evaluator::Runtime3FunctionArgumentConverter.convert_return(send(real_fname, args[0]))
           # avoid leaking aribtrary value if not being an rvalue function
           options[:type] == :rvalue ? r : nil
         else
@@ -221,7 +224,7 @@ module Puppet::Parser::Functions
       end
     end
 
-    func = {:arity => arity, :type => ftype, :name => fname}
+    func = { :arity => arity, :type => ftype, :name => fname }
     func[:doc] = options[:doc] if options[:doc]
 
     env_module.add_function_info(name, func)
@@ -257,10 +260,10 @@ module Puppet::Parser::Functions
   def self.functiondocs(environment = Puppet.lookup(:current_environment))
     autoloader.delegatee.loadall(environment)
 
-    ret = ""
+    ret = ''.dup
 
-    merged_functions(environment).sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, hash|
-      ret << "#{name}\n#{"-" * name.to_s.length}\n"
+    merged_functions(environment).sort { |a, b| a[0].to_s <=> b[0].to_s }.each do |name, hash|
+      ret << "#{name}\n#{'-' * name.to_s.length}\n"
       if hash[:doc]
         ret << Puppet::Util::Docs.scrub(hash[:doc])
       else

data/lib/puppet/parser/parser_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet; end
 
 module Puppet::Parser

data/lib/puppet/parser/relationship.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Puppet::Parser::Relationship
   attr_accessor :source, :target, :type
 
-  PARAM_MAP = {:relationship => :before, :subscription => :notify}
+  PARAM_MAP = { :relationship => :before, :subscription => :notify }
 
   def arrayify(resources, left)
     case resources
@@ -24,7 +26,9 @@ class Puppet::Parser::Relationship
   end
 
   def initialize(source, target, type)
-    @source, @target, @type = source, target, type
+    @source = source
+    @target = target
+    @type = type
   end
 
   def param_name
@@ -43,7 +47,8 @@ class Puppet::Parser::Relationship
     unless catalog.resource(*target_ref)
       raise ArgumentError, _("Could not find resource '%{target}' for relationship from '%{source}'") % { target: target.to_s, source: source.to_s }
     end
-    Puppet.debug {"Adding relationship from #{source} to #{target} with '#{param_name}'"}
+
+    Puppet.debug { "Adding relationship from #{source} to #{target} with '#{param_name}'" }
     if source_resource[rel_param].class != Array
       source_resource[rel_param] = [source_resource[rel_param]].compact
     end
@@ -59,6 +64,7 @@ class Puppet::Parser::Relationship
     if x.is_a?(Puppet::Pops::Evaluator::Collectors::AbstractCollector)
       collected = x.collected
       return collected.values unless collected.empty?
+
       adapter = Puppet::Pops::Adapters::EmptyAlternativeAdapter.get(x)
       adapter.nil? ? [] : leftmost_alternative(adapter.empty_alternative)
     elsif x.is_a?(Array) && x.size == 1 && x[0].is_a?(Puppet::Pops::Evaluator::Collectors::AbstractCollector)

data/lib/puppet/parser/resource/param.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The parameters we stick in Resources.
 class Puppet::Parser::Resource::Param
   include Puppet::Util
@@ -24,12 +26,12 @@ class Puppet::Parser::Resource::Param
   end
 
   def to_s
-    "#{self.name} => #{self.value}"
+    "#{name} => #{value}"
   end
 
   def self.from_param(param, value)
     new_param = param.dup
     new_param.value = value
-    return new_param
+    new_param
   end
 end

data/lib/puppet/parser/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/resource'
 
 # The primary difference between this class and its
@@ -19,7 +21,7 @@ class Puppet::Parser::Resource < Puppet::Resource
 
   # Determine whether the provided parameter name is a relationship parameter.
   def self.relationship_parameter?(name)
-    @relationship_names ||= Puppet::Type.relationship_params.collect { |p| p.name }
+    @relationship_names ||= Puppet::Type.relationship_params.collect(&:name)
     @relationship_names.include?(name)
   end
 
@@ -31,8 +33,9 @@ class Puppet::Parser::Resource < Puppet::Resource
   def [](param)
     param = param.intern
     if param == :title
-      return self.title
+      return title
     end
+
     if @parameters.has_key?(param)
       @parameters[param].value
     else
@@ -41,7 +44,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   end
 
   def eachparam
-    @parameters.each do |name, param|
+    @parameters.each do |_name, param|
       yield param
     end
   end
@@ -54,7 +57,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   # is drawn from  the class to the stage.   The stage for containment
   # defaults to main, if none is specified.
   def add_edge_to_stage
-    return unless self.class?
+    return unless class?
 
     stage = catalog.resource(:stage, self[:stage] || (scope && scope.resource && scope.resource[:stage]) || :main)
     unless stage
@@ -68,6 +71,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   # Retrieve the associated definition and evaluate it.
   def evaluate
     return if evaluated?
+
     Puppet::Util::Profiler.profile(_("Evaluated resource %{res}") % { res: self }, [:compiler, :evaluate_resource, self]) do
       @evaluated = true
       if builtin_type?
@@ -86,10 +90,9 @@ class Puppet::Parser::Resource < Puppet::Resource
   def exported=(value)
     if value
       @virtual = true
-      @exported = value
     else
-      @exported = value
     end
+    @exported = value
   end
 
   # Finish the evaluation by assigning defaults and scope tags
@@ -97,6 +100,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   #
   def finish_evaluation
     return if @evaluation_finished
+
     add_scope_tags
     @evaluation_finished = true
   end
@@ -110,6 +114,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   # @api private
   def finish(do_validate = true)
     return if finished?
+
     @finished = true
     finish_evaluation
     replace_sensitive_data
@@ -124,19 +129,20 @@ class Puppet::Parser::Resource < Puppet::Resource
   def initialize(type, title, attributes, with_defaults = true)
     raise ArgumentError, _('Resources require a hash as last argument') unless attributes.is_a? Hash
     raise ArgumentError, _('Resources require a scope') unless attributes[:scope]
+
     super(type, title, attributes)
 
     @source ||= scope.source
 
     if with_defaults
       scope.lookupdefaults(self.type).each_pair do |name, param|
-        unless @parameters.include?(name)
-          self.debug "Adding default for #{name}"
+        next if @parameters.include?(name)
 
-          param = param.dup
-          @parameters[name] = param
-          tag(*param.value) if param.name == :tag
-        end
+        debug "Adding default for #{name}"
+
+        param = param.dup
+        @parameters[name] = param
+        tag(*param.value) if param.name == :tag
       end
     end
   end
@@ -144,9 +150,9 @@ class Puppet::Parser::Resource < Puppet::Resource
   # Is this resource modeling an isomorphic resource type?
   def isomorphic?
     if builtin_type?
-      return resource_type.isomorphic?
+      resource_type.isomorphic?
     else
-      return true
+      true
     end
   end
 
@@ -155,7 +161,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   def merge(resource)
     # Test the resource scope, to make sure the resource is even allowed
     # to override.
-    unless self.source.object_id == resource.source.object_id || resource.source.child_of?(self.source)
+    unless source.equal?(resource.source) || resource.source.child_of?(source)
       raise Puppet::ParseError.new(_("Only subclasses can override parameters"), resource.file, resource.line)
     end
 
@@ -178,13 +184,13 @@ class Puppet::Parser::Resource < Puppet::Resource
     end
 
     # Some of these might fail, but they'll fail in the way we want.
-    resource.parameters.each do |name, param|
+    resource.parameters.each do |_name, param|
       override_parameter(param)
     end
   end
 
   def name
-    self[:name] || self.title
+    self[:name] || title
   end
 
   # A temporary occasion, until I get paths in the scopes figured out.
@@ -194,10 +200,10 @@ class Puppet::Parser::Resource < Puppet::Resource
   # if we ever receive a parameter named 'tag', set
   # the resource tags with its value.
   def set_parameter(param, value = nil)
-    if ! param.is_a?(Puppet::Parser::Resource::Param)
+    unless param.is_a?(Puppet::Parser::Resource::Param)
       param = param.name if param.is_a?(Puppet::Pops::Resource::Param)
       param = Puppet::Parser::Resource::Param.new(
-        :name => param, :value => value, :source => self.source
+        :name => param, :value => value, :source => source
       )
     end
 
@@ -209,22 +215,20 @@ class Puppet::Parser::Resource < Puppet::Resource
   alias []= set_parameter
 
   def to_hash
-    parse_title.merge(@parameters.reduce({}) do |result, (_, param)|
+    parse_title.merge(@parameters.each_with_object({}) do |(_, param), result|
       value = param.value
       value = (:undef == value) ? nil : value
 
-      unless value.nil?
-        case param.name
-        when :before, :subscribe, :notify, :require
-          if value.is_a?(Array)
-            value = value.flatten.reject {|v| v.nil? || :undef == v }
-          end
-          result[param.name] = value
-        else
-          result[param.name] = value
+      next if value.nil?
+
+      case param.name
+      when :before, :subscribe, :notify, :require
+        if value.is_a?(Array)
+          value = value.flatten.reject { |v| v.nil? || :undef == v }
         end
+      else
       end
-      result
+      result[param.name] = value
     end)
   end
 
@@ -294,19 +298,17 @@ class Puppet::Parser::Resource < Puppet::Resource
       msg = if current.source.to_s == ''
               if error_location_str.empty?
                 _("Parameter '%{name}' is already set on %{resource}; cannot redefine") %
-                    { name: param.name, resource: ref }
+                  { name: param.name, resource: ref }
               else
                 _("Parameter '%{name}' is already set on %{resource} at %{error_location}; cannot redefine") %
-                    { name: param.name, resource: ref, error_location: error_location_str }
+                  { name: param.name, resource: ref, error_location: error_location_str }
               end
+            elsif error_location_str.empty?
+              _("Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine") %
+                { name: param.name, resource: ref, source: current.source.to_s }
             else
-              if error_location_str.empty?
-                _("Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine") %
-                    { name: param.name, resource: ref, source: current.source.to_s }
-              else
-                _("Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine") %
-                    { name: param.name, resource: ref, source: current.source.to_s, error_location: error_location_str }
-              end
+              _("Parameter '%{name}' is already set on %{resource} by %{source} at %{error_location}; cannot redefine") %
+                { name: param.name, resource: ref, source: current.source.to_s, error_location: error_location_str }
             end
       raise Puppet::ParseError.new(msg, param.file, param.line)
     end
@@ -331,7 +333,7 @@ class Puppet::Parser::Resource < Puppet::Resource
   def validate
     if builtin_type?
       begin
-        @parameters.each { |name, value| validate_parameter(name) }
+        @parameters.each { |name, _value| validate_parameter(name) }
       rescue => detail
         self.fail Puppet::ParseError, detail.to_s + " on #{self}", detail
       end