puppet 4.10.12 → 5.0.0

data/lib/puppet/indirector/resource/ral.rb

@@ -58,6 +58,6 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
   end
 
   def type( request )
-    Puppet::Type.type(type_name(request)) or raise Puppet::Error, "Could not find type #{type_name(request)}"
+    Puppet::Type.type(type_name(request)) or raise Puppet::Error, _("Could not find type %{request_type}") % { request_type: type_name(request) }
   end
 end

data/lib/puppet/indirector/resource/validator.rb

@@ -2,7 +2,7 @@ module Puppet::Resource::Validator
   def validate_key(request)
     type, title = request.key.split('/', 2)
     unless type.downcase == request.instance.type.downcase and title == request.instance.title
-      raise Puppet::Indirector::ValidationError, "Resource instance does not match request key"
+      raise Puppet::Indirector::ValidationError, _("Resource instance does not match request key")
     end
   end
 end

data/lib/puppet/indirector/rest.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'uri'
 require 'json'
+require 'semantic_puppet'
 
 require 'puppet/network/http'
 require 'puppet/network/http_pool'
@@ -10,6 +11,10 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   include Puppet::Network::HTTP::Compression.module
 
   IndirectedRoutes = Puppet::Network::HTTP::API::IndirectedRoutes
+  EXCLUDED_FORMATS = [:yaml, :b64_zlib_yaml, :dot]
+
+  # puppet major version where JSON is enabled by default
+  MAJOR_VERSION_JSON_DEFAULT = 5
 
   class << self
     attr_reader :server_setting, :port_setting
@@ -101,11 +106,10 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   # Provide appropriate headers.
   def headers
     # yaml is not allowed on the network
-    network_formats = model.supported_formats.reject do |format|
-      [:yaml, :b64_zlib_yaml].include?(format)
-    end
+    network_formats = model.supported_formats - EXCLUDED_FORMATS
+    mime_types = network_formats.map { |f| model.get_format(f).mime }
     common_headers = {
-      "Accept"                                     => network_formats.join(", "),
+      "Accept"                                     => mime_types.join(', '),
       Puppet::Network::HTTP::HEADER_PUPPET_VERSION => Puppet.version
     }
 
@@ -180,7 +184,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
       # that makes a user aware of the reason for the failure.
       #
       content_type, body = parse_response(response)
-      msg = "Find #{elide(uri_with_query_string, 100)} resulted in 404 with the message: #{body}"
+      msg = _("Find %{uri} resulted in 404 with the message: %{body}") % { uri: elide(uri_with_query_string, 100), body: body }
       raise Puppet::Error, msg
     else
       nil
@@ -213,7 +217,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def destroy(request)
-    raise ArgumentError, "DELETE does not accept options" unless request.options.empty?
+    raise ArgumentError, _("DELETE does not accept options") unless request.options.empty?
 
     response = do_request(request) do |req|
       http_delete(req, IndirectedRoutes.request_to_uri(req), headers)
@@ -228,7 +232,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def save(request)
-    raise ArgumentError, "PUT does not accept options" unless request.options.empty?
+    raise ArgumentError, _("PUT does not accept options") unless request.options.empty?
 
     response = do_request(request) do |req|
       http_put(req, IndirectedRoutes.request_to_uri(req), req.instance.render, headers.merge({ "Content-Type" => req.instance.mime }))
@@ -249,7 +253,21 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   # to request.do_request from here, thus if we change what we pass or how we
   # get it, we only need to change it here.
   def do_request(request)
-    request.do_request(self.class.srv_service, self.class.server, self.class.port) { |req| yield(req) }
+    response = request.do_request(self.class.srv_service, self.class.server, self.class.port) { |req| yield(req) }
+
+    handle_response(request, response) if response
+
+    response
+  end
+
+  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'
+    end
   end
 
   def validate_key(request)
@@ -288,7 +306,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
       returned_message = uncompress_body(response)
     end
 
