puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

data/lib/puppet/module_tool/applications/application.rb

@@ -1,5 +1,4 @@
 require 'net/http'
-require 'semver'
 require 'json'
 require 'puppet/util/colors'
 
@@ -37,11 +36,11 @@ module Puppet::ModuleTool
         @metadata = Puppet::ModuleTool::Metadata.new
 
         unless @path
-          raise ArgumentError, "Could not determine module path"
+          raise ArgumentError, _("Could not determine module path")
         end
 
         if require_metadata && !Puppet::ModuleTool.is_module_root?(@path)
-          raise ArgumentError, "Unable to find metadata.json in module root at #{@path} See https://docs.puppet.com/puppet/latest/reference/modules_publishing.html for required file format."
+          raise ArgumentError, _("Unable to find metadata.json in module root at %{path} See https://docs.puppet.com/puppet/latest/reference/modules_publishing.html for required file format.") % { path: @path }
         end
 
         metadata_path   = File.join(@path, 'metadata.json')
@@ -51,13 +50,13 @@ module Puppet::ModuleTool
             begin
               @metadata.update(JSON.load(f))
             rescue JSON::ParserError => ex
-              raise ArgumentError, "Could not parse JSON #{metadata_path}", ex.backtrace
+              raise ArgumentError, _("Could not parse JSON %{metadata_path}") % { metadata_path: metadata_path }, ex.backtrace
             end
           end
         end
 
         if File.file?(File.join(@path, 'Modulefile'))
-          Puppet.warning "A Modulefile was found in the root directory of the module. This file will be ignored and can safely be removed."
+          Puppet.warning _("A Modulefile was found in the root directory of the module. This file will be ignored and can safely be removed.")
         end
 
         return @metadata
@@ -69,14 +68,14 @@ module Puppet::ModuleTool
       end
 
       def parse_filename(filename)
-        if match = /^((.*?)-(.*?))-(\d+\.\d+\.\d+.*?)$/.match(File.basename(filename,'.tar.gz'))
+        if match = /^((.*?)-(.*?))-(\d+\.\d+\.\d+.*?)$/.match(File.basename(filename, '.tar.gz'))
           module_name, author, shortname, version = match.captures
         else
-          raise ArgumentError, "Could not parse filename to obtain the username, module name and version.  (#{@release_name})"
+          raise ArgumentError, _("Could not parse filename to obtain the username, module name and version.  (%{release_name})") % { release_name: @release_name }
         end
 
