bolt 0.8.0 → 0.9.0

data/vendored/puppet/lib/puppet/face/module/uninstall.rb

@@ -63,7 +63,13 @@ Puppet::Face.define(:module, '1.0.0') do
       name = name.gsub('/', '-')
 
       Puppet::ModuleTool.set_option_defaults options
-      Puppet.notice _("Preparing to uninstall '%{name}'") % { name: name } << (options[:version] ? " (#{colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))})" : '') << " ..."
+      message = if options[:version]
+                  module_version = colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))
+                  _("Preparing to uninstall '%{name}' (%{module_version}) ...") % { name: name, module_version: module_version }
+                else
+                  _("Preparing to uninstall '%{name}' ...") % { name: name }
+                end
+      Puppet.notice message
       Puppet::ModuleTool::Applications::Uninstaller.run(name, options)
     end
 
@@ -73,8 +79,13 @@ Puppet::Face.define(:module, '1.0.0') do
         exit 1
       else
         mod = return_value[:affected_modules].first
-        module_version = mod.version ? " (#{colorize(:cyan, mod.version.to_s.sub(/^(?=\d)/, 'v'))})" : ''
-        _("Removed '%{name}'%{module_version} from %{path}") % { name: return_value[:module_name], module_version: module_version, path: mod.modulepath }
+        message = if mod.version
+                    module_version = colorize(:cyan, mod.version.to_s.sub(/^(?=\d)/, 'v'))
+                    _("Removed '%{name}' (%{module_version}) from %{path}") % { name: return_value[:module_name], module_version: module_version, path: mod.modulepath }
+                  else
+                    _("Removed '%{name}' from %{path}") % { name: return_value[:module_name], path: mod.modulepath }
+                  end
+        message
       end
     end
   end

data/vendored/puppet/lib/puppet/face/plugin.rb

@@ -1,5 +1,4 @@
 require 'puppet/face'
-require 'puppet/configurer/downloader_factory'
 require 'puppet/configurer/plugin_handler'
 
 Puppet::Face.define(:plugin, '0.0.1') do
@@ -42,8 +41,7 @@ Puppet::Face.define(:plugin, '0.0.1') do
     when_invoked do |options|
       remote_environment_for_plugins = Puppet::Node::Environment.remote(Puppet[:environment])
 
-      factory = Puppet::Configurer::DownloaderFactory.new
-      handler = Puppet::Configurer::PluginHandler.new(factory)
+      handler = Puppet::Configurer::PluginHandler.new()
       handler.download_plugins(remote_environment_for_plugins)
     end
 

data/vendored/puppet/lib/puppet/forge/errors.rb

@@ -89,9 +89,12 @@ Could not connect to %{uri}
       rescue JSON::ParserError
       end
 
-      message = _("Request to Puppet Forge failed. Detail: ")
-      message << @message << " / " if @message
-      message << @response << "."
+      message = if @message
+                  _("Request to Puppet Forge failed. Detail: %{error_message} / %{http_response}.") %
+                      { error_message: @message, http_response: @response }
+                else
+                  _("Request to Puppet Forge failed. Detail: %{http_response}.") % { http_response: @response }
+                end
       super(message, original)
     end
 
@@ -99,13 +102,20 @@ Could not connect to %{uri}
     #
     # @return [String] the multiline version of the error message
     def multiline
-      message = _(<<-EOS).chomp % { uri: @uri, response: @response }
+      if @message
+        _(<<-EOS).chomp % { uri: @uri, response: @response, message: @message }
 Request to Puppet Forge failed.
   The server being queried was %{uri}
   The HTTP response we received was '%{response}'
-      EOS
-      message << _("\n  The message we received said '%{message}'") % { message: @message } if @message
-      message
+  The message we received said '%{message}'
+        EOS
+      else
+        _(<<-EOS).chomp % { uri: @uri, response: @response }
+Request to Puppet Forge failed.
+  The server being queried was %{uri}
+  The HTTP response we received was '%{response}'
+        EOS
+      end
     end
   end
 

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

@@ -474,8 +474,8 @@ module Puppet::Functions
         type = @all_callables
         name = type_and_name[0]
       when 2