-    message = "Error #{response.code} on SERVER: #{returned_message}"
+    message = _("Error %{code} on SERVER: %{returned_message}") % { code: response.code, returned_message: returned_message }
     Net::HTTPError.new(message, response)
   end
 
@@ -300,7 +318,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
       [ response['content-type'].gsub(/\s*;.*$/,''),
         body = uncompress_body(response) ]
     else
-      raise "No content type in http response; cannot parse"
+      raise _("No content type in http response; cannot parse")
     end
   end
 

data/lib/puppet/indirector/ssl_file.rb

@@ -54,8 +54,8 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
 
   def path(name)
     if name =~ Puppet::Indirector::BadNameRegexp then
-      Puppet.crit("directory traversal detected in #{self.class}: #{name.inspect}")
-      raise ArgumentError, "invalid key"
+      Puppet.crit(_("directory traversal detected in %{indirection}: %{name}") % { indirection: self.class, name: name.inspect })
+      raise ArgumentError, _("invalid key")
     end
 
     if ca?(name) and ca_location
@@ -72,11 +72,11 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
     path = Puppet::FileSystem.pathname(path(request.key))
     return false unless Puppet::FileSystem.exist?(path)
 
-    Puppet.notice "Removing file #{model} #{request.key} at '#{path}'"
+    Puppet.notice _("Removing file %{model} %{request} at '%{path}'") % { model: model, request: request.key, path: path }
     begin
       Puppet::FileSystem.unlink(path)
     rescue => detail
-      raise Puppet::Error, "Could not remove #{request.key}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not remove %{request}: %{detail}") % { request: request.key, detail: detail }, detail.backtrace
     end
   end
 
@@ -92,8 +92,8 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
     path = path(request.key)
     dir = File.dirname(path)
 
-    raise Puppet::Error.new("Cannot save #{request.key}; parent directory #{dir} does not exist") unless FileTest.directory?(dir)
-    raise Puppet::Error.new("Cannot save #{request.key}; parent directory #{dir} is not writable") unless FileTest.writable?(dir)
+    raise Puppet::Error.new(_("Cannot save %{request}; parent directory %{dir} does not exist") % { request: request.key, dir: dir }) unless FileTest.directory?(dir)
+    raise Puppet::Error.new(_("Cannot save %{request}; parent directory %{dir} is not writable") % { request: request.key, dir: dir }) unless FileTest.writable?(dir)
 
     write(request.key, path) { |f| f.print request.instance.to_s }
   end
@@ -142,7 +142,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
     dir, short = File.split(file)
     return nil unless Puppet::FileSystem.exist?(dir)
 
-    raise ArgumentError, "Tried to fix SSL files to a file containing uppercase" unless short.downcase == short
+    raise ArgumentError, _("Tried to fix SSL files to a file containing uppercase") unless short.downcase == short
     real_file = Dir.entries(dir).reject { |f| f =~ /^\./ }.find do |other|
       other.downcase == short
     end
@@ -151,7 +151,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
 
     full_file = File.join(dir, real_file)
 
-    Puppet.deprecation_warning "Automatic downcasing and renaming of ssl files is deprecated; please request the file using its correct case: #{full_file}"
+    Puppet.deprecation_warning _("Automatic downcasing and renaming of ssl files is deprecated; please request the file using its correct case: %{full_file}") % { full_file: full_file }
     File.rename(full_file, file)
 
     file
@@ -187,7 +187,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
       begin
         Puppet.settings.setting(setting).open_file(path, 'w:ASCII') { |f| yield f }
       rescue => detail
-        raise Puppet::Error, "Could not write #{path} to #{setting}: #{detail}", detail.backtrace
+        raise Puppet::Error, _("Could not write %{path} to %{setting}: %{detail}") % { path: path, setting: setting, detail: detail }, detail.backtrace
       end
     else
       raise Puppet::DevError, "You must provide a setting to determine where the files are stored"

data/lib/puppet/indirector/terminus.rb

