bolt 0.15.0 → 0.16.0

data/vendored/puppet/lib/puppet/pops/evaluator/evaluator_impl.rb

@@ -738,7 +738,8 @@ class EvaluatorImpl
       #evaluate(o.body, scope)
     rescue Puppet::Pops::Evaluator::PuppetStopIteration => ex
       # breaking out of a file level program is not allowed
-      raise Puppet::ParseError.new("break() from context where this is illegal", ex.file, ex.line)
+      #TRANSLATOR break() is a method that should not be translated
+      raise Puppet::ParseError.new(_("break() from context where this is illegal"), ex.file, ex.line)
     end
   end
 

data/vendored/puppet/lib/puppet/pops/evaluator/external_syntax_support.rb

@@ -19,7 +19,7 @@ module Puppet::Pops::Evaluator::ExternalSyntaxSupport
     if acceptor.error_count > 0
       checker_message = "Invalid produced text having syntax: '#{syntax}'."
       Puppet::Pops::IssueReporter.assert_and_report(acceptor, :message => checker_message)
-      raise ArgumentError, "Internal Error: Configuration of runtime error handling wrong: should have raised exception"
+      raise ArgumentError, _("Internal Error: Configuration of runtime error handling wrong: should have raised exception")
     end
   end
 

data/vendored/puppet/lib/puppet/pops/evaluator/runtime3_converter.rb

@@ -143,7 +143,9 @@ class Runtime3Converter
           [type_name.nil? ? nil : type_name.sub(/^::/, '').downcase, title.nil? ? '' : title]
         end
       else
-        raise ArgumentError, "Cannot split the type #{catalog_type.class}, it represents neither a PClassType, nor a PResourceType."
+        #TRANSLATORS 'PClassType' and 'PResourceType' are Puppet types and should not be translated
+        raise ArgumentError, _("Cannot split the type %{class_name}, it represents neither a PClassType, nor a PResourceType.") %
+            { class_name: catalog_type.class }
     end
   end
 

data/vendored/puppet/lib/puppet/pops/evaluator/runtime3_resource_support.rb

@@ -28,7 +28,7 @@ module Runtime3ResourceSupport
     # from the raised exception. (It may be good enough).
     unless resolved_type
       # TODO: do this the right way
-      raise ArgumentError, "Unknown resource type: '#{type_name}'"
+      raise ArgumentError, _("Unknown resource type: '%{type}'") % { type: type_name }
     end
 
     # Build a resource for each title - use the resolved *type* as opposed to a reference

data/vendored/puppet/lib/puppet/pops/evaluator/runtime3_support.rb

@@ -20,7 +20,7 @@ module Runtime3Support
   def fail(issue, semantic, options={}, except=nil)
     optionally_fail(issue, semantic, options, except)
     # an error should have been raised since fail always fails
-    raise ArgumentError, "Internal Error: Configuration of runtime error handling wrong: should have raised exception"
+    raise ArgumentError, _("Internal Error: Configuration of runtime error handling wrong: should have raised exception")
   end
 
   # Optionally (based on severity) Fails the evaluation of _semantic_ with a given issue
@@ -150,7 +150,7 @@ module Runtime3Support
     # case - it is just wrong, the error should be reported by the caller who knows in more detail where it
     # is in the source.
     #
-    raise ArgumentError, "Internal error - attempt to create a local scope without a hash" unless hash.is_a?(Hash)
+    raise ArgumentError, _("Internal error - attempt to create a local scope without a hash") unless hash.is_a?(Hash)
     scope.ephemeral_from(hash)
   end
 
@@ -288,7 +288,7 @@ module Runtime3Support
     end
 
     # Call via 3x API if function exists there
-    raise ArgumentError, "Unknown function '#{name}'" unless Puppet::Parser::Functions.function(name)
+    raise ArgumentError, _("Unknown function '%{name}'") % { name: name } unless Puppet::Parser::Functions.function(name)
 
     # Arguments must be mapped since functions are unaware of the new and magical creatures in 4x.
     # NOTE: Passing an empty string last converts nil/:undef to empty string