-        type_string, name = type_and_name
-        type = Puppet::Pops::Types::TypeParser.singleton.parse(type_string, loader)
+        type, name = type_and_name
+        type = Puppet::Pops::Types::TypeParser.singleton.parse(type, loader) unless type.is_a?(Puppet::Pops::Types::PAnyType)
       else
         raise ArgumentError, _("block_param accepts max 2 arguments (type, name), got %{size}.") % { size: type_and_name.size }
       end
@@ -513,7 +513,9 @@ module Puppet::Functions
     #
     # @api public
     def return_type(type)
-      raise ArgumentError, _("Argument to 'return_type' must be a String reference to a Puppet Data Type. Got %{type_class}") % { type_class: type.class } unless type.is_a?(String)
+      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
 
@@ -528,7 +530,7 @@ module Puppet::Functions
         raise ArgumentError, _("Parameter name argument must be a Symbol. Got %{name_class}") % { name_class: name.class }
       end
 
-      if type.is_a?(String)
+      if type.is_a?(String) || type.is_a?(Puppet::Pops::Types::PAnyType)
         @types << type
         @names << name
         # mark what should be picked for this position when dispatching
@@ -571,10 +573,10 @@ module Puppet::Functions
     # @api private
     def create_callable(types, block_type, return_type, from, to)
       mapped_types = types.map do |t|
-        Puppet::Pops::Types::TypeParser.singleton.parse(t, loader)
+        t.is_a?(Puppet::Pops::Types::PAnyType) ? t : Puppet::Pops::Types::TypeParser.singleton.parse(t, loader)
       end
       param_types = Puppet::Pops::Types::PTupleType.new(mapped_types, from > 0 && from == to ? nil : Puppet::Pops::Types::PIntegerType.new(from, to))
-      return_type = Puppet::Pops::Types::TypeParser.singleton.parse(return_type, loader) unless return_type.nil?
+      return_type = Puppet::Pops::Types::TypeParser.singleton.parse(return_type, loader) unless return_type.nil? || return_type.is_a?(Puppet::Pops::Types::PAnyType)
       Puppet::Pops::Types::PCallableType.new(param_types, block_type, return_type)
     end
   end

data/vendored/puppet/lib/puppet/functions/each.rb

@@ -117,8 +117,11 @@ Puppet::Functions.create_function(:each) do
 
   def foreach_Hash_1(hash)
     enumerator = hash.each_pair
-    hash.size.times do
-      yield(enumerator.next)
+    begin
+      hash.size.times do
+        yield(enumerator.next)
+      end
+    rescue StopIteration
     end
     # produces the receiver
     hash
@@ -126,8 +129,11 @@ Puppet::Functions.create_function(:each) do
 
   def foreach_Hash_2(hash)
     enumerator = hash.each_pair
-    hash.size.times do
-      yield(*enumerator.next)
+    begin
+      hash.size.times do
+        yield(*enumerator.next)
+      end
+    rescue StopIteration
     end
     # produces the receiver
     hash

data/vendored/puppet/lib/puppet/functions/lookup.rb

@@ -91,8 +91,8 @@
 # merged hash. If the same key exists in multiple source hashes, Puppet will
 # recursively merge hash or array values (with duplicate values removed from
 # arrays). For conflicting scalar values, the highest-priority value will win.
-# * `{'strategy' => 'first|unique|hash'}` --- Same as the string versions of these
-# merge behaviors.
+# * `{'strategy' => 'first'}`, `{'strategy' => 'unique'}`,
+# or `{'strategy' => 'hash'}` --- Same as the string versions of these merge behaviors.
 # * `{'strategy' => 'deep', <DEEP OPTION> => <VALUE>, ...}` --- Same as `'deep'`,
 # but can adjust the merge with additional options. The available options are:
 #     * `'knockout_prefix'` (string or undef) --- A string prefix to indicate a

data/vendored/puppet/lib/puppet/functions/map.rb

@@ -88,11 +88,21 @@ Puppet::Functions.create_function(:map) do
   end
 
   def map_Hash_1(hash)
-    hash.map {|x, y| yield([x, y]) }
+    result = []
+    begin
+      hash.map {|x, y| result << yield([x, y]) }
+    rescue StopIteration
+    end
+    result
   end
 
   def map_Hash_2(hash)
-    hash.map {|x, y| yield(x, y) }
+    result = []
+    begin
+      hash.map {|x, y| result << yield(x, y) }
+    rescue StopIteration
+    end
+    result
   end
 
   def map_Enumerable_1(enumerable)