@@ -32,7 +32,7 @@ class Puppet::Indirector::Terminus
       elsif ind = Puppet::Indirector::Indirection.instance(name)
         @indirection = ind
       else
-        raise ArgumentError, "Could not find indirection instance #{name} for #{self.name}"
+        raise ArgumentError, _("Could not find indirection instance %{name} for %{terminus}") % { name: name, terminus: self.name }
       end
     end
 
@@ -157,13 +157,13 @@ class Puppet::Indirector::Terminus
 
   def validate_key(request)
     unless request.key == request.instance.name
-      raise Puppet::Indirector::ValidationError, "Instance name #{request.instance.name.inspect} does not match requested key #{request.key.inspect}"
+      raise Puppet::Indirector::ValidationError, _("Instance name %{name} does not match requested key %{key}") % { name: request.instance.name.inspect, key: request.key.inspect }
     end
   end
 
   def validate_model(request)
     unless model === request.instance
-      raise Puppet::Indirector::ValidationError, "Invalid instance type #{request.instance.class.inspect}, expected #{model.inspect}"
+      raise Puppet::Indirector::ValidationError, _("Invalid instance type %{klass}, expected %{model_type}") % { klass: request.instance.class.inspect, model_type: model.inspect }
     end
   end
 end

data/lib/puppet/indirector/yaml.rb

@@ -11,13 +11,13 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     begin
       return fix(Puppet::Util::Yaml.load_file(file))
     rescue Puppet::Util::Yaml::YamlLoadError => detail
-      raise Puppet::Error, "Could not parse YAML data for #{indirection.name} #{request.key}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not parse YAML data for %{indirection} %{request}: %{detail}") % { indirection: indirection.name, request: request.key, detail: detail }, detail.backtrace
     end
   end
 
   # Convert our object to YAML and store it to the disk.
   def save(request)
-    raise ArgumentError.new("You can only save objects that respond to :name") unless request.instance.respond_to?(:name)
+    raise ArgumentError.new(_("You can only save objects that respond to :name")) unless request.instance.respond_to?(:name)
 
     file = path(request.key)
 
@@ -29,15 +29,15 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
     begin
       Puppet::Util::Yaml.dump(request.instance, file)
     rescue TypeError => detail
-      Puppet.err "Could not save #{self.name} #{request.key}: #{detail}"
+      Puppet.err _("Could not save %{indirection} %{request}: %{detail}") % { indirection: self.name, request: request.key, detail: detail }
     end
   end
 
   # Return the path to a given node's file.
   def path(name,ext='.yaml')
     if name =~ Puppet::Indirector::BadNameRegexp then
-      Puppet.crit("directory traversal detected in #{self.class}: #{name.inspect}")
-      raise ArgumentError, "invalid key"
+      Puppet.crit(_("directory traversal detected in %{indirection}: %{name}") % { indirection: self.class, name: name.inspect })
+      raise ArgumentError, _("invalid key")
     end
 
     base = Puppet.run_mode.master? ? Puppet[:yamldir] : Puppet[:clientyamldir]

data/lib/puppet/info_service/class_information_service.rb

@@ -15,7 +15,7 @@ class Puppet::InfoService::ClassInformationService
     # feature flags in effect.
 
     unless env_file_hash.is_a?(Hash)
-      raise ArgumentError, 'Given argument must be a Hash'
+      raise ArgumentError, _('Given argument must be a Hash')
     end
 
     result = {}
@@ -52,7 +52,7 @@ class Puppet::InfoService::ClassInformationService
   end
 
   def parse_file(f)
-    return {:error => "The file #{f} does not exist"} unless Puppet::FileSystem.exist?(f)
+    return {:error => _("The file %{f} does not exist") % { f: f }} unless Puppet::FileSystem.exist?(f)
 
     begin
       parse_result = @parser.parse_file(f)
@@ -105,7 +105,6 @@ class Puppet::InfoService::ClassInformationService
 
   # Extracts the source for the expression
   def extract_value_source(value_expr)
