bolt 0.8.0 → 0.9.0

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

@@ -11,13 +11,22 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not uninstall module '%{module_name}' (%{version})") % { module_name: @module_name, version: v(@version) }
-      message << _("  No installed version of '%{module_name}' matches (%{version})") % { module_name: @module_name, version: v(@version) }
-      message += @modules.map do |mod|
+      module_versions_list = @modules.map do |mod|
         _("    '%{module_name}' (%{version}) is installed in %{path}") % { module_name: mod[:name], version: v(mod[:version]), path: mod[:path] }
+      end.join("\n")
+
+      if module_versions_list.empty?
+        _(<<-MSG).chomp  % { module_name: @module_name, version: v(@version)}
+Could not uninstall module '%{module_name}' (%{version})
+  No installed version of '%{module_name}' matches (%{version})
+        MSG
+      else
+        _(<<-MSG).chomp  % { module_name: @module_name, version: v(@version), module_versions_list: module_versions_list }
+Could not uninstall module '%{module_name}' (%{version})
+  No installed version of '%{module_name}' matches (%{version})
+%{module_versions_list}
+        MSG
       end
-      message.join("\n")
     end
   end
 
@@ -32,18 +41,32 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
+
+      module_requirements_list = @required_by.map do |mod|
+        msg_variables = { module_name: mod['name'], version: v(mod['version']), module_dependency: @module_name,
+                          dependency_version: v(mod['version_requirement']) }
+        _("    '%{module_name}' (%{version}) requires '%{module_dependency}' (%{dependency_version})") % msg_variables
+      end.join("\n")
+
       if @requested_version
-        message << _("Could not uninstall module '%{module_name}' (v%{requested_version})") % { module_name: @module_name, requested_version: @requested_version }
+        msg_variables = { module_name: @module_name, requested_version: @requested_version, version: v(@installed_version),
+                          module_requirements_list: module_requirements_list }
+        #TRANSLATORS `puppet module uninstall --force` is a command line option that should not be translated
+        _(<<-EOF).chomp % msg_variables
+Could not uninstall module '%{module_name}' (v%{requested_version})
+  Other installed modules have dependencies on '%{module_name}' (%{version})
+%{module_requirements_list}
+    Use `puppet module uninstall --force` to uninstall this module anyway
+        EOF
       else
-        message << _("Could not uninstall module '%{module_name}'") % { module_name: @module_name }
-      end
-      message << _("  Other installed modules have dependencies on '%{module_name}' (%{version})") % { module_name: @module_name, version: v(@installed_version) }
-      message += @required_by.map do |mod|
-        _("    '%{module_name}' (%{version}) requires '%{module_dep}' (%{dep_version})") % { module_name: mod['name'], version: v(mod['version']), module_dep: @module_name, dep_version: v(mod['version_requirement']) }
+        #TRANSLATORS `puppet module uninstall --force` is a command line option that should not be translated
+        _(<<-EOF) % { module_name: @module_name, version: v(@installed_version), module_requirements_list: module_requirements_list }
+Could not uninstall module '%{module_name}'
+  Other installed modules have dependencies on '%{module_name}' (%{version})
+%{module_requirements_list}
+    Use `puppet module uninstall --force` to uninstall this module anyway
+        EOF
       end
-      message << _("    Use `puppet module uninstall --force` to uninstall this module anyway")
-      message.join("\n")
     end
   end
 end

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

@@ -21,23 +21,36 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      message = []
-      message << _("Could not upgrade module '%{module_name}' (%{version})") % { module_name: @module_name, version: vstring }
       if @newer_versions.empty?
-        message << _("  The installed version is already the latest version matching %{version}") % { version: vstring }
+        # TRANSLATORS `puppet module upgrade --force` is a command line option that should not be translated
+        _(<<-MSG).chomp % { module_name: @module_name, version: vstring }
+Could not upgrade module '%{module_name}' (%{version})
+  The installed version is already the latest version matching %{version}
+    Use `puppet module upgrade --force` to upgrade only this module
+        MSG
       else