data/vendored/puppet/lib/puppet/functions/slice.rb

@@ -102,9 +102,8 @@ Puppet::Functions.create_function(:slice) do
       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}; ") % { slice_size: slice_size, serving_size: serving_size }+
-      pblock.parameter_names.join(', ')
+      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(', ') }
     end
     serving_size
   end

data/vendored/puppet/lib/puppet/graph/simple_graph.rb

@@ -228,19 +228,23 @@ class Puppet::Graph::SimpleGraph
     number_of_cycles = cycles.length
     return if number_of_cycles == 0
 
-    message = n_("Found %{num} dependency cycle:\n", "Found %{num} dependency cycles:\n", number_of_cycles) % { num: number_of_cycles }
+    cycle_path_list = ''
     cycles.each do |cycle|
       paths = paths_in_cycle(cycle)
-      message += paths.map{ |path| '(' + path.join(" => ") + ')'}.join("\n") + "\n"
+      cycle_path_list += paths.map{ |path| '(' + path.join(' => ') + ')'}.join('\n')
     end
 
     if Puppet[:graph] then
       filename = write_cycles_to_graph(cycles)
-      message += _("Cycle graph written to %{filename}.") % { filename: filename }
+      message  = n_("Found %{number_of_cycles} dependency cycle:\n%{cycle_path_list}\nCycle graph written to %{filename}.",
+                    "Found %{number_of_cycles} dependency cycles:\n%{cycle_path_list}\nCycle graph written to %{filename}.", number_of_cycles) %
+          { number_of_cycles: number_of_cycles, cycle_path_list: cycle_path_list, filename: filename }
     else
-      #TRANSLATORS "graph" refers to a command line option and should not be translated
+      #TRANSLATORS '--graph' refers to a command line option and should not be translated
       #TRANSLATORS OmniGraffle and GraphViz and program names and should not be translated
-      message += _("Try the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz")
+      message = n_("Found %{number_of_cycles} dependency cycle:\n%{cycle_path_list}\nTry the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz",
+                   "Found %{number_of_cycles} dependency cycles:\n%{cycle_path_list}\nTry the '--graph' option and opening the resulting '.dot' file in OmniGraffle or GraphViz", number_of_cycles) %
+          { number_of_cycles: number_of_cycles, cycle_path_list: cycle_path_list }
     end
     Puppet.err(message)
     cycles

data/vendored/puppet/lib/puppet/interface.rb

@@ -178,6 +178,7 @@ class Puppet::Interface
   def to_s
     "Puppet::Face[#{name.inspect}, #{version.inspect}]"
   end
+  alias_method :inspect, :to_s
 
   # @return [void]
   def deprecate

data/vendored/puppet/lib/puppet/module_tool/errors/installer.rb

@@ -12,13 +12,24 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @module_name, version: @requested_version }
-      message << _("  Module '%{module_name}' (%{version}) is already installed") % { module_name: @module_name, version: @installed_version }
-      message << _("    Installed module has had changes made locally") unless @local_changes.empty?
-      message << _("    Use `puppet module upgrade` to install a different version")
-      message << _("    Use `puppet module install --force` to re-install only this module")
-      message.join("\n")
+      if @local_changes.empty?
+        #TRANSLATORS `puppet module upgrade` and `puppet module upgrade` are a command line and should not be translated
+        _(<<-MSG).chomp % { module_name: @module_name, requested_version: @requested_version, installed_version: @installed_version }
+Could not install module '%{module_name}' (%{requested_version})
+  Module '%{module_name}' (%{installed_version}) is already installed
+    Use `puppet module upgrade` to install a different version
+    Use `puppet module install --force` to re-install only this module
+        MSG
+      else
+        #TRANSLATORS `puppet module upgrade` and `puppet module upgrade` are a command line and should not be translated
+        _(<<-MSG).chomp % { module_name: @module_name, requested_version: @requested_version, installed_version: @installed_version }
+Could not install module '%{module_name}' (%{requested_version})
+  Module '%{module_name}' (%{installed_version}) is already installed
+    Installed module has had changes made locally
+    Use `puppet module upgrade` to install a different version
+    Use `puppet module install --force` to re-install only this module
+        MSG
+      end
     end
   end
 