-    position = Puppet::Pops::Adapters::SourcePosAdapter.adapt(value_expr)
-    position.extract_tree_text
+    value_expr.locator.extract_tree_text(value_expr)
   end
-end
+end

data/lib/puppet/interface.rb

@@ -1,7 +1,6 @@
 require 'puppet'
 require 'puppet/util/autoload'
 require 'prettyprint'
-require 'semver'
 
 # @api public
 class Puppet::Interface
@@ -138,7 +137,7 @@ class Puppet::Interface
   attr_reader :name
 
   # The version of the face
-  # @return [SemVer]
+  # @return [SemanticPuppet::Version]
   attr_reader :version
 
   # The autoloader instance for the face
@@ -154,10 +153,7 @@ class Puppet::Interface
     end
 
     @name    = Puppet::Interface::FaceCollection.underscorize(name)
-
-    # SemVer is deprecated but in 4.x we must use it here (the attr_reader is public api). The
-    # extra boolean argument suppresses the deprecation warning.
-    @version = SemVer.new(version, true)
+    @version = SemanticPuppet::Version.parse(version)
 
     # The few bits of documentation we actually demand.  The default license
     # is a favour to our end users; if you happen to get that in a core face
@@ -182,7 +178,6 @@ class Puppet::Interface
   def to_s
     "Puppet::Face[#{name.inspect}, #{version.inspect}]"
   end
-  alias_method :inspect, :to_s
 
   # @return [void]
   def deprecate

data/lib/puppet/interface/face_collection.rb

@@ -41,10 +41,15 @@ module Puppet::Interface::FaceCollection
     return @faces[name][:current] if pattern == :current
 
     versions = @faces[name].keys - [ :current ]
-    found    = SemVer.find_matching(pattern, versions)
+    range = pattern.is_a?(SemanticPuppet::Version) ? SemanticPuppet::VersionRange.new(pattern, pattern) : SemanticPuppet::VersionRange.parse(pattern)
+    found = find_matching(range, versions)
     return @faces[name][found]
   end
 
+  def self.find_matching(range, versions)
+    versions.select { |v| range === v }.sort.last
+  end
+
   # try to load the face, and return it.
   def self.load_face(name, version)
     # We always load the current version file; the common case is that we have

data/lib/puppet/module.rb

@@ -1,5 +1,4 @@
 require 'puppet/util/logging'
-require 'semver'
 require 'json'
 
 # Support for modules
@@ -59,26 +58,16 @@ class Puppet::Module
   attr_accessor :dependencies, :forge_name
   attr_accessor :source, :author, :version, :license, :summary, :description, :project_page
 
-  def initialize(name, path, environment)
+  def initialize(name, path, environment, strict_semver = true)
     @name = name
     @path = path
+    @strict_semver = strict_semver
     @environment = environment
 
     assert_validity
     load_metadata
 
     @absolute_path_to_manifests = Puppet::FileSystem::PathPattern.absolute(manifests)
-
-    # i18n initialization for modules
-    if Puppet::GETTEXT_AVAILABLE
-      begin
-        initialize_i18n
-      rescue Exception => e
-        Puppet.warning _("GettextSetup initialization for %{module_name} failed with: %{error_message}") % { module_name: name, error_message: e.message }
-      end
-    else
-      Puppet.warn_once("gettext_unavailable", "gettext_unavailable", "GettextSetup is not available, skipping GettextSetup initialization for modules.")
-    end
   end
 
   # @deprecated The puppetversion module metadata field is no longer used.
@@ -107,7 +96,7 @@ class Puppet::Module
   FILETYPES.each do |type, location|
     # A boolean method to let external callers determine if
     # we have files of a given type.
