puppet 8.2.0-universal-darwin → 8.4.0-universal-darwin

data/lib/puppet/functions/match.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Matches a regular expression against a string and returns an array containing the match
 # and any matched capturing groups.
 #
@@ -54,7 +55,7 @@ Puppet::Functions.create_function(:match) do
     # a puppet runtime (where this function is) without a reboot. If you model a function in a module after
     # this class, use a regular instance variable instead to enable reloading of the module without reboot
     #
-    @@match_visitor   ||= Puppet::Pops::Visitor.new(self, "match", 1, 1)
+    @@match_visitor ||= Puppet::Pops::Visitor.new(self, "match", 1, 1)
   end
 
   # Matches given string against given pattern and returns an Array with matches.
@@ -104,6 +105,7 @@ Puppet::Functions.create_function(:match) do
 
   def match_PRegexpType(regexp_t, s)
     raise ArgumentError, _("Given Regexp Type has no regular expression") unless regexp_t.pattern
+
     do_match(s, regexp_t.regexp)
   end
 

data/lib/puppet/functions/max.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Returns the highest value among a variable number of arguments.
 # Takes at least one argument.
 #
@@ -134,7 +135,6 @@ Puppet::Functions.create_function(:max) do
     repeated_param 'Any', :values
   end
 
-
   # All are Numeric - ok now, will be ok later
   def on_numeric(*args)
     assert_arg_count(args)