-        message << _("  There are %{count} newer versions") % { count: @newer_versions.length }
-        message << _("    No combination of dependency upgrades would satisfy all dependencies")
-        unless @possible_culprits.empty?
-          message << _("    Dependencies will not be automatically upgraded across major versions")
-          message << _("    Upgrading one or more of these modules may permit the upgrade to succeed:")
-          @possible_culprits.each do |name|
-            message << "    - #{name}"
-          end
+        if @possible_culprits.empty?
+          # TRANSLATORS `puppet module upgrade --force` is a command line option that should not be translated
+          _(<<-MSG).chomp % { module_name: @module_name, version: vstring, count: @newer_versions.length }
+Could not upgrade module '%{module_name}' (%{version})
+  There are %{count} newer versions
+    No combination of dependency upgrades would satisfy all dependencies
+    Use `puppet module upgrade --force` to upgrade only this module
+          MSG
+        else
+          module_dependency_list = @possible_culprits.map {|name| "    - #{name}"}.join("\n")
+          # TRANSLATORS `puppet module upgrade --force` is a command line option that should not be translated
+          _(<<-MSG).chomp % { module_name: @module_name, version: vstring, count: @newer_versions.length, module_dependency_list: module_dependency_list }
+Could not upgrade module '%{module_name}' (%{version})
+  There are %{count} newer versions
+    No combination of dependency upgrades would satisfy all dependencies
+    Dependencies will not be automatically upgraded across major versions
+    Upgrading one or more of these modules may permit the upgrade to succeed:
+%{module_dependency_list}
+    Use `puppet module upgrade --force` to upgrade only this module
+          MSG
         end
       end
-      message << _("    Use `puppet module upgrade --force` to upgrade only this module")
-      message.join("\n")
     end
   end
 
@@ -53,11 +66,10 @@ 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 << _("  Downgrading is not allowed.")
-
-      message.join("\n")
+      _(<<-MSG).chomp % { action: @action, module_name: @module_name, version: vstring }
+Could not %{action} module '%{module_name}' (%{version})
+  Downgrading is not allowed.
+      MSG
     end
   end
 end

data/vendored/puppet/lib/puppet/network/auth_config_parser.rb

@@ -51,19 +51,19 @@ class AuthConfigParser
     value.strip!
     case var
     when "allow"
-      modify_right(right, :allow, value, _("allowing %s access"), count)
+      modify_right(right, :allow, value, _("allowing %{value} access"), count)
     when "deny"
-      modify_right(right, :deny, value, _("denying %s access"), count)
+      modify_right(right, :deny, value, _("denying %{value} access"), count)
     when "allow_ip"
-      modify_right(right, :allow_ip, value, _("allowing IP %s access"), count)
+      modify_right(right, :allow_ip, value, _("allowing IP %{value} access"), count)
     when "deny_ip"
-      modify_right(right, :deny_ip, value, _("denying IP %s access"), count)
+      modify_right(right, :deny_ip, value, _("denying IP %{value} access"), count)
     when "method"
-      modify_right(right, :restrict_method, value, _("allowing 'method' %s"), count)
+      modify_right(right, :restrict_method, value, _("allowing 'method' %{value}"), count)
     when "environment"
-      modify_right(right, :restrict_environment, value, _("adding environment %s"), count)
+      modify_right(right, :restrict_environment, value, _("adding environment %{value}"), count)
     when /auth(?:enticated)?/
-      modify_right(right, :restrict_authenticated, value, _("adding authentication %s"), count)
+      modify_right(right, :restrict_authenticated, value, _("adding authentication %{value}"), count)
     else
       raise Puppet::ConfigurationError,
         _("Invalid argument '%{var}' at line %{count}") % { var: var, count: count }
@@ -74,7 +74,7 @@ class AuthConfigParser
     value.split(/\s*,\s*/).each do |val|
       begin
         val.strip!
-        right.info msg % val
+        right.info msg % { value: val }
         right.send(method, val)
       rescue Puppet::AuthStoreError => detail
         raise Puppet::ConfigurationError, _("%{detail} at line %{count} of %{file}") % { detail: detail, count: count, file: @file }, detail.backtrace

data/vendored/puppet/lib/puppet/network/http/error.rb

@@ -20,42 +20,42 @@ module Puppet::Network::HTTP::Error
   class HTTPNotAcceptableError < HTTPError
     CODE = 406
     def initialize(message, issue_kind = Issues::RUNTIME_ERROR)
-      super(_("Not Acceptable: ") + message, CODE, issue_kind)
+      super(_("Not Acceptable: %{message}") % { message: message }, CODE, issue_kind)
     end
   end
 
   class HTTPNotFoundError < HTTPError
     CODE = 404
     def initialize(message, issue_kind = Issues::RUNTIME_ERROR)