@@ -31,13 +42,11 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not install '%{requested_package}'") % { requested_package: @requested_package }
-
-      message << _("  No releases are available from %{source}") % { source: @source }
-      message << _("    Does '%{requested_package}' have at least one published release?") % { requested_package: @requested_package }
-
-      message.join("\n")
+      _(<<-MSG).chomp % { requested_package: @requested_package, source: @source }
+Could not install '%{requested_package}'
+  No releases are available from %{source}
+    Does '%{requested_package}' have at least one published release?
+MSG
     end
   end
 
@@ -50,7 +59,8 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      _(<<-MSG).strip % { module_name: @requested_module, version: @requested_version, dir: @directory }
+      # TRANSLATORS "mkdir -p'%{dir}'" is a command line example and should not be translated
+      _(<<-MSG).chomp % { module_name: @requested_module, version: @requested_version, dir: @directory }
 Could not install module '%{module_name}' (%{version})
   Path '%{dir}' exists but is not a directory.
   A potential solution is to rename the path and then
@@ -68,7 +78,7 @@ Could not install module '%{module_name}' (%{version})
     end
 
     def multiline
-      _(<<-MSG).strip % { module_name: @requested_module, version: @requested_version, dir: @directory }
+      _(<<-MSG).chomp % { module_name: @requested_module, version: @requested_version, dir: @directory }
 Could not install module '%{module_name}' (%{version})
   Permission is denied when trying to create directory '%{dir}'.
   A potential solution is to check the ownership and permissions of
@@ -85,7 +95,7 @@ Could not install module '%{module_name}' (%{version})
     end
 
     def multiline
-      _(<<-MSG).strip % { path: @entry_path.inspect, dir: @directory.inspect }
+      _(<<-MSG).chomp % { path: @entry_path.inspect, dir: @directory.inspect }
 Could not install package with an invalid path.
   Package attempted to install file into
   %{path} under %{dir}.

data/vendored/puppet/lib/puppet/module_tool/errors/shared.rb

@@ -12,12 +12,12 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not %{action} module '%{module_name}' (%{version})") % { action: @action, module_name: @requested_name, version: vstring }
-      message << _("  No version of '%{module_name}' can satisfy all dependencies") % { module_name: @requested_name }
-      message << _("    Use `puppet module %{action} --ignore-dependencies` to %{action} only this module") % { action: @action }
-
-      message.join("\n")
+      #TRANSLATORS `puppet module %{action} --ignore-dependencies` is a command line and should not be translated
+      _(<<-EOM).chomp % { action: @action, module_name: @requested_name, version: vstring }
+Could not %{action} module '%{module_name}' (%{version})
+  No version of '%{module_name}' can satisfy all dependencies
+    Use `puppet module %{action} --ignore-dependencies` to %{action} only this module
+      EOM
     end
   end
 
@@ -37,17 +37,18 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not %{action} '%{module_name}' (%{version})") % { action: @action, module_name: @module_name, version: vstring }
-
       if @requested_version == :latest
-        message << _("  No releases are available from %{source}") % { source: @source }
-        message << _("    Does '%{module_name}' have at least one published release?") % { module_name: @module_name }
+        _(<<-EOM).chomp % { action: @action, module_name: @module_name, version: vstring, source: @source }
+Could not %{action} '%{module_name}' (%{version})
+  No releases are available from %{source}
+    Does '%{module_name}' have at least one published release?
+        EOM
       else
-        message << _("  No releases matching '%{version}' are available from %{source}") % { version: @requested_version, source: @source }
+        _(<<-EOM).chomp % { action: @action, module_name: @module_name, version: vstring, requested_version: @requested_version, source: @source }
+Could not %{action} '%{module_name}' (%{version})
+  No releases matching '%{requested_version}' are available from %{source}
+        EOM
       end
-
-      message.join("\n")
     end
   end
 
@@ -62,26 +63,49 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: @requested_version }
-
       if @dependency