@@ -330,8 +330,7 @@ module Runtime3Support
   end
 
   def convert(value, scope, undef_value)
-    converter = scope.environment.rich_data? ? Runtime3Converter.instance : Runtime3FunctionArgumentConverter.instance
-    converter.convert(value, scope, undef_value)
+    Runtime3Converter.instance.convert(value, scope, undef_value)
   end
 
   def create_resources(o, scope, virtual, exported, type_name, resource_titles, evaluated_parameters)
@@ -526,7 +525,7 @@ module Runtime3Support
         :exception_class => Puppet::PreformattedError
       })
       if errors?
-        raise ArgumentError, "Internal Error: Configuration of runtime error handling wrong: should have raised exception"
+        raise ArgumentError, _("Internal Error: Configuration of runtime error handling wrong: should have raised exception")
       end
     end
   end

data/vendored/puppet/lib/puppet/pops/functions/dispatch.rb

@@ -80,7 +80,7 @@ class Dispatch < Evaluator::CallableSignature
             when :pal_script_compiler
               Puppet.lookup(:pal_script_compiler)
             else
-              raise ArgumentError, "Unknown injection #{injection_name}"
+              raise ArgumentError, _("Unknown injection %{injection_name}") % { injection_name: injection_name }
             end
         else
           # Careful so no new nil arguments are added since they would override default

data/vendored/puppet/lib/puppet/pops/functions/function.rb

@@ -108,7 +108,10 @@ class Puppet::Pops::Functions::Function
   def internal_call_function(scope, function_name, args, &block)
 
     the_loader = loader
-    raise ArgumentError, "Function #{self.class.name}(): cannot call function '#{function_name}' - no loader specified" unless the_loader
+    unless the_loader
+      raise ArgumentError, _("Function %{class_name}(): cannot call function '%{function_name}' - no loader specified") %
+          { class_name: self.class.name, function_name: function_name }
+    end
 
     func = the_loader.load(:function, function_name)
     if func
@@ -121,7 +124,10 @@ class Puppet::Pops::Functions::Function
     # about where in a puppet manifest this error originates. (Such information is not available here).
     loader_scope = closure_scope
     func_3x = Puppet::Parser::Functions.function(function_name, loader_scope.environment) if loader_scope.is_a?(Puppet::Parser::Scope)
-    raise ArgumentError, "Function #{self.class.name}(): Unknown function: '#{function_name}'" unless func_3x
+    unless func_3x
+      raise ArgumentError, _("Function %{class_name}(): Unknown function: '%{function_name}'") %
+          { class_name: self.class.name, function_name: function_name }
+    end
 
     # Call via 3x API
     # Arguments must be mapped since functions are unaware of the new and magical creatures in 4x.

data/vendored/puppet/lib/puppet/pops/issue_reporter.rb

@@ -68,8 +68,13 @@ class IssueReporter
         emitted += 1
         break if emitted >= max_errors
       end
-      warnings_message = (emit_warnings && warnings.size > 0) ? ", and #{warnings.size} warnings" : ""
-      giving_up_message = "Language validation logged #{errors.size} errors#{warnings_message}. Giving up"
+      giving_up_message = if (emit_warnings && warnings.size > 0)
+                            _("Language validation logged %{error_count} errors, and %{warning_count} warnings. Giving up") %
+                                { error_count: errors.size, warning_count: warnings.size }
+                          else
+                            _("Language validation logged %{error_count} errors. Giving up") %
+                                { error_count: errors.size }
+                          end
       exception = emit_exception.new(giving_up_message)
       exception.file = errors[0].file
       raise exception

data/vendored/puppet/lib/puppet/pops/issues.rb