-      super(_("Not Found: ") + message, CODE, issue_kind)
+      super(_("Not Found: %{message}") % { message: message }, CODE, issue_kind)
     end
   end
 
   class HTTPNotAuthorizedError < HTTPError
     CODE = 403
     def initialize(message, issue_kind = Issues::RUNTIME_ERROR)
-      super(_("Not Authorized: ") + message, CODE, issue_kind)
+      super(_("Not Authorized: %{message}") % { message: message }, CODE, issue_kind)
     end
   end
 
   class HTTPBadRequestError < HTTPError
     CODE = 400
     def initialize(message, issue_kind = Issues::RUNTIME_ERROR)
-      super(_("Bad Request: ") + message, CODE, issue_kind)
+      super(_("Bad Request: %{message}") % { message: message }, CODE, issue_kind)
     end
   end
 
   class HTTPMethodNotAllowedError < HTTPError
     CODE = 405
     def initialize(message, issue_kind = Issues::RUNTIME_ERROR)
-      super(_("Method Not Allowed: ") + message, CODE, issue_kind)
+      super(_("Method Not Allowed: %{message}") % { message: message }, CODE, issue_kind)
     end
   end
 
   class HTTPUnsupportedMediaTypeError < HTTPError
     CODE = 415
     def initialize(message, issue_kind = Issues::RUNTIME_ERROR)
-      super(_("Unsupported Media Type: ") + message, CODE, issue_kind)
+      super(_("Unsupported Media Type: %{message}") % { message: message }, CODE, issue_kind)
     end
   end
 
@@ -63,7 +63,7 @@ module Puppet::Network::HTTP::Error
     CODE = 500
 
     def initialize(original_error, issue_kind = Issues::RUNTIME_ERROR)
-      super(_("Server Error: ") + original_error.message, CODE, issue_kind)
+      super(_("Server Error: %{message}") % { message: original_error.message }, CODE, issue_kind)
     end
 
     def to_json

data/vendored/puppet/lib/puppet/network/http/rack.rb

@@ -23,9 +23,9 @@ class Puppet::Network::HTTP::Rack
       # Send a Status 500 Error on unhandled exceptions.
       response.status = 500
       response['Content-Type'] = 'text/plain'
-      response.write _('Internal Server Error: "%s"') % detail.message
+      response.write _("Internal Server Error: \"%{message}\"") % { message: detail.message }
       # log what happened
-      Puppet.log_exception(detail, _("Puppet Server (Rack): Internal Server Error: Unhandled Exception: \"%s\"") % detail.message)
+      Puppet.log_exception(detail, _("Puppet Server (Rack): Internal Server Error: Unhandled Exception: \"%{message}\"") % { message: detail.message })
     end
     response.finish
   end

data/vendored/puppet/lib/puppet/network/http/webrick.rb

@@ -27,7 +27,7 @@ class Puppet::Network::HTTP::WEBrick
       @server.start do |sock|
         timeout = 10.0
         if ! IO.select([sock],nil,nil,timeout)
-          raise _("Client did not send data within %.1f seconds of connecting") % timeout
+          raise _("Client did not send data within %{timeout} seconds of connecting") % { timeout: ("%.1f") % timeout }
         end
         sock.accept
         @server.run(sock)

data/vendored/puppet/lib/puppet/node.rb

@@ -149,6 +149,16 @@ class Puppet::Node
     @parameters[ENVIRONMENT] ||= self.environment.name.to_s
   end
 
+  # Add extra facts, such as facts given to lookup on the command line The
+  # extra facts will override existing ones.
+  # @param extra_facts [Hash{String=>Object}] the facts to tadd
+  # @api private
+  def add_extra_facts(extra_facts)
+    @facts.add_extra_values(extra_facts)
+    @parameters.merge!(extra_facts)
+    nil
+  end
+
   def add_server_facts(facts)
     # Append the current environment to the list of server facts
     @server_facts = facts.merge({ "environment" => self.environment.name.to_s})

data/vendored/puppet/lib/puppet/node/facts.rb

@@ -59,6 +59,15 @@ class Puppet::Node::Facts
     end
   end
 
