bolt 0.11.0 → 0.12.0

data/vendored/puppet/lib/puppet/indirector/file_server.rb

@@ -11,7 +11,7 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
   def authorized?(request)
     return false unless [:find, :search].include?(request.method)
 
-    mount, file_path = configuration.split_path(request)
+    mount, _ = configuration.split_path(request)
 
     # If we're not serving this mount, then access is denied.
     return false unless mount

data/vendored/puppet/lib/puppet/indirector/indirection.rb

@@ -160,8 +160,6 @@ class Puppet::Indirector::Indirection
   # remove it, we expire it and write it back out to disk.  This way people
   # can still use the expired object if they want.
   def expire(key, options={})
-    request = request(:expire, key, nil, options)
-
     return nil unless cache?
 
     return nil unless instance = cache.find(request(:find, key, nil, options))

data/vendored/puppet/lib/puppet/indirector/rest.rb

@@ -183,7 +183,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
       # While this way of handling the issue is not perfect, there is at least an error
       # that makes a user aware of the reason for the failure.
       #
-      content_type, body = parse_response(response)
+      _, body = parse_response(response)
       msg = _("Find %{uri} resulted in 404 with the message: %{body}") % { uri: elide(uri_with_query_string, 100), body: body }
       raise Puppet::Error, msg
     else
@@ -262,11 +262,13 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
 
   def handle_response(request, response)
     server_version = response[Puppet::Network::HTTP::HEADER_PUPPET_VERSION]
-    if server_version &&
-       SemanticPuppet::Version.parse(server_version).major < MAJOR_VERSION_JSON_DEFAULT &&
-       Puppet[:preferred_serialization_format] != 'pson'
-      Puppet.warning("Downgrading to PSON for future requests")
-      Puppet[:preferred_serialization_format] = 'pson'
+    if server_version
+      Puppet.push_context({:server_agent_version => server_version})
+      if SemanticPuppet::Version.parse(server_version).major < MAJOR_VERSION_JSON_DEFAULT &&
+          Puppet[:preferred_serialization_format] != 'pson'
+        Puppet.warning("Downgrading to PSON for future requests")
+        Puppet[:preferred_serialization_format] = 'pson'
+      end
     end
   end
 
@@ -315,8 +317,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   # uncompress_body)
   def parse_response(response)
     if response['content-type']
-      [ response['content-type'].gsub(/\s*;.*$/,''),
-        body = uncompress_body(response) ]
+      [ response['content-type'].gsub(/\s*;.*$/,''), uncompress_body(response) ]
     else
       raise _("No content type in http response; cannot parse")
     end

data/vendored/puppet/lib/puppet/info_service/class_information_service.rb

@@ -59,7 +59,7 @@ class Puppet::InfoService::ClassInformationService
       {:classes =>
         parse_result.definitions.select {|d| d.is_a?(Puppet::Pops::Model::HostClassDefinition)}.map do |d|
           {:name   => d.name,
-           :params => params = d.parameters.map {|p| extract_param(p) }
+           :params => d.parameters.map {|p| extract_param(p) }
           }
         end
       }

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

@@ -23,7 +23,7 @@ module Puppet::Interface::OptionManager
 
   # @api private
   def walk_inheritance_tree(start, sym)
-    result = (start ||= [])
+    result = (start || [])
     if self.is_a?(Class) and superclass.respond_to?(sym)
       result = superclass.send(sym) + result
     elsif self.class.respond_to?(sym)

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

@@ -13,6 +13,7 @@ module Puppet
       require 'puppet/pops/loader/static_loader'
       require 'puppet/pops/loader/runtime3_type_loader'
       require 'puppet/pops/loader/ruby_function_instantiator'
+      require 'puppet/pops/loader/ruby_data_type_instantiator'
       require 'puppet/pops/loader/puppet_function_instantiator'
       require 'puppet/pops/loader/type_definition_instantiator'
       require 'puppet/pops/loader/puppet_resource_type_impl_instantiator'

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