@@ -148,7 +148,7 @@ Puppet::Functions.create_function(:max) do
     args.max do|a,b|
       if a.to_s =~ %r{\A^-?\d+([._eE]\d+)?\z} && b.to_s =~ %r{\A-?\d+([._eE]\d+)?\z}
         Puppet.warn_once('deprecations', 'max_function_numeric_coerce_string',
-          _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
+                         _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f
       else
         # case sensitive as in the stdlib function
@@ -234,11 +234,11 @@ Puppet::Functions.create_function(:max) do
       bs = b.to_s
       if as =~ %r{\A^-?\d+([._eE]\d+)?\z} && bs =~ %r{\A-?\d+([._eE]\d+)?\z}
         Puppet.warn_once('deprecations', 'max_function_numeric_coerce_string',
-          _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
+                         _("The max() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f
       else
         Puppet.warn_once('deprecations', 'max_function_string_coerce_any',
-          _("The max() function's auto conversion of Any to String is deprecated - change to convert input before calling, or use lambda"))
+                         _("The max() function's auto conversion of Any to String is deprecated - change to convert input before calling, or use lambda"))
         as <=> bs
       end
     end

data/lib/puppet/functions/min.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Returns the lowest value among a variable number of arguments.
 # Takes at least one argument.
 #
@@ -133,7 +134,6 @@ Puppet::Functions.create_function(:min) do
     repeated_param 'Any', :values
   end
 
-
   # All are Numeric - ok now, will be ok later
   def on_numeric(*args)
     assert_arg_count(args)
@@ -147,7 +147,7 @@ Puppet::Functions.create_function(:min) do
     args.min do|a,b|
       if a.to_s =~ %r{\A^-?\d+([._eE]\d+)?\z} && b.to_s =~ %r{\A-?\d+([._eE]\d+)?\z}
         Puppet.warn_once('deprecations', 'min_function_numeric_coerce_string',
-          _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
+                         _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f
       else
         # case sensitive as in the stdlib function
@@ -233,11 +233,11 @@ Puppet::Functions.create_function(:min) do
       bs = b.to_s
       if as =~ %r{\A^-?\d+([._eE]\d+)?\z} && bs =~ %r{\A-?\d+([._eE]\d+)?\z}
         Puppet.warn_once('deprecations', 'min_function_numeric_coerce_string',
-          _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
+                         _("The min() function's auto conversion of String to Numeric is deprecated - change to convert input before calling, or use lambda"))
         a.to_f <=> b.to_f
       else
         Puppet.warn_once('deprecations', 'min_function_string_coerce_any',
-          _("The min() function's auto conversion of Any to String is deprecated - change to convert input before calling, or use lambda"))
+                         _("The min() function's auto conversion of Any to String is deprecated - change to convert input before calling, or use lambda"))
         as <=> bs
       end
     end

data/lib/puppet/functions/module_directory.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Finds an existing module and returns the path to its root directory.
 #
 # The argument to this function should be a module name String

data/lib/puppet/functions/new.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Creates a new instance/object of a given data type.
 #
 # This function makes it possible to create new instances of
@@ -982,7 +983,6 @@
 # @since 4.5.0
 #
 Puppet::Functions.create_function(:new, Puppet::Functions::InternalFunction) do
-
   dispatch :new_instance do
     scope_param
     param          'Type', :type
@@ -992,6 +992,7 @@ Puppet::Functions.create_function(:new, Puppet::Functions::InternalFunction) do
 
   def new_instance(scope, t, *args)
     return args[0] if args.size == 1 && !t.is_a?(Puppet::Pops::Types::PInitType) && t.instance?(args[0])
+
     result = assert_type(t, new_function_for_type(t).call(scope, *args))
     return block_given? ? yield(result) : result
   end

data/lib/puppet/functions/next.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Makes iteration continue with the next value, optionally with a given value for this iteration.
 # If a value is not given it defaults to `undef`
 # 

data/lib/puppet/functions/notice.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Logs a message on the server at level `notice`.
 Puppet::Functions.create_function(:notice, Puppet::Functions::InternalFunction) do
   # @param values The values to log.

data/lib/puppet/functions/reduce.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Applies a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 # to every value in a data structure from the first argument, carrying over the returned
 # value of each iteration, and returns the result of the lambda's final iteration. This
@@ -127,7 +128,6 @@
 # @since 4.0.0
 #
 Puppet::Functions.create_function(:reduce) do
-
   dispatch :reduce_without_memo do
     param 'Iterable', :enumerable
     block_param 'Callable[2,2]', :block

data/lib/puppet/functions/regsubst.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Performs regexp replacement on a string or array of strings.
 Puppet::Functions.create_function(:regsubst) do
   # @param target [String]

data/lib/puppet/functions/require.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Requires the specified classes.
 # Evaluate one or more classes, adding the required class as a dependency.
 #
@@ -69,6 +70,7 @@ Puppet::Functions.create_function(:require, Puppet::Functions::InternalFunction)
       # lookup the class in the scopes
       klass = (classobj = krt.find_hostclass(klass)) ? classobj.name : nil
       raise Puppet::ParseError.new(_("Could not find class %{klass}") % { klass: klass }) unless klass
+
       ref = Puppet::Resource.new(:class, klass)
       resource = scope.resource
       resource.set_parameter(:require, [resource[:require]].flatten.compact << ref)

data/lib/puppet/functions/return.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Makes iteration continue with the next value, optionally with a given value for this iteration.
 # If a value is not given it defaults to `undef`
 #

data/lib/puppet/functions/reverse_each.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Reverses the order of the elements of something that is iterable and optionally runs a
 # [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) for each
 # element.

data/lib/puppet/functions/round.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Returns an `Integer` value rounded to the nearest value.
 # Takes a single `Numeric` value as an argument.
 #

data/lib/puppet/functions/rstrip.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Strips trailing spaces from a String
 #
 # This function is compatible with the stdlib function with the same name.
@@ -26,7 +27,6 @@
 # Would both result in `['hello', 'hi']`
 #
 Puppet::Functions.create_function(:rstrip) do
-
   dispatch :on_numeric do
     param 'Numeric', :arg
   end

data/lib/puppet/functions/scanf.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Scans a string and returns an array of one or more converted values based on the given format string.
 # See the documentation of Ruby's String#scanf method for details about the supported formats (which
 # are similar but not identical to the formats used in Puppet's `sprintf` function.)

data/lib/puppet/functions/size.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The same as length() - returns the size of an Array, Hash, String, or Binary value.
 #
 # @since 6.0.0 - also supporting Binary
@@ -8,9 +9,7 @@ Puppet::Functions.create_function(:size) do
     param 'Variant[Collection, String, Binary]', :arg
   end
 
-
   def generic_size(arg)
     call_function('length', arg)
   end
-
 end

data/lib/puppet/functions/slice.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Slices an array or hash into pieces of a given size.
 #
 # This function takes two mandatory arguments: the first should be an array or hash, and the second specifies
@@ -116,6 +117,7 @@ Puppet::Functions.create_function(:slice) do
     if serving_size == 0
       raise ArgumentError, _("slice(): block must define at least one parameter. Block has 0.")
     end
+
     unless serving_size == 1 || serving_size == slice_size
       raise ArgumentError, _("slice(): block must define one parameter, or the same number of parameters as the given size of the slice (%{slice_size}). Block has %{serving_size}; %{parameter_names}") %
           { slice_size: slice_size, serving_size: serving_size, parameter_names: pblock.parameter_names.join(', ') }

data/lib/puppet/functions/sort.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Sorts an Array numerically or lexicographically or the characters of a String lexicographically.
 # Please note: This function is based on Ruby String comparison and as such may not be entirely UTF8 compatible.
 # To ensure compatibility please use this function with Ruby 2.4.0 or greater - https://bugs.ruby-lang.org/issues/10085.

data/lib/puppet/functions/split.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Splits a string into an array using a given pattern.
 # The pattern can be a string, regexp or regexp type.
 #
@@ -36,6 +37,21 @@ Puppet::Functions.create_function(:split) do
     param 'Type[Regexp]', :pattern
   end
 
+  dispatch :split_String_sensitive do
+    param 'Sensitive[String]', :sensitive
+    param 'String', :pattern
+  end
+
+  dispatch :split_Regexp_sensitive do
+    param 'Sensitive[String]', :sensitive
+    param 'Regexp', :pattern
+  end
+
+  dispatch :split_RegexpType_sensitive do
+    param 'Sensitive[String]', :sensitive
+    param 'Type[Regexp]', :pattern
+  end
+
   def split_String(str, pattern)
     str.split(Regexp.compile(pattern))
   end
@@ -47,4 +63,16 @@ Puppet::Functions.create_function(:split) do
   def split_RegexpType(str, pattern)
     str.split(pattern.regexp)
   end
-end
+
+  def split_String_sensitive(sensitive, pattern)
+    Puppet::Pops::Types::PSensitiveType::Sensitive.new(split_String(sensitive.unwrap, pattern))
+  end
+
+  def split_Regexp_sensitive(sensitive, pattern)
+    Puppet::Pops::Types::PSensitiveType::Sensitive.new(split_Regexp(sensitive.unwrap, pattern))
+  end
+
+  def split_RegexpType_sensitive(sensitive, pattern)
+    Puppet::Pops::Types::PSensitiveType::Sensitive.new(split_RegexpType(sensitive.unwrap, pattern))
+  end
+end

data/lib/puppet/functions/step.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Provides stepping with given interval over elements in an iterable and optionally runs a
 # [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html) for each
 # element.

data/lib/puppet/functions/strftime.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Formats timestamp or timespan according to the directives in the given format string. The directives begins with a percent (%) character.
 # Any text not listed as a directive will be passed through to the output string.
 #
@@ -206,8 +207,8 @@ Puppet::Functions.create_function(:strftime) do
   def legacy_strftime(format, timezone = nil)
     file, line = Puppet::Pops::PuppetStack.top_of_stack
     Puppet.warn_once('deprecations', 'legacy#strftime',
-      _('The argument signature (String format, [String timezone]) is deprecated for #strftime. See #strftime documentation and Timespan type for more info'),
-      file, line)
+                     _('The argument signature (String format, [String timezone]) is deprecated for #strftime. See #strftime documentation and Timespan type for more info'),
+                     file, line)
     Puppet::Pops::Time::Timestamp.format_time(format, Time.now.utc, timezone)
   end
 end

data/lib/puppet/functions/strip.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Strips leading and trailing spaces from a String
 #
 # This function is compatible with the stdlib function with the same name.
@@ -26,7 +27,6 @@
 # Would both result in `['hello', 'hi']`
 #
 Puppet::Functions.create_function(:strip) do
-
   dispatch :on_numeric do
     param 'Numeric', :arg
   end

data/lib/puppet/functions/then.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Calls a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 # with the given argument unless the argument is `undef`.
 # Returns `undef` if the argument is `undef`, and otherwise the result of giving the
@@ -73,6 +74,7 @@ Puppet::Functions.create_function(:then) do
 
   def then(arg)
     return nil if arg.nil?
+
     yield(arg)
   end
 end

data/lib/puppet/functions/tree_each.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Runs a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 # recursively and repeatedly using values from a data structure, then returns the unchanged data structure, or if
 # a lambda is not given, returns an `Iterator` for the tree.
@@ -141,7 +142,6 @@
 # @since 5.0.0
 #
 Puppet::Functions.create_function(:tree_each) do
-
   local_types do
     type "OptionsType  = Struct[{\
       container_type => Optional[Type],\

data/lib/puppet/functions/type.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Returns the data type of a given value with a given degree of generality.
 #
 # ```puppet

data/lib/puppet/functions/unique.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Produces a unique set of values from an `Iterable` argument.
 #
 # * If the argument is a `String`, the unique set of characters are returned as a new `String`.
@@ -119,7 +120,7 @@ Puppet::Functions.create_function(:unique) do
     end
     # reduce the set of possibly duplicated value entries
     inverted = {}
-    result.each_pair {|k,v| inverted[v[:keys]] = v[:values].uniq }
+    result.each_pair {|_k,v| inverted[v[:keys]] = v[:values].uniq }
     inverted
   end
 

data/lib/puppet/functions/unwrap.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Unwraps a Sensitive value and returns the wrapped object.
 # Returns the Value itself, if it is not Sensitive.
 #

data/lib/puppet/functions/upcase.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Converts a String, Array or Hash (recursively) into upper case.
 #
 # This function is compatible with the stdlib function with the same name.

data/lib/puppet/functions/values.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Returns the values of a hash as an Array
 #
 # @example Using `values`

data/lib/puppet/functions/versioncmp.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/package'
 
 # Compares two version numbers.
 #
 # Prototype:
 #
-#     \$result = versioncmp(a, b)
+#     $result = versioncmp(a, b)
 #
 # Where a and b are arbitrary version strings.
 #
@@ -28,7 +29,6 @@ require_relative '../../puppet/util/package'
 # `package` type.
 #
 Puppet::Functions.create_function(:versioncmp) do
-
   dispatch :versioncmp do
     param 'String', :a
     param 'String', :b

data/lib/puppet/functions/warning.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Logs a message on the server at level `warning`.
 Puppet::Functions.create_function(:warning, Puppet::Functions::InternalFunction) do
   # @param values The values to log.

data/lib/puppet/functions/with.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Calls a [lambda](https://puppet.com/docs/puppet/latest/lang_lambdas.html)
 # with the given arguments and returns the result.
 #

data/lib/puppet/functions/yaml_data.rb

@@ -29,6 +29,7 @@ Puppet::Functions.create_function(:yaml_data) do
         else
           msg = _("%{path}: file does not contain a valid yaml hash" % { path: path })
           raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
+
           Puppet.warning(msg)
           {}
         end

data/lib/puppet/functions.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Functions in the puppet language can be written in Ruby and distributed in
 # puppet modules. The function is written by creating a file in the module's
 # `lib/puppet/functions/<modulename>` directory, where `<modulename>` is
@@ -272,6 +273,7 @@ module Puppet::Functions
     unless the_class.method_defined?(func_name)
       raise ArgumentError, _("Function Creation Error, cannot create a default dispatcher for function '%{func_name}', no method with this name found") % { func_name: func_name }
     end
+
     any_signature(*min_max_param(the_class.instance_method(func_name)))
   end
 
@@ -303,7 +305,6 @@ module Puppet::Functions
   #
   # @api public
   class Function < Puppet::Pops::Functions::Function
-
     # @api private
     def self.builder
       DispatcherBuilder.new(dispatcher, Puppet::Pops::Types::PCallableType::DEFAULT, loader)
@@ -350,6 +351,7 @@ module Puppet::Functions
       if loader.nil?
         raise ArgumentError, _("No loader present. Call create_loaded_function(:myname, loader,...), instead of 'create_function' if running tests")
       end
+
       aliases = LocalTypeAliasesBuilder.new(loader, name)
       aliases.instance_eval(&block)
       # Add the loaded types to the builder
@@ -386,7 +388,6 @@ module Puppet::Functions
     end
   end
 
-
   # Public api methods of the DispatcherBuilder are available within dispatch()
   # blocks declared in a Puppet::Function.create_function() call.
   #
@@ -413,6 +414,7 @@ module Puppet::Functions
     def param(type, name)
       internal_param(type, name)
       raise ArgumentError, _('A required parameter cannot be added after an optional parameter') if @min != @max
+
       @min += 1
       @max += 1
     end
@@ -462,6 +464,7 @@ module Puppet::Functions
     def required_repeated_param(type, name)
       internal_param(type, name, true)
       raise ArgumentError, _('A required repeated parameter cannot be added after an optional parameter') if @min != @max
+
       @min += 1
       @max = :default
     end
@@ -522,6 +525,7 @@ module Puppet::Functions
       unless type.is_a?(String) || type.is_a?(Puppet::Pops::Types::PAnyType)
         raise ArgumentError, _("Argument to 'return_type' must be a String reference to a Puppet Data Type. Got %{type_class}") % { type_class: type.class }
       end
+
       @return_type = type
     end
 
@@ -591,15 +595,14 @@ module Puppet::Functions
         Puppet::Pops::Types::TypeParser.singleton.parse(type_string, loader)
       rescue StandardError => e
         raise ArgumentError, _("Parsing of type string '\"%{type_string}\"' failed with message: <%{message}>.\n") % {
-            type_string: type_string,
-            message: e.message
+          type_string: type_string,
+          message: e.message
         }
       end
     end
     private :internal_type_parse
   end
 
-
   # The LocalTypeAliasBuilder is used by the 'local_types' method to collect the individual
   # type aliases given by the function's author.
   #
@@ -637,7 +640,7 @@ module Puppet::Functions
             assignment_string: assignment_string,
             message: e.message,
             ruby_file_location: rb_location
-        }
+          }
       end
       unless result.body.kind_of?(Puppet::Pops::Model::TypeAlias)
         rb_location = rb_location.gsub(/:in.*$/, '')