-        unless SemVer.valid?(version)
-          raise ArgumentError, "Invalid version format: #{version} (Semantic Versions are acceptable: http://semver.org)"
+        unless SemanticPuppet::Version.valid?(version)
+          raise ArgumentError, _("Invalid version format: %{version} (Semantic Versions are acceptable: http://semver.org)") % { version: version }
         end
 
         return {

data/lib/puppet/module_tool/applications/builder.rb

@@ -18,7 +18,7 @@ module Puppet::ModuleTool
         create_directory
         copy_contents
         write_json
-        Puppet.notice "Building #{@path} for release"
+        Puppet.notice _("Building %{path} for release") % { path: @path }
         pack
         relative = Pathname.new(archive_file).relative_path_from(Pathname.new(File.expand_path(Dir.pwd)))
 
@@ -114,10 +114,10 @@ module Puppet::ModuleTool
           symlinks.each do |s|
             s = Pathname.new s
             mpath = Pathname.new @path
-            Puppet.warning "Symlinks in modules are unsupported. Please investigate symlink #{s.relative_path_from mpath} -> #{s.realpath.relative_path_from mpath}."
+            Puppet.warning _("Symlinks in modules are unsupported. Please investigate symlink %{from} -> %{to}.") % { from: s.relative_path_from(mpath), to: s.realpath.relative_path_from(mpath) }
           end
 
-          raise Puppet::ModuleTool::Errors::ModuleToolError, "Found symlinks. Symlinks in modules are not allowed, please remove them."
+          raise Puppet::ModuleTool::Errors::ModuleToolError, _("Found symlinks. Symlinks in modules are not allowed, please remove them.")
         end
       end
 
@@ -125,7 +125,7 @@ module Puppet::ModuleTool
         metadata_path = File.join(build_path, 'metadata.json')
 
         if metadata.to_hash.include? 'checksums'
-          Puppet.warning "A 'checksums' field was found in metadata.json. This field will be ignored and can safely be removed."
+          Puppet.warning _("A 'checksums' field was found in metadata.json. This field will be ignored and can safely be removed.")
         end
 
         # TODO: This may necessarily change the order in which the metadata.json
@@ -135,9 +135,8 @@ module Puppet::ModuleTool
           f.write(metadata.to_json)
         end
 
-        # PSON.pretty_generate is a BINARY string
         Puppet::FileSystem.open(File.join(build_path, 'checksums.json'), nil, 'wb') do |f|
-          f.write(PSON.pretty_generate(Checksums.new(build_path)))
+          f.write(JSON.pretty_generate(Checksums.new(build_path)))
         end
       end
 

data/lib/puppet/module_tool/applications/checksummer.rb

@@ -44,9 +44,9 @@ module Puppet::ModuleTool
         elsif metadata_file.exist?
           # Check metadata.json too; legacy modules store their checksums there.
           JSON.parse(metadata_file.read)['checksums'] or
-          raise ArgumentError, "No file containing checksums found."
+          raise ArgumentError, _("No file containing checksums found.")
         else
-          raise ArgumentError, "No file containing checksums found."
+          raise ArgumentError, _("No file containing checksums found.")
         end
       end
 

data/lib/puppet/module_tool/applications/installer.rb

@@ -25,6 +25,7 @@ module Puppet::ModuleTool
         @ignore_dependencies = forced? || options[:ignore_dependencies]
         @name                = name
         @install_dir         = install_dir
+        @strict_semver       = !!options[:strict_semver]
 
         Puppet::Forge::Cache.clean
 
@@ -59,7 +60,7 @@ module Puppet::ModuleTool
         begin
           if installed_module = installed_modules[name]
             unless forced?
-              if SemanticPuppet::VersionRange.parse(version).include? installed_module.version
+              if SemanticPuppet::VersionRange.parse(version, @strict_semver).include? installed_module.version
                 results[:result] = :noop
                 results[:version] = installed_module.version
                 return results
@@ -78,7 +79,7 @@ module Puppet::ModuleTool
           results[:install_dir] = @install_dir.target
 
           unless @local_tarball && @ignore_dependencies
-            Puppet.notice "Downloading from #{module_repository.host} ..."
+            Puppet.notice _("Downloading from %{host} ...") % { host: module_repository.host }
           end
 
           if @ignore_dependencies
@@ -103,7 +104,7 @@ module Puppet::ModuleTool
               # locking it to upgrades within the same major version.
               installed_range = ">=#{version} #{version.major}.x"
               graph.add_constraint('installed', mod, installed_range) do |node|
-                SemanticPuppet::VersionRange.parse(installed_range).include? node.version
+                SemanticPuppet::VersionRange.parse(installed_range, @strict_semver).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
@@ -111,7 +112,7 @@ module Puppet::ModuleTool
 
                 range = dep['version_requirement']
                 graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
-                  SemanticPuppet::VersionRange.parse(range).include? node.version
+                  SemanticPuppet::VersionRange.parse(range, @strict_semver).include? node.version
                 end
               end
             end
@@ -124,7 +125,7 @@ module Puppet::ModuleTool
           end
 
           begin
-            Puppet.info "Resolving dependencies ..."
+            Puppet.info _("Resolving dependencies ...")
             releases = SemanticPuppet::Dependency.resolve(graph)
           rescue SemanticPuppet::Dependency::UnsatisfiableGraph
             raise NoVersionsSatisfyError, results.merge(:requested_name => name)
@@ -153,10 +154,10 @@ module Puppet::ModuleTool
             end
           end
 
-          Puppet.info "Preparing to install ..."
+          Puppet.info _("Preparing to install ...")
           releases.each { |release| release.prepare }
 
-          Puppet.notice 'Installing -- do not interrupt ...'
+          Puppet.notice _('Installing -- do not interrupt ...')
           releases.each do |release|
             installed = installed_modules[release.name]
             if forced? || installed.nil?
@@ -190,7 +191,7 @@ module Puppet::ModuleTool
 
       def local_tarball_source
         @tarball_source ||= begin
-          Puppet::ModuleTool::LocalTarball.new(@name)
+          Puppet::ModuleTool::LocalTarball.new(@name, @strict_semver)
         rescue Puppet::Module::Error => e
           raise InvalidModuleError.new(@name, :action => @action, :error  => e)
         end
@@ -205,7 +206,7 @@ module Puppet::ModuleTool
       end
 
       def build_single_module_graph(name, version)
-        range = SemanticPuppet::VersionRange.parse(version)
+        range = SemanticPuppet::VersionRange.parse(version, @strict_semver)
         graph = SemanticPuppet::Dependency::Graph.new(name => range)
         releases = SemanticPuppet::Dependency.fetch_releases(name)
         releases.each { |release| release.dependencies.clear }
@@ -258,7 +259,7 @@ module Puppet::ModuleTool
           @remote = { "#{@module_name}@#{@version}" => { } }
           @versions = {
             @module_name => [
-              { :vstring => @version, :semver => SemVer.new(@version) }
+              { :vstring => @version, :semver => SemanticPuppet::Version.parse(@version) }
             ]
           }
         else

data/lib/puppet/module_tool/applications/searcher.rb

@@ -12,7 +12,7 @@ module Puppet::ModuleTool
       def run
         results = {}
         begin
-          Puppet.notice "Searching #{@forge.host} ..."
+          Puppet.notice _("Searching %{host} ...") % { host: @forge.host }
           results[:answers] = @forge.search(@term)
           results[:result] = :success
         rescue ForgeError => e

data/lib/puppet/module_tool/applications/uninstaller.rb

@@ -12,6 +12,7 @@ module Puppet::ModuleTool
         @suggestions = []
         @environment = options[:environment_instance]
         @ignore_changes = options[:force] || options[:ignore_changes]
+        @strict_semver  = !!options[:strict_semver]
       end
 
       def run
@@ -57,7 +58,7 @@ module Puppet::ModuleTool
               :path    => mod.modulepath,
             }
             if @options[:version] && mod.version