@@ -333,7 +333,7 @@ class Puppet::Module
   def dependencies_as_modules
     dependent_modules = []
     dependencies and dependencies.each do |dep|
-      author, dep_name = dep["name"].split('/')
+      _, dep_name = dep["name"].split('/')
       found_module = environment.module(dep_name)
       dependent_modules << found_module if found_module
     end
@@ -456,7 +456,11 @@ class Puppet::Module
 
   def assert_validity
     if !Puppet::Module.is_module_directory_name?(@name) && !Puppet::Module.is_module_namespaced_name?(@name)
-      raise InvalidName, "Invalid module name #{@name}; module names must be alphanumeric (plus '-'), not '#{@name}'"
+      raise InvalidName, _(<<-ERROR_STRING).chomp % { name: @name }
+        Invalid module name '%{name}'; module names must match either:
+        An installed module name (ex. modulename) matching the expression /^[a-z][a-z0-9_]*$/ -or-
+        A namespaced module name (ex. author-modulename) matching the expression /^[a-zA-Z0-9]+[-][a-z][a-z0-9_]*$/
+      ERROR_STRING
     end
   end
 end

data/vendored/puppet/lib/puppet/module_tool/applications/unpacker.rb

@@ -76,7 +76,7 @@ module Puppet::ModuleTool
       # @api private
       def module_name
         metadata = JSON.parse((root_dir + 'metadata.json').read)
-        name = metadata['name'][/-(.*)/, 1]
+        metadata['name'][/-(.*)/, 1]
       end
 
       # @api private

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

@@ -12,24 +12,15 @@ module Puppet::ModuleTool::Errors
     end
 
     def multiline
-      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
+      message = []
+      message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @module_name, version: @requested_version }
+      message << _("  Module '%{module_name}' (%{installed_version}) is already installed") % { module_name: @module_name, installed_version: @installed_version }
+      message << _("    Installed module has had changes made locally") unless @local_changes.empty?
+      #TRANSLATORS `puppet module upgrade` is a command line and should not be translated
+      message << _("    Use `puppet module upgrade` to install a different version")
+      #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+      message << _("    Use `puppet module install --force` to re-install only this module")
+      message.join("\n")
     end
   end
 
@@ -42,11 +33,11 @@ Could not install module '%{module_name}' (%{requested_version})
     end
 
     def multiline
-      _(<<-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
+      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")
     end
   end
 
@@ -59,13 +50,12 @@ MSG
     end
 
     def multiline
-      # 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
-  mkdir -p '%{dir}'
-      MSG
+      message = []
+      message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: @requested_version }
+      message << _("  Path '%{directory}' exists but is not a directory.") % { directory: @directory }
+      #TRANSLATORS "mkdir -p '%{directory}'" is a command line example and should not be translated
+      message << _("  A potential solution is to rename the path and then \"mkdir -p '%{directory}'\"") % { directory: @directory }
+      message.join("\n")
     end
   end
 
@@ -78,12 +68,11 @@ Could not install module '%{module_name}' (%{version})
     end
 
     def multiline
-      _(<<-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
-  parent directories.
-      MSG
+      message = []
+      message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: @requested_version }
+      message << _("  Permission is denied when trying to create directory '%{directory}'.")  % { directory: @directory }
+      message << _('  A potential solution is to check the ownership and permissions of parent directories.')
+      message.join("\n")
     end
   end
 
@@ -95,11 +84,10 @@ Could not install module '%{module_name}' (%{version})
     end
 
     def multiline
-      _(<<-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}.
-      MSG
+      message = []
+      message << _('Could not install package with an invalid path.')
+      message << _('  Package attempted to install file into %{path} under %{directory}.') % { path: @entry_path.inspect, directory: @directory.inspect }
+      message.join("\n")
     end
   end
 end

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 }
       #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