@@ -782,9 +782,12 @@ module Issues
   end
 
   HIERA_BACKEND_MULTIPLY_DEFINED = hard_issue :HIERA_BACKEND_MULTIPLY_DEFINED, :name, :first_line do
-    msg = _("Backend '%{name}' is defined more than once") % { name: name }
+    msg = _("Backend '%{name}' is defined more than once.") % { name: name }
     fl = first_line
-    fl ? _("%{msg}. First defined at line %{line}") % { msg: msg, line: fl } : msg
+    if fl
+      msg += ' ' + _("First defined at %{error_location}") % { error_location: Puppet::Util::Errors.error_location(nil, fl) }
+    end
+    msg
   end
 
   HIERA_NO_PROVIDER_FOR_BACKEND = hard_issue :HIERA_NO_PROVIDER_FOR_BACKEND, :name do
@@ -792,9 +795,12 @@ module Issues
   end
 
   HIERA_HIERARCHY_NAME_MULTIPLY_DEFINED = hard_issue :HIERA_HIERARCHY_NAME_MULTIPLY_DEFINED, :name, :first_line do
-    msg = _("Hierarchy name '%{name}' defined more than once") % { name: name }
+    msg = _("Hierarchy name '%{name}' defined more than once.") % { name: name }
     fl = first_line
-    fl ? _("%{msg}. First defined at line %{line}") % { msg: msg, line: fl } : msg
+    if fl
+      msg += ' ' + _("First defined at %{error_location}") % { error_location: Puppet::Util::Errors.error_location(nil, fl) }
+    end
+    msg
   end
 
   HIERA_V3_BACKEND_NOT_GLOBAL = hard_issue :HIERA_V3_BACKEND_NOT_GLOBAL do
@@ -884,5 +890,9 @@ module Issues
   UNKNOWN_TASK = issue :UNKNOWN_TASK, :type_name do
     _('Task not found: %{type_name}') % { type_name: type_name }
   end
+
+  LOADER_FAILURE = issue :LOADER_FAILURE, :type do
+    _('Failed to load: %{type_name}') % { type: type }
+  end
 end
 end

data/vendored/puppet/lib/puppet/pops/label_provider.rb

@@ -73,7 +73,7 @@ module Puppet::Pops::LabelProvider
     end
 
     if char == ""
-      raise Puppet::DevError, "<#{string}> does not appear to contain a word"
+      raise Puppet::DevError, _("<%{string}> does not appear to contain a word") % { string: string }
     end
 
     char

data/vendored/puppet/lib/puppet/pops/loader/base_loader.rb

@@ -20,12 +20,12 @@ class BaseLoader < Loader
     @last_result = nil      # the value of the last name (optimization)
   end
 