-              next unless SemVer[@options[:version]].include?(SemVer.new(mod.version))
+              next unless SemanticPuppet::VersionRange.parse(@options[:version], @strict_semver).include?(SemanticPuppet::Version.parse(mod.version))
             end
             @installed << mod
           elsif mod_name =~ /#{@name}/

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

@@ -46,7 +46,7 @@ module Puppet::ModuleTool
         tmpdirpath = Pathname.new tmpdir
 
         symlinks.each do |s|
-          Puppet.warning "Symlinks in modules are unsupported. Please investigate symlink #{s.relative_path_from tmpdirpath}->#{Puppet::FileSystem.readlink(s)}."
+          Puppet.warning _("Symlinks in modules are unsupported. Please investigate symlink %{from}->%{to}.") % { from: s.relative_path_from(tmpdirpath), to: Puppet::FileSystem.readlink(s) }
         end
       end
 
@@ -55,7 +55,7 @@ module Puppet::ModuleTool
         begin
           Puppet::ModuleTool::Tar.instance.unpack(@filename.to_s, tmpdir, [@module_path.stat.uid, @module_path.stat.gid].join(':'))
         rescue Puppet::ExecutionFailure => e
-          raise RuntimeError, "Could not extract contents of module archive: #{e.message}"
+          raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
         end
       end
 
@@ -69,7 +69,7 @@ module Puppet::ModuleTool
         if metadata_file
           @root_dir = Pathname.new(metadata_file).dirname
         else
-          raise "No valid metadata.json found!"
+          raise _("No valid metadata.json found!")
         end
       end
 

data/lib/puppet/module_tool/applications/upgrader.rb