-        message << _("  Dependency '%{name}' (%{version}) would overwrite %{dir}") % { name: @dependency[:name], version: v(@dependency[:version]), dir: @directory }
-      else
-        message << _("  Installation would overwrite %{dir}") % { dir: @directory }
-      end
-
-      if @metadata
-        message << _("    Currently, '%{name}' (%{version}) is installed to that directory") % { name: @metadata["name"], version: v(@metadata["version"]) }
-      end
+        if @metadata
+          msg_variables = { module_name: @requested_module, requested_version: @requested_version,
+                       name: @dependency[:name], version: v(@dependency[:version]),
+                       directory: @directory, current_name: @metadata["name"], current_version: v(@metadata["version"]) }
+          #TRANSLATORS `puppet module install --ignore-dependencies` is a command line and should not be translated
+          _(<<-EOM).chomp % msg_variables
+Could not install module '%{module_name}' (%{requested_version})                  
+  Dependency '%{name}' (%{version}) would overwrite %{directory}
+    Currently, '%{current_name}' (%{current_version}) is installed to that directory
+    Use `puppet module install --ignore-dependencies` to install only this module
+          EOM
+        else
+          msg_variables = { module_name: @requested_module, requested_version: @requested_version,
+                            name: @dependency[:name], version: v(@dependency[:version]), directory: @directory }
+          #TRANSLATORS `puppet module install --ignore-dependencies` is a command line and should not be translated
+          _(<<-EOM).chomp % msg_variables
+Could not install module '%{module_name}' (%{requested_version})                  
+  Dependency '%{name}' (%{version}) would overwrite %{directory}
+    Use `puppet module install --ignore-dependencies` to install only this module
+          EOM
+        end
 
-      if @dependency
-        message << _("    Use `puppet module install --ignore-dependencies` to install only this module")
       else
-        message << _("    Use `puppet module install --force` to install this module anyway")
+        if @metadata
+          msg_variables = { module_name: @requested_module, requested_version: @requested_version,
+                            directory: @directory, current_name: @metadata["name"], current_version: v(@metadata["version"]) }
+          #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+          _(<<-EOM).chomp % msg_variables
+Could not install module '%{module_name}' (%{requested_version})
+  Installation would overwrite %{directory}
+    Currently, '%{current_name}' (%{current_version}) is installed to that directory
+    Use `puppet module install --force` to install this module anyway
+          EOM
+        else
+          #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+          _(<<-EOM).chomp % { module_name: @requested_module, requested_version: @requested_version, directory: @directory }
+Could not install module '%{module_name}' (%{requested_version})
+  Installation would overwrite %{directory}
+    Use `puppet module install --force` to install this module anyway
+          EOM
+        end
       end
-
-      message.join("\n")
     end
   end
 
@@ -97,18 +121,33 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      trace = []
-      trace << _("You specified '%{name}' (%{version})") % { name: @source.first[:name], version: v(@requested_version) }
-      #TRANSLATORS Second half of "You specified a module..."
-      trace += @source[1..-1].map { |m| _("which depends on '%{name}' (%{version})") % { name: m[:name], version: v(m[:version]) } }
-
-      message = []
-      message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: v(@requested_version) }
-      message << _("  No version of '%{module_name}' will satisfy dependencies") % { module_name: @module_name }
-      message << trace.map { |s| "    #{s}".join(",\n") }
-      message << _("    Use `puppet module install --force` to install this module anyway")
+      dependency_list = @source[1..-1].map do |m|
+        #TRANSLATORS This message repeats as separate lines as a list under the heading "You specified '%{name}' (%{version})\n"
+        _("    which depends on '%{name}' (%{version})") % { name: m[:name], version: v(m[:version]) }
+      end.join(",\n")
 
-      message.join("\n")
+      if dependency_list.empty?
+        msg_variables = { requested_module_name: @requested_module, version: v(@requested_version), module_name: @module_name,
+                          name: @source.first[:name] }
+        #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+        _(<<-EOM).chomp % msg_variables
+Could not install module '%{requested_module_name}' (%{version})
+  No version of '%{module_name}' will satisfy dependencies
+    You specified '%{name}' (%{version})
+    Use `puppet module install --force` to install this module anyway
+        EOM
+      else
+        msg_variables = { requested_module_name: @requested_module, version: v(@requested_version), module_name: @module_name,
+                          name: @source.first[:name], dependency_list: dependency_list }
+        #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+        _(<<-EOM).chomp % msg_variables
+Could not install module '%{requested_module_name}' (%{version})
+  No version of '%{module_name}' will satisfy dependencies
+    You specified '%{name}' (%{version})
+%{dependency_list}
+    Use `puppet module install --force` to install this module anyway
+        EOM
+      end
     end
   end
 