+      message << _("    Use `puppet module %{action} --ignore-dependencies` to %{action} only this module") % { action: @action }
+      message.join("\n")
     end
   end
 
@@ -37,18 +37,15 @@ Could not %{action} module '%{module_name}' (%{version})
     end
 
     def multiline
+      message = []
+      message << _("Could not %{action} '%{module_name}' (%{version})") % { action: @action, module_name: @module_name, version: vstring }
       if @requested_version == :latest
-        _(<<-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
+        message << _("  No releases are available from %{source}") % { source: @source }
+        message << _("    Does '%{module_name}' have at least one published release?") % { module_name: @module_name }
       else
-        _(<<-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
+        message << _("  No releases matching '%{requested_version}' are available from %{source}") % { requested_version: @requested_version, source: @source }
       end
+      message.join("\n")
     end
   end
 
@@ -63,49 +60,27 @@ Could not %{action} '%{module_name}' (%{version})
     end
 
     def multiline
+      message = []
+      message << _("Could not install module '%{module_name}' (%{version})") % { module_name: @requested_module, version: @requested_version }
+
       if @dependency
-        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
+        message << _("  Dependency '%{name}' (%{version}) would overwrite %{directory}") % { name: @dependency[:name], version: v(@dependency[:version]), directory: @directory }
+      else
+        message << _("  Installation would overwrite %{directory}") % { directory: @directory }
+      end
+
+      if @metadata
+        message << _("    Currently, '%{current_name}' (%{current_version}) is installed to that directory") % { current_name: @metadata["name"], current_version: v(@metadata["version"]) }
+      end
 
+      if @dependency
+        #TRANSLATORS `puppet module install --ignore-dependencies` is a command line and should not be translated
+        message << _("    Use `puppet module install --ignore-dependencies` to install only this module")
       else
-        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
+        #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+        message << _("    Use `puppet module install --force` to install this module anyway")
       end
+      message.join("\n")
     end
   end
 
@@ -121,33 +96,19 @@ Could not install module '%{module_name}' (%{requested_version})
     end
 
     def multiline
+      dependency_list = []
+      dependency_list << _("You specified '%{name}' (%{version})") % { name: @source.first[:name], version: v(@requested_version) }
       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")
-
-      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
+        _("which depends on '%{name}' (%{version})") % { name: m[:name], version: v(m[:version]) }
       end
+      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 << dependency_list.map {|s| "    #{s}".join(",\n")}
+      #TRANSLATORS `puppet module install --force` is a command line and should not be translated
+      message << _("    Use `puppet module install --force` to install this module anyway")
+      message.join("\n")
     end
   end
 
@@ -160,41 +121,16 @@ Could not install module '%{requested_module_name}' (%{version})
     end
 
     def multiline
-      suggestion_list = @suggestions.map do |suggestion|
+      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|
+        #TRANSLATORS `puppet module %{action} %{suggestion}` is a command line and should not be translated
         _("    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
+      #TRANSLATORS `puppet module install` is a command line and should not be translated
+      message << _("    Use `puppet module install` to install this module") if @action == :upgrade
+      message.join("\n")
     end
   end
 
@@ -208,27 +144,16 @@ Could not %{action} module '%{module_name}'
     end
 
     def multiline
-      module_path_list = @modules.map do |mod|
+      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|
         #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
+      #TRANSLATORS `--modulepath` is command line option and should not be translated
+      message << _("    Use the `--modulepath` option to limit the search to specific directories")
+      message.join("\n")
     end
   end
 
@@ -242,12 +167,12 @@ Could not %{action} module '%{module_name}'
     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")
       #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
+      message << _("    Use `puppet module %{action} --ignore-changes` to %{action} this module anyway") % { action: @action }
+      message.join("\n")
     end
   end
 
@@ -260,11 +185,11 @@ Could not %{action} module '%{module_name}' (%{version})
     end
 
     def multiline
-      _(<<-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
+      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")
     end
   end
 end