@@ -20,6 +20,7 @@ module Puppet::ModuleTool
         @name                = name
         @ignore_changes      = forced? || options[:ignore_changes]
         @ignore_dependencies = forced? || options[:ignore_dependencies]
+        @strict_semver       = !!options[:strict_semver]
 
         SemanticPuppet::Dependency.add_source(installed_modules_source)
         SemanticPuppet::Dependency.add_source(module_repository)
@@ -70,7 +71,7 @@ module Puppet::ModuleTool
           dir = Pathname.new(mod.modulepath)
 
           vstring = mod.version ? "v#{mod.version}" : '???'
-          Puppet.notice "Found '#{name}' (#{colorize(:cyan, vstring)}) in #{dir} ..."
+          Puppet.notice _("Found '%{name}' (%{version}) in %{dir} ...") % { name: name, version: colorize(:cyan, vstring), dir: dir }
           unless @ignore_changes
             changes = Checksummer.run(mod.path) rescue []
             if mod.has_metadata? && !changes.empty?
@@ -90,13 +91,13 @@ module Puppet::ModuleTool
           if available_versions.empty?
             raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
           elsif results[:requested_version] != :latest
-            requested = SemanticPuppet::VersionRange.parse(results[:requested_version])
+            requested = SemanticPuppet::VersionRange.parse(results[:requested_version], @strict_semver)
             unless available_versions.any? {|m| requested.include? m.version}
               raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
             end
           end
 
-          Puppet.notice "Downloading from #{module_repository.host} ..."
+          Puppet.notice _("Downloading from %{host} ...") % { host: module_repository.host }
           if @ignore_dependencies
             graph = build_single_module_graph(name, version)
           else
@@ -119,7 +120,7 @@ module Puppet::ModuleTool
               # module, locking it to upgrades within the same major version.
               installed_range = ">=#{version} #{version.major}.x"
               graph.add_constraint('installed', installed_module, installed_range) do |node|
-                SemanticPuppet::VersionRange.parse(installed_range).include? node.version
+                SemanticPuppet::VersionRange.parse(installed_range, @strict_semver).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
@@ -127,14 +128,14 @@ module Puppet::ModuleTool
 
                 range = dep['version_requirement']
                 graph.add_constraint("#{installed_module} constraint", dep_name, range) do |node|
-                  SemanticPuppet::VersionRange.parse(range).include? node.version
+                  SemanticPuppet::VersionRange.parse(range, @strict_semver).include? node.version
                 end
               end
             end
           end
 
           begin
-            Puppet.info "Resolving dependencies ..."
+            Puppet.info _("Resolving dependencies ...")
             releases = SemanticPuppet::Dependency.resolve(graph)
           rescue SemanticPuppet::Dependency::UnsatisfiableGraph
             raise NoVersionsSatisfyError, results.merge(:requested_name => name)
@@ -181,10 +182,10 @@ module Puppet::ModuleTool
             end
           end
 
-          Puppet.info "Preparing to upgrade ..."
+          Puppet.info _("Preparing to upgrade ...")
           releases.each { |release| release.prepare }
 
-          Puppet.notice 'Upgrading -- do not interrupt ...'
+          Puppet.notice _('Upgrading -- do not interrupt ...')
           releases.each do |release|
             if installed = installed_modules[release.name]
               release.install(Pathname.new(installed.mod.modulepath))
@@ -227,7 +228,7 @@ module Puppet::ModuleTool
       end
 
       def build_single_module_graph(name, version)
-        range = SemanticPuppet::VersionRange.parse(version)
+        range = SemanticPuppet::VersionRange.parse(version, @strict_semver)
         graph = SemanticPuppet::Dependency::Graph.new(name => range)
         releases = SemanticPuppet::Dependency.fetch_releases(name)
         releases.each { |release| release.dependencies.clear }

data/lib/puppet/module_tool/contents_description.rb

@@ -52,7 +52,7 @@ module Puppet::ModuleTool
             end
             @data << type_hash
           else
-            Puppet.warning "Could not find/load type: #{name}"
+            Puppet.warning _("Could not find/load type: %{name}") % { name: name }
           end
         end
       end