+  # Add extra values, such as facts given to lookup on the command line. The
+  # extra values will override existing values.
+  # @param extra_values [Hash{String=>Object}] the values to add
+  # @api private
+  def add_extra_values(extra_values)
+    @values.merge!(extra_values)
+    nil
+  end
+
   # Sanitize fact values by converting everything not a string, Boolean
   # numeric, array or hash into strings.
   def sanitize

data/vendored/puppet/lib/puppet/parameter/value_collection.rb

@@ -181,12 +181,22 @@ class Puppet::Parameter::ValueCollection
     return if empty?
 
     unless @values.detect { |name, v| v.match?(value) }
-      str = _("Invalid value %{value}. ") % { value: value.inspect }
-
-      str += _("Valid values are %{value_list}. ") % { value_list: values.join(", ") } unless values.empty?
-
-      str += _("Valid values match %{pattern}.") % { pattern: regexes.join(", ") } unless regexes.empty?
-
+      str = if values.empty?
+              if regexes.empty?
+                _("Invalid value %{value}.") % { value: value.inspect }
+              else
+                _("Invalid value %{value}. Valid values match %{patterns_list}.") %
+                    { value: value.inspect, patterns_list: regexes.join(", ") }
+              end
+            else
+              if regexes.empty?
+                _("Invalid value %{value}. Valid values are %{values_list}.") %
+                    { value: value.inspect, values_list: values.join(", ") }
+              else
+                _("Invalid value %{value}. Valid values are %{values_list}. Valid values match %{patterns_list}.") %
+                    { value: value.inspect, values_list: values.join(", "), patterns_list: regexes.join(", ") }
+              end
+            end
       raise ArgumentError, str
     end
   end

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

@@ -171,11 +171,72 @@ class Puppet::Parser::Resource < Puppet::Resource
     if evaluated?
       strict = Puppet[:strict]
       unless strict == :off
-        msg = _('Attempt to override an already evaluated resource%{location} with new values') %
-          { resource: ref, location: append_location(file, line, _(', defined'), ',') }
-        raise Puppet::ParseError.new(msg, resource.file, resource.line) if strict == :error
-        msg << append_location(resource.file, resource.line)
-        Puppet.warning(msg)
+        if strict == :error
+          msg = if file && file != ''
+                  if line
+                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values') % { file: file, line: line }
+                  else
+                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values') % { file: file }
+                  end
+                else
+                  if line
+                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values') % { line: line }
+                  else
+                    _('Attempt to override an already evaluated resource with new values')
+                  end
+                end
+          raise Puppet::ParseError.new(msg, resource.file, resource.line)
+        else
+          msg = case
+                  # all 4 variables set
+                  when file && file != '' && line && resource.file && resource.file != '' && resource.line
+                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values at %{resource_file}:%{resource_line}') %
+                        { file: file, line: line, resource_file: resource.file, resource_line: resource.line }
+
+                  # 3 variables set
+                  when file && file != '' && line && resource.file && resource.file != ''
+                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values in %{resource_file}') %
+                        { file: file, line: line, resource_file: resource.file }
+                  when file && file != '' && line && resource.line
+                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values at line %{resource_line}') %
+                        { file: file, line: line, resource_line: resource.line }
+                  when file && file != '' && resource.file && resource.file != '' && resource.line
+                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values at %{resource_file}:%{resource_line}') %
+                        { file: file, resource_file: resource.file, resource_line: resource.line }
+                  when line && resource.file && resource.file != '' && resource.line
+                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values at %{resource_file}:%{resource_line}') %
+                        { line: line, resource_file: resource.file, resource_line: resource.line }
+
+                  # 2 variables set
+                  when file && file != '' && line
+                    _('Attempt to override an already evaluated resource, defined at %{file}:%{line}, with new values') % { file: file, line: line }
+                  when file && file != '' && resource.file && resource.file != ''
+                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values in %{resource_file}') % { file: file, resource_file: resource.file }
+                  when file && file != '' && resource.line
+                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values at line %{resource_line}') % { file: file, resource_line: resource.line }
+                  when line && resource.file && resource.file != ''
+                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values in %{resource_file}') % { line: line, resource_file: resource.file }
+                  when line && resource.line
+                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values at line %{resource_line}') % { line: line, resource_line: resource.line }
+                  when resource.file && resource.file != '' && resource.line
+                    _('Attempt to override an already evaluated resource with new values at %{resource_file}:%{resource_line}') % { resource_file: resource.file, resource_line: resource.line }
+
+                  # 1 variable set
+                  when file && file != ''
+                    _('Attempt to override an already evaluated resource, defined in %{file}, with new values') % { file: file }
+                  when line
+                    _('Attempt to override an already evaluated resource, defined at line %{line}, with new values') % { line: line }
+                  when resource.file && resource.file != ''
+                    _('Attempt to override an already evaluated resource with new values in %{resource_file}') % { resource_file: resource.file }
+                  when resource.line
+                    _('Attempt to override an already evaluated resource with new values at line %{resource_line}') % { resource_line: resource.line }
+
+                  else
+                    # no variables set
+                    _('Attempt to override an already evaluated resource with new values')
+                end
+          Puppet.warning(msg)
+        end
       end
     end
 