-    define_method(type +'?') do
+    define_method(type + '?') do
       type_subpath = subpath(location)
       unless Puppet::FileSystem.exist?(type_subpath)
         Puppet.debug("No #{type} found in subpath '#{type_subpath}' " +
@@ -157,7 +146,9 @@ class Puppet::Module
   rescue JSON::JSONError => e
     msg = "#{name} has an invalid and unparsable metadata.json file. The parse error: #{e.message}"
     case Puppet[:strict]
-    when :off, :warning
+    when :off
+      Puppet.debug(msg)
+    when :warning
       Puppet.warning(msg)
     when :error
       raise FaultyMetadata, msg
@@ -337,9 +328,8 @@ class Puppet::Module
 
       if version_string
         begin
-          # Suppress deprecation warnings from SemVer in 4.9. In 5.0, this will be SemanticPuppet instead
-          required_version_semver_range = SemVer[version_string, true]
-          actual_version_semver = SemVer.new(dep_mod.version, true)
+          required_version_semver_range = SemanticPuppet::VersionRange.parse(version_string, @strict_semver)
+          actual_version_semver = SemanticPuppet::Version.parse(dep_mod.version)
         rescue ArgumentError
           error_details[:reason] = :non_semantic_version
           unmet_dependencies << error_details
@@ -364,27 +354,12 @@ class Puppet::Module
     self.environment == other.environment
   end
 
-  def initialize_i18n
-    module_name = @forge_name.gsub("/","-") if @forge_name
-    return if module_name.nil? || i18n_initialized?(module_name)
-
-    locales_path = File.absolute_path('locales', path)
-
-    begin
-      GettextSetup.initialize(locales_path)
-      Puppet.debug "#{module_name} initialized for i18n: #{GettextSetup.translation_repositories[module_name]}"
-    rescue
-      config_path = File.absolute_path('config.yaml', locales_path)
-      Puppet.debug "Could not find locales configuration file for #{module_name} at #{config_path}. Skipping i18n initialization."
-    end
+  def strict_semver?
+    @strict_semver
   end
 
   private
 
-  def i18n_initialized?(module_name)
-    GettextSetup.translation_repositories.has_key? module_name
-  end
-
   def wanted_manifests_from(pattern)
     begin
       extended = File.extname(pattern).empty? ? "#{pattern}.pp" : pattern

data/lib/puppet/module_tool.rb

@@ -34,7 +34,7 @@ module Puppet
       if matcher = full_module_name.match(FULL_MODULE_NAME_PATTERN)
         return matcher.captures
       else
-        raise ArgumentError, "Not a valid full name: #{full_module_name}"
+        raise ArgumentError, _("Not a valid full name: %{full_module_name}") % { full_module_name: full_module_name }
       end
     end
 
@@ -130,6 +130,9 @@ module Puppet
 
       # Note: environment will have expanded the path
       options[:target_dir] = face_environment.full_modulepath.first
+
+      # Default false to retain backward compatibility with SemanticPuppet 0.1.4
+      options[:strict_semver] = false
     end
 
     # Given a hash of options, we should discover or create a
@@ -162,15 +165,16 @@ module Puppet
     # @param where [String] a description of the thing we're parsing the
     #        dependency expression for
     # @param dep [Hash] the dependency description to parse
+    # @param strict_semver [Boolean] set to `false` to relax range semantics to include pre-releases
     # @return [Array(String, SemanticPuppet::VersionRange, String)] a tuple of the
     #         dependent module's name, the version range dependency, and the
     #         unparsed range expression.
-    def self.parse_module_dependency(where, dep)
+    def self.parse_module_dependency(where, dep, strict_semver = true)
       dep_name = dep['name'].tr('/', '-')
       range = dep['version_requirement'] || '>= 0.0.0'
 
       begin
-        parsed_range = SemanticPuppet::VersionRange.parse(range)
+        parsed_range = SemanticPuppet::VersionRange.parse(range, strict_semver)
       rescue ArgumentError => e
         Puppet.debug "Error in #{where} parsing dependency #{dep_name} (#{e.message}); using empty range."
         parsed_range = SemanticPuppet::VersionRange::EMPTY_RANGE