@@ -681,7 +684,6 @@ module Puppet::Functions
   end
 
   class Function3x < InternalFunction
-
     # Table of optimized parameter names - 0 to 5 parameters
     PARAM_NAMES = [
       [],
@@ -739,7 +741,6 @@ module Puppet::Functions
       # When function is not an rvalue function, make sure it produces nil
       #
       the_class.class_eval do
-
         # Bypasses making the  call via the dispatcher to make sure errors
         # are reported exactly the same way as in 3x. The dispatcher is still needed as it is
         # used to support other features than calling.
@@ -801,7 +802,6 @@ module Puppet::Functions
     end
   end
 
-
   # Injection and Weaving of parameters
   # ---
   # It is possible to inject and weave a set of well known parameters into a call.

data/lib/puppet/generate/models/type/property.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   module Generate
     module Models
@@ -62,6 +63,7 @@ module Puppet
             boolean = strings.include?('\'true\'') || strings.include?('\'false\'') ? 'Boolean' : nil
             variant = [boolean, enum, pattern].reject { |t| t.nil? }
             return variant[0] if variant.size == 1
+
             "Variant[#{variant.join(', ')}]"
           end
         end

data/lib/puppet/generate/models/type/type.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../../puppet/generate/models/type/property'
 
 module Puppet
@@ -45,6 +46,7 @@ module Puppet
                 sc.convert(mapping[1].map do |names|
                   next if names.empty?
                   raise Puppet::Error, _('title patterns that use procs are not supported.') unless names.size == 1
+
                   names[0].to_s
                 end, '%p')
               ]