@@ -121,14 +160,41 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not %{action} module '%{module_name}'") % { action: @action, module_name: @module_name }
-      message << _("  Module '%{module_name}' is not installed") % { module_name: @module_name }
-      message += @suggestions.map do |suggestion|
+      suggestion_list = @suggestions.map do |suggestion|
         _("    You may have meant `puppet module %{action} %{suggestion}`") % { action: @action, suggestion: suggestion }
+      end.join("\n")
+
+      if @action == :upgrade
+        if suggestion_list.empty?
+          # TRANSLATORS `puppet module install` is a command line and should not be translated
+          _(<<-EOM).chomp % { action: @action, module_name: @module_name }
+Could not %{action} module '%{module_name}'
+  Module '%{module_name}' is not installed
+    Use `puppet module install` to install this module
+          EOM
+        else
+          # TRANSLATORS `puppet module install` is a command line and should not be translated
+          _(<<-EOM).chomp % { action: @action, module_name: @module_name, suggestion_list: suggestion_list }
+Could not %{action} module '%{module_name}'
+  Module '%{module_name}' is not installed
+%{suggestion_list}
+    Use `puppet module install` to install this module
+          EOM
+        end
+      else
+        if suggestion_list.empty?
+          _(<<-EOM).chomp % { action: @action, module_name: @module_name }
+Could not %{action} module '%{module_name}'
+  Module '%{module_name}' is not installed
+         EOM
+        else
+          _(<<-EOM).chomp % { action: @action, module_name: @module_name, suggestion_list: suggestion_list }
+Could not %{action} module '%{module_name}'
+  Module '%{module_name}' is not installed
+%{suggestion_list}
+          EOM
+        end
       end
-      message << _("    Use `puppet module install` to install this module") if @action == :upgrade
-      message.join("\n")
     end
   end
 
@@ -142,14 +208,27 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not %{action} module '%{module_name}'") % { action: @action, module_name: @module_name }
-      message << _("  Module '%{module_name}' appears multiple places in the module path") % { module_name: @module_name }
-      message += @modules.map do |mod|
+      module_path_list = @modules.map do |mod|
+        #TRANSLATORS This is repeats as separate lines as a list under "Module '%{module_name}' appears multiple places in the module path"
         _("    '%{module_name}' (%{version}) was found in %{path}") % { module_name: @module_name, version: v(mod.version), path: mod.modulepath }
+      end.join("\n")
+
+      if module_path_list.empty?
+        # TRANSLATORS `--modulepath` is command line option and should not be translated
+        _(<<-EOM).chomp % { action: @action, module_name: @module_name }
+Could not %{action} module '%{module_name}'
+  Module '%{module_name}' appears multiple places in the module path
+    Use the `--modulepath` option to limit the search to specific directories
+        EOM
+      else
+        # TRANSLATORS `--modulepath` is command line option and should not be translated
+        _(<<-EOM).chomp % { action: @action, module_name: @module_name, module_path_list: module_path_list }
+Could not %{action} module '%{module_name}'
+  Module '%{module_name}' appears multiple places in the module path
+%{module_path_list}
+    Use the `--modulepath` option to limit the search to specific directories
+        EOM
       end
-      message << _("    Use the `--modulepath` option to limit the search to specific directories")
-      message.join("\n")
     end
   end
 
@@ -163,11 +242,12 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not %{action} module '%{module_name}' (%{version})") % { action: @action, module_name: @module_name, version: vstring }
-      message << _("  Installed module has had changes made locally")
-      message << _("    Use `puppet module %{action} --ignore-changes` to %{action} this module anyway") % { action: @action }
-      message.join("\n")
+      #TRANSLATORS `puppet module %{action} --ignore-changes` is a command line and should not be translated
+      _(<<-EOM).chomp % { action: @action, module_name: @module_name, version: vstring }
+Could not %{action} module '%{module_name}' (%{version})
+  Installed module has had changes made locally
+    Use `puppet module %{action} --ignore-changes` to %{action} this module anyway
+      EOM
     end
   end
 
@@ -180,11 +260,11 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not %{action} module '%{module_name}'") % { action: @action, module_name: @name }
-      message << _("  Failure trying to parse metadata")
-      message << _("    Original message was: %{message}") % { message: @error.message }
-      message.join("\n")
+      _(<<-EOM).chomp % { action: @action, module_name: @name, message: @error.message }
+Could not %{action} module '%{module_name}'
+  Failure trying to parse metadata
+    Original message was: %{message}
+      EOM
     end
   end
 end