@@ -322,28 +383,6 @@ class Puppet::Parser::Resource < Puppet::Resource
 
   private
 
-  # Append location to the message if location is present. If it is not, an empty string
-  # is returned instead.
-  #
-  # @param file [String] path to the file
-  # @param line [Integer] the line in the file
-  # @param prefix [String] string prefix
-  # @param suffix [String] string suffix
-  # @return [String] the formatted location or an empty string
-  def append_location(file, line, prefix = '', suffix = '')
-    if file && file != ''
-      if line
-        _('%{prefix} at %{file}:%{line}%{suffix}') % { prefix: prefix, suffix: suffix, file: file, line: line }
-      else
-        _('%{prefix} in %{file}%{suffix}') % { prefix: prefix, suffix: suffix, file: file }
-      end
-    elsif line
-      _('%{prefix} at line %{line}%{suffix}') % { prefix: prefix, suffix: suffix, line: line }
-    else
-      ''
-    end
-  end
-
   def add_scope_tags
     scope_resource = scope.resource
     unless scope_resource.nil? || scope_resource.equal?(self)
@@ -371,10 +410,43 @@ class Puppet::Parser::Resource < Puppet::Resource
 
     # The parameter is already set.  Fail if they're not allowed to override it.
     unless param.source.child_of?(current.source) || param.source.equal?(current.source) && scope.is_default?(type, param.name, current.value)
-      msg = _("Parameter '%{name}' is already set on %{resource}") % { name: param.name, resource: ref }
-      msg << _(' by %{source}') % { source: current.source.to_s } unless current.source.to_s == ''
-      msg << append_location(current.file, current.line)
-      msg << _('; cannot redefine')
+      msg = if current.source.to_s == ''
+              if current.file && current.file != ''
+                if current.line
+                  _("Parameter '%{name}' is already set on %{resource} at %{file}:%{line}; cannot redefine") %
+                      { name: param.name, resource: ref, file: current.file, line: current.line }
+                else
+                  _("Parameter '%{name}' is already set on %{resource} in %{file}; cannot redefine") %
+                      { name: param.name, resource: ref, file: current.file }
+                end
+              else
+                if current.line
+                  _("Parameter '%{name}' is already set on %{resource} at line %{line}; cannot redefine") %
+                      { name: param.name, resource: ref, line: current.line }
+                else
+                  _("Parameter '%{name}' is already set on %{resource}; cannot redefine") %
+                      { name: param.name, resource: ref }
+                end
+              end
+            else
+              if current.file && current.file != ''
+                if current.line
+                  _("Parameter '%{name}' is already set on %{resource} by %{source} at %{file}:%{line}; cannot redefine") %
+                      { name: param.name, resource: ref, source: current.source.to_s, file: current.file, line: current.line }
+                else
+                  _("Parameter '%{name}' is already set on %{resource} by %{source} in %{file}; cannot redefine") %
+                      { name: param.name, resource: ref, source: current.source.to_s, file: current.file }
+                end
+              else
+                if current.line
+                  _("Parameter '%{name}' is already set on %{resource} by %{source} at line %{line}; cannot redefine") %
+                      { name: param.name, resource: ref, source: current.source.to_s, line: current.line }
+                else
+                  _("Parameter '%{name}' is already set on %{resource} by %{source}; cannot redefine") %
+                      { name: param.name, resource: ref, source: current.source.to_s }
+                end
+              end
+            end
       raise Puppet::ParseError.new(msg, param.file, param.line)
     end