data/lib/puppet/generate/type.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'erb'
 require 'fileutils'
 require_relative '../../puppet/util/autoload'
@@ -39,6 +40,7 @@ module Puppet
         def format=(format)
           format = format.to_sym
           raise _("unsupported format '%{format}'.") % { format: format } unless self.class.supported_format?(format)
+
           @format = format
         end
 
@@ -126,6 +128,7 @@ module Puppet
           Puppet.debug "Searching '#{mod.name}' module for custom types."
           Dir.glob("#{directory}/*.rb") do |file|
             next unless Puppet::FileSystem.file?(file)
+
             Puppet.debug "Found custom type source file '#{file}'."
             inputs << Input.new(mod.path, file, format)
           end
@@ -138,6 +141,7 @@ module Puppet
       def self.bad_input?
         @bad_input
       end
+
       # Generates files for the given inputs.
       # If a file is up to date (newer than input) it is kept.
       # If a file is out of date it is regenerated.
@@ -166,8 +170,9 @@ module Puppet
         end
 
         templates = {}
-        templates.default_proc = lambda { |hash, key|
+        templates.default_proc = lambda { |_hash, key|
           raise _("template was not found at '%{key}'.") % { key: key } unless Puppet::FileSystem.file?(key)
+
           template = Puppet::Util.create_erb(File.read(key))
           template.filename = key
           template