data/lib/puppet/module_tool/dependency.rb

@@ -5,7 +5,6 @@ module Puppet::ModuleTool
 
   class Dependency
     include Puppet::Network::FormatSupport
-    alias :to_json :to_pson
 
     attr_reader :full_module_name, :username, :name, :version_requirement, :repository
 

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

@@ -8,16 +8,16 @@ module Puppet::ModuleTool::Errors
       @installed_version = v(options[:installed_version])
       @requested_version = v(options[:requested_version])
       @local_changes     = options[:local_changes]
-      super "'#{@module_name}' (#{@requested_version}) requested; '#{@module_name}' (#{@installed_version}) already installed"
+      super _("'%{module_name}' (%{version}) requested; '%{module_name}' (%{installed_version}) already installed") % { module_name: @module_name, version: @requested_version, installed_version: @installed_version }
     end
 
     def multiline
       message = []
-      message << "Could not install module '#{@module_name}' (#{@requested_version})"
-      message << "  Module '#{@module_name}' (#{@installed_version}) is already installed"
-      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 << _("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")
     end
   end
@@ -27,15 +27,15 @@ module Puppet::ModuleTool::Errors
       @requested_package = options[:requested_package]
       @source = options[:source]
 
-      super "Could not install '#{@requested_package}'; no releases are available from #{@source}"
+      super _("Could not install '%{requested_package}'; no releases are available from %{source}") % { requested_package: @requested_package, source: @source }
     end
 
     def multiline
       message = []
-      message << "Could not install '#{@requested_package}'"
+      message << _("Could not install '%{requested_package}'") % { requested_package: @requested_package }
 
-      message << "  No releases are available from #{@source}"
-      message << "    Does '#{@requested_package}' have at least one published release?"
+      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
@@ -46,15 +46,15 @@ module Puppet::ModuleTool::Errors
       @requested_module  = options[:requested_module]
       @requested_version = options[:requested_version]
       @directory         = options[:directory]
-      super("'#{@requested_module}' (#{@requested_version}) requested; Path #{@directory} is not a directory.", original)
+      super(_("'%{module_name}' (%{version}) requested; Path %{dir} is not a directory.") % { module_name: @requested_module, version: @requested_version, dir: @directory }, original)
     end
 
     def multiline
-      <<-MSG.strip
-Could not install module '#{@requested_module}' (#{@requested_version})
-  Path '#{@directory}' exists but is not a directory.
+      _(<<-MSG).strip % { 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 '#{@directory}'
+  mkdir -p '%{dir}'
       MSG
     end
   end
@@ -64,13 +64,13 @@ Could not install module '#{@requested_module}' (#{@requested_version})
       @requested_module  = options[:requested_module]
       @requested_version = options[:requested_version]
       @directory         = options[:directory]
-      super("'#{@requested_module}' (#{@requested_version}) requested; Permission is denied to create #{@directory}.", original)
+      super(_("'%{module_name}' (%{version}) requested; Permission is denied to create %{dir}.") % { module_name: @requested_module, version: @requested_version, dir: @directory }, original)
     end
 
     def multiline
-      <<-MSG.strip
-Could not install module '#{@requested_module}' (#{@requested_version})
-  Permission is denied when trying to create directory '#{@directory}'.
+      _(<<-MSG).strip % { 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
@@ -81,14 +81,14 @@ Could not install module '#{@requested_module}' (#{@requested_version})
     def initialize(options)
       @entry_path = options[:entry_path]
       @directory  = options[:directory]
-      super "Attempt to install file with an invalid path into #{@entry_path.inspect} under #{@directory.inspect}"
+      super _("Attempt to install file with an invalid path into %{path} under %{dir}") % { path: @entry_path.inspect, dir: @directory.inspect }
     end
 
     def multiline
-      <<-MSG.strip
+      _(<<-MSG).strip % { path: @entry_path.inspect, dir: @directory.inspect }
 Could not install package with an invalid path.
   Package attempted to install file into
-  #{@entry_path.inspect} under #{@directory.inspect}.
+  %{path} under %{dir}.
       MSG
     end
   end