-  def discover(type, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
+  def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
     result = []
     @named_values.each_pair do |key, entry|
       result << key unless entry.nil? || entry.value.nil? || key.type != type || (block_given? && !yield(key))
     end
-    result.concat(parent.discover(type, name_authority, &block))
+    result.concat(parent.discover(type, error_collector, name_authority, &block))
     result.uniq!
     result
   end

data/vendored/puppet/lib/puppet/pops/loader/dependency_loader.rb

@@ -23,9 +23,9 @@ class Puppet::Pops::Loader::DependencyLoader < Puppet::Pops::Loader::BaseLoader
     @dependency_loaders = dependency_loaders
   end
 
-  def discover(type, name_authority = Puppet::Pops::Pcore::RUNTIME_NAME_AUTHORITY, &block)
+  def discover(type, error_collector = nil, name_authority = Puppet::Pops::Pcore::RUNTIME_NAME_AUTHORITY, &block)
     result = []
-    @dependency_loaders.each { |loader| result.concat(loader.discover(type, name_authority, &block)) }
+    @dependency_loaders.each { |loader| result.concat(loader.discover(type, error_collector, name_authority, &block)) }
     result.concat(super)
     result
   end

data/vendored/puppet/lib/puppet/pops/loader/loader.rb

@@ -40,13 +40,18 @@ class Loader
   # found values for which the given block returns true. All found entries will be returned if no
   # block is given.
   #
+  # Errors that occur function discovery will either be logged as warnings or collected by the optional
+  # `error_collector` array. When provided, it will receive {Puppet::DataTypes::Error} instances describing
+  # each error in detail and no warnings will be logged.
+  #
   # @param type [Symbol] the type of values to search for
+  # @param error_collector [Array<Puppet::DataTypes::Error>] an optional array that will receive errors during load
   # @param name_authority [String] the name authority, defaults to the pcore runtime
   # @yield [typed_name] optional block to filter the results
   # @yieldparam [TypedName] typed_name the typed name of a found entry
   # @yieldreturn [Boolean] `true` to keep the entry, `false` to discard it.
   # @return [Array<TypedName>] the list of names of discovered values
-  def discover(type, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
+  def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
     return EMPTY_ARRAY
   end
 

data/vendored/puppet/lib/puppet/pops/loader/loader_paths.rb

@@ -251,8 +251,8 @@ module LoaderPaths
       n = ''
       n << module_name unless module_name.nil?
 
-      # Remove extension regardless of what it is. A task name cannot contain dots
-      relative_path = relative_path.sub(/\.[^\/]*\z/, '')
+      # Remove the file extension, defined as everything after the *last* dot.
+      relative_path = relative_path.sub(%r{\.[^/.]*\z}, '')
 
       if relative_path == 'init' && !(module_name.nil? || module_name.empty?)
         TypedName.new(type, module_name, name_authority)

data/vendored/puppet/lib/puppet/pops/loader/module_loaders.rb

@@ -118,7 +118,8 @@ module ModuleLoaders
       @loaders = loaders
       @loadables = loadables
       unless (loadables - LOADABLE_KINDS).empty?
-        raise ArgumentError, 'given loadables are not of supported loadable kind'
+        #TRANSLATORS 'loadables' is a variable containing loadable modules and should not be translated
+        raise ArgumentError, _('given loadables are not of supported loadable kind')
       end
       loaders.add_loader_by_name(self)
     end
@@ -127,14 +128,27 @@ module ModuleLoaders
       @loadables
     end
 
-    def discover(type, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
+    def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
       global = global?
       if name_authority == Pcore::RUNTIME_NAME_AUTHORITY
         smart_paths.effective_paths(type).each do |sp|
           relative_paths(sp).each do |rp|
             tp = sp.typed_name(type, name_authority, rp, global ? nil : @module_name)
             next unless sp.valid_name?(tp)
-            load_typed(tp) unless block_given? && !block.yield(tp)
+            begin
+              load_typed(tp) unless block_given? && !block.yield(tp)
+            rescue StandardError => e
+              if error_collector.nil?
+                Puppet.warn_once(:unloadable_entity, tp.to_s, e.message)
+              else
+                err = Puppet::DataTypes::Error.new(
+                  Issues::LOADER_FAILURE.format(:type => type),
+                  'PUPPET_LOADER_FAILURE',
+                  Issues::LOADER_FAILURE.issue_code, nil,
+                  { 'original_error' => e.message })
+                error_collector << err unless error_collector.include?(err)
+              end
+            end
           end
         end
       end
@@ -207,7 +221,9 @@ module ModuleLoaders
               return set_entry(typed_name, value, origin)
             end
 
-            raise ArgumentError,"The code loaded from #{origin} does not define the TypeSet '#{module_name.capitalize}'"
+            #TRANSLATORS 'TypeSet' should not be translated
+            raise ArgumentError, _("The code loaded from %{origin} does not define the TypeSet '%{module_name}'") %
+                { origin: origin, module_name: module_name.capitalize }
           end
         else
           # anything else cannot possibly be in this module
@@ -411,8 +427,13 @@ module ModuleLoaders
     end
 
     def existing_paths(effective_path)
-      # Select all paths starting with effective_path but reject any path that continues into a subdirectory
-      @path_index.select { |path| path.start_with?(effective_path) }.reject { |path| path[effective_path.size..-1].include?('/')}
+      dirname = File.dirname(effective_path)
+      basename = File.basename(effective_path)
+      # Select all paths matching `effective_path` up until an optional file extension
+      @path_index.select do |path|
+        File.basename(path, '.*') == basename &&
+          File.dirname(path) == dirname
+      end
     end
 
     def meaningful_to_search?(smart_path)

data/vendored/puppet/lib/puppet/pops/loader/runtime3_type_loader.rb

@@ -13,9 +13,9 @@ class Runtime3TypeLoader < BaseLoader
     @resource_3x_loader = env_path.nil? ? nil : ModuleLoaders.pcore_resource_type_loader_from(parent_loader, loaders, env_path)
   end
 
-  def discover(type, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
+  def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY, &block)
     # TODO: Use generated index of all known types (requires separate utility).
-    parent.discover(type, name_authority, &block)
+    parent.discover(type, error_collector, name_authority, &block)
   end
 
   def to_s()

data/vendored/puppet/lib/puppet/pops/loader/static_loader.rb

@@ -78,7 +78,7 @@ class StaticLoader < Loader
     create_built_in_types
   end
 
-  def discover(type, name_authority = Pcore::RUNTIME_NAME_AUTHORITY)
+  def discover(type, error_collector = nil, name_authority = Pcore::RUNTIME_NAME_AUTHORITY)
     # Static loader only contains runtime types
     return EMPTY_ARRAY unless type == :type && name_authority == name_authority = Pcore::RUNTIME_NAME_AUTHORITY
 

data/vendored/puppet/lib/puppet/pops/loaders.rb

@@ -165,7 +165,7 @@ class Loaders
   # @api private
   def self.loaders
     loaders = Puppet.lookup(:loaders) { nil }
-    raise Puppet::ParseError, "Internal Error: Puppet Context ':loaders' missing" if loaders.nil?
+    raise Puppet::ParseError, _("Internal Error: Puppet Context ':loaders' missing") if loaders.nil?
     loaders
   end
 
@@ -199,7 +199,9 @@ class Loaders
       # TODO : Later check if definition is private, and then add it to private_loader_for_module
       #
       loader = public_loader_for_module(module_name)
-      raise Puppet::ParseError, "Internal Error: did not find public loader for module: '#{module_name}'" if loader.nil?
+      if loader.nil?
+        raise Puppet::ParseError, _("Internal Error: did not find public loader for module: '%{module_name}'") % { module_name: module_name }
+      end
       loader
     end
   end
@@ -238,7 +240,9 @@ class Loaders
 
   def add_loader_by_name(loader)
     name = loader.loader_name
-    raise Puppet::ParseError, "Internal Error: Attempt to redefine loader named '#{name}'" if @loaders_by_name.include?(name)
+    if @loaders_by_name.include?(name)
+      raise Puppet::ParseError, _("Internal Error: Attempt to redefine loader named '%{name}'") % { name: name }
+    end
     @loaders_by_name[name] = loader
   end
 

data/vendored/puppet/lib/puppet/pops/lookup/explainer.rb

@@ -491,7 +491,8 @@ module Lookup
         when :invalid_key
           ExplainInvalidKey.new(@current, qualifier)
         else
-          raise ArgumentError, "Unknown Explain type #{qualifier_type}"
+          #TRANSLATORS 'Explain' is referring to the 'Explainer' class and should not be translated
+          raise ArgumentError, _("Unknown Explain type %{qualifier_type}") % { qualifier_type: qualifier_type }
         end
       @current.branches << node
       @current = node

data/vendored/puppet/lib/puppet/pops/merge_strategy.rb

@@ -24,7 +24,8 @@ module Puppet::Pops
       if merge.is_a?(Hash)
         merge_strategy = merge['strategy']
         if merge_strategy.nil?
-          raise ArgumentError, "The hash given as 'merge' must contain the name of a strategy in string form for the key 'strategy'"
+          #TRANSLATORS 'merge' is a variable name and 'strategy' is a key and should not be translated
+          raise ArgumentError, _("The hash given as 'merge' must contain the name of a strategy in string form for the key 'strategy'")
         end
         merge_options  = merge.size == 1 ? EMPTY_HASH : merge
       else
@@ -33,7 +34,7 @@ module Puppet::Pops
       end
       merge_strategy = merge_strategy.to_sym if merge_strategy.is_a?(String)
       strategy_class = strategies[merge_strategy]
-      raise ArgumentError, "Unknown merge strategy: '#{merge_strategy}'" if strategy_class.nil?
+      raise ArgumentError, _("Unknown merge strategy: '%{strategy}'") % { strategy: merge_strategy } if strategy_class.nil?
       merge_options == EMPTY_HASH ? strategy_class::INSTANCE : strategy_class.new(merge_options)
     end
 
@@ -51,7 +52,9 @@ module Puppet::Pops
     #
     def self.add_strategy(strategy_class)
       unless MergeStrategy > strategy_class
-        raise ArgumentError, "MergeStrategies.add_strategy 'strategy_class' must be a 'MergeStrategy' class. Got #{strategy_class}"
+        #TRANSLATORS 'MergeStrategies.add_strategy' is a method, 'stratgey_class' is a variable and 'MergeStrategy' is a class name and should not be translated
+        raise ArgumentError, _("MergeStrategies.add_strategy 'strategy_class' must be a 'MergeStrategy' class. Got %{strategy_class}") %
+            { strategy_class: strategy_class }
       end
       strategies[strategy_class.key] = strategy_class
       nil

data/vendored/puppet/lib/puppet/pops/migration/migration_checker.rb

@@ -18,41 +18,41 @@ class Puppet::Pops::Migration::MigrationChecker
 
   # For 3.8/4.0
   def report_ambiguous_integer(o)
-    raise Puppet::DevError, "Unsupported migration method called"
+    raise Puppet::DevError, _("Unsupported migration method called")
   end
 
   # For 3.8/4.0
   def report_ambiguous_float(o)
-    raise Puppet::DevError, "Unsupported migration method called"
+    raise Puppet::DevError, _("Unsupported migration method called")
   end
 
   # For 3.8/4.0
   def report_empty_string_true(value, o)
-    raise Puppet::DevError, "Unsupported migration method called"
+    raise Puppet::DevError, _("Unsupported migration method called")
   end
 
   # For 3.8/4.0
   def report_uc_bareword_type(value, o)
-    raise Puppet::DevError, "Unsupported migration method called"
+    raise Puppet::DevError, _("Unsupported migration method called")
   end
 
   # For 3.8/4.0
   def report_equality_type_mismatch(left, right, o)
-    raise Puppet::DevError, "Unsupported migration method called"
+    raise Puppet::DevError, _("Unsupported migration method called")
   end
 
   # For 3.8/4.0
   def report_option_type_mismatch(test_value, option_value, option_expr, matching_expr)
-    raise Puppet::DevError, "Unsupported migration method called"
+    raise Puppet::DevError, _("Unsupported migration method called")
   end
 
   # For 3.8/4.0
   def report_in_expression(o)
-    raise Puppet::DevError, "Unsupported migration method called"
+    raise Puppet::DevError, _("Unsupported migration method called")
   end
 
   # For 3.8/4.0
   def report_array_last_in_block(o)
-    raise Puppet::DevError, "Unsupported migration method called"
+    raise Puppet::DevError, _("Unsupported migration method called")
   end
 end