puppet 4.10.12 → 5.0.0

data/lib/puppet/face/module/list.rb

@@ -2,7 +2,7 @@
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:list) do
-    summary "List installed modules"
+    summary _("List installed modules")
     description <<-HEREDOC
       Lists the installed puppet modules. By default, this action scans the
       modulepath from puppet.conf's `[main]` block; use the --modulepath
@@ -11,10 +11,14 @@ Puppet::Face.define(:module, '1.0.0') do
       The output of this action includes information from the module's
       metadata, including version numbers and unmet module dependencies.
     HEREDOC
-    returns "hash of paths to module objects"
+    returns _("hash of paths to module objects")
 
     option "--tree" do
-      summary "Whether to show dependencies as a tree view"
+      summary _("Whether to show dependencies as a tree view")
+    end
+
+    option '--strict-semver' do
+      summary _('Whether version ranges should exclude pre-release versions')
     end
 
     examples <<-'EOT'
@@ -73,11 +77,12 @@ Puppet::Face.define(:module, '1.0.0') do
 
       output = ''
 
+      environment.modules_strict_semver = !!options[:strict_semver]
       warn_unmet_dependencies(environment)
 
       environment.modulepath.each do |path|
         modules = modules_by_path[path]
-        no_mods = modules.empty? ? ' (no modules installed)' : ''
+        no_mods = modules.empty? ? _(' (no modules installed)') : ''
         output << "#{path}#{no_mods}\n"
 
         if options[:tree]
@@ -106,13 +111,13 @@ Puppet::Face.define(:module, '1.0.0') do
   def warn_unmet_dependencies(environment)
     error_types = {
       :non_semantic_version => {
-        :title => "Non semantic version dependency"
+        :title => _("Non semantic version dependency")
       },
       :missing => {
-        :title => "Missing dependency"
+        :title => _("Missing dependency")
       },
       :version_mismatch => {
-        :title => "Module '%s' (v%s) fails to meet some dependencies:"
+        :title => _("Module '%s' (v%s) fails to meet some dependencies:")
       }
     }
 
@@ -139,8 +144,7 @@ Puppet::Face.define(:module, '1.0.0') do
             parent_name        = dep[:parent][:name].gsub('/', '-')
             parent_version     = dep[:parent][:version]
 
-            msg = "'#{parent_name}' (#{parent_version})"
-            msg << " requires '#{dep_name}' (#{version_constraint})"
+            msg = _("'%{parent_name}' (%{parent_version}) requires '%{dependency_name}' (%{dependency_version})") % { parent_name: parent_name, parent_version: parent_version, dependency_name: dep_name, dependency_version: version_constraint }
             @unmet_deps[type][dep[:name]][:errors] << msg
             @unmet_deps[type][dep[:name]][:parent] = {
               :name    => dep[:parent][:name],
@@ -226,7 +230,7 @@ Puppet::Face.define(:module, '1.0.0') do
           dep[:reason] == :missing
         end
         missing_deps.map do |mis_mod|
-          str = "#{colorize(:bg_red, 'UNMET DEPENDENCY')} #{mis_mod[:name].gsub('/', '-')} "
+          str = "#{colorize(:bg_red, _('UNMET DEPENDENCY'))} #{mis_mod[:name].gsub('/', '-')} "
           str << "(#{colorize(:cyan, mis_mod[:version_constraint])})"
           node[:dependencies] << { :text => str }
         end
@@ -260,12 +264,12 @@ Puppet::Face.define(:module, '1.0.0') do
 
     if @unmet_deps[:version_mismatch].include?(mod.forge_name)
       if params[:label_invalid]
-        str << '  ' + colorize(:red, 'invalid')
+        str << '  ' + colorize(:red, _('invalid'))
       elsif parent.respond_to?(:forge_name)
         unmet_parent = @unmet_deps[:version_mismatch][mod.forge_name][:parent]
         if (unmet_parent[:name] == parent.forge_name &&
             unmet_parent[:version] == "v#{parent.version}")
-          str << '  ' + colorize(:red, 'invalid')
+          str << '  ' + colorize(:red, _('invalid'))
         end
       end
     end

data/lib/puppet/face/module/search.rb

@@ -3,13 +3,13 @@ require 'puppet/forge'
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:search) do
-    summary "Search the Puppet Forge for a module."
+    summary _("Search the Puppet Forge for a module.")
     description <<-EOT
       Searches a repository for modules whose names, descriptions, or keywords
       match the provided search term.
     EOT
 
-    returns "Array of module metadata hashes"
+    returns _("Array of module metadata hashes")
 
     examples <<-EOT
       Search the Puppet Forge for a module:
@@ -19,7 +19,7 @@ Puppet::Face.define(:module, '1.0.0') do
       bacula        This is a generic Apache module      @puppetlabs        backups
     EOT
 
-    arguments "<search_term>"
+    arguments _("<search_term>")
 
     when_invoked do |term, options|
       Puppet::ModuleTool.set_option_defaults options
@@ -31,7 +31,7 @@ Puppet::Face.define(:module, '1.0.0') do
         raise results[:error][:multiline]
       end
 
-      return "No results found for '#{term}'." if results[:answers].empty?
+      return _("No results found for '%{term}'.") % { term: term } if results[:answers].empty?
 
       padding = '  '
       headers = {

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

@@ -1,12 +1,12 @@
 Puppet::Face.define(:module, '1.0.0') do
   action(:uninstall) do
-    summary "Uninstall a puppet module."
+    summary _("Uninstall a puppet module.")
     description <<-EOT
       Uninstalls a puppet module from the modulepath (or a specific
       target directory).
     EOT
 
-    returns "Hash of module objects representing uninstalled modules and related errors."
+    returns _("Hash of module objects representing uninstalled modules and related errors.")
 
     examples <<-'EOT'
       Uninstall a module:
@@ -30,10 +30,10 @@ Puppet::Face.define(:module, '1.0.0') do
       Removed /etc/puppetlabs/code/modules/ssh (v2.0.0)
     EOT
 
-    arguments "<name>"
+    arguments _("<name>")
 
     option "--force", "-f" do
-      summary "Force uninstall of an installed module."
+      summary _("Force uninstall of an installed module.")
       description <<-EOT
         Force the uninstall of an installed module even if there are local
         changes or the possibility of causing broken dependencies.
@@ -41,25 +41,29 @@ Puppet::Face.define(:module, '1.0.0') do
     end
 
     option "--ignore-changes", "-c" do
-      summary "Ignore any local changes made. (Implied by --force.)"
+      summary _("Ignore any local changes made. (Implied by --force.)")
       description <<-EOT
         Uninstall an installed module even if there are local changes to it.  (Implied by --force.)
       EOT
     end
 
     option "--version=" do
-      summary "The version of the module to uninstall"
+      summary _("The version of the module to uninstall")
       description <<-EOT
         The version of the module to uninstall. When using this option, a module
         matching the specified version must be installed or else an error is raised.
       EOT
     end
 
+    option '--strict-semver' do
+      summary _('Whether version ranges should exclude pre-release versions')
+    end
+
     when_invoked do |name, options|
       name = name.gsub('/', '-')
 
       Puppet::ModuleTool.set_option_defaults options
-      Puppet.notice "Preparing to uninstall '#{name}'" << (options[:version] ? " (#{colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))})" : '') << " ..."
+      Puppet.notice _("Preparing to uninstall '%{name}'") % { name: name } << (options[:version] ? " (#{colorize(:cyan, options[:version].sub(/^(?=\d)/, 'v'))})" : '') << " ..."
       Puppet::ModuleTool::Applications::Uninstaller.run(name, options)
     end
 
@@ -69,9 +73,8 @@ Puppet::Face.define(:module, '1.0.0') do
         exit 1
       else
         mod = return_value[:affected_modules].first
-        "Removed '#{return_value[:module_name]}'" <<
-        (mod.version ? " (#{colorize(:cyan, mod.version.to_s.sub(/^(?=\d)/, 'v'))})" : '') <<
-        " from #{mod.modulepath}"
+        module_version = mod.version ? " (#{colorize(:cyan, mod.version.to_s.sub(/^(?=\d)/, 'v'))})" : ''
+        _("Removed '%{name}'%{module_version} from %{path}") % { name: return_value[:module_name], module_version: module_version, path: mod.modulepath }
       end
     end
   end

data/lib/puppet/face/module/upgrade.rb

@@ -2,7 +2,7 @@
 
 Puppet::Face.define(:module, '1.0.0') do
   action(:upgrade) do
-    summary "Upgrade a puppet module."
+    summary _("Upgrade a puppet module.")
     description <<-EOT
       Upgrades a puppet module.
     EOT
@@ -29,10 +29,10 @@ Puppet::Face.define(:module, '1.0.0') do
       └── puppetlabs-apache (v1.0.0 -> v2.4.0)
     EOT
 
-    arguments "<name>"
+    arguments _("<name>")
 
     option "--force", "-f" do
-      summary "Force upgrade of an installed module. (Implies --ignore-dependencies.)"
+      summary _("Force upgrade of an installed module. (Implies --ignore-dependencies.)")
       description <<-EOT
         Force the upgrade of an installed module even if there are local
         changes or the possibility of causing broken dependencies.
@@ -41,29 +41,33 @@ Puppet::Face.define(:module, '1.0.0') do
     end
 
     option "--ignore-dependencies" do
-      summary "Do not attempt to install dependencies. (Implied by --force.)"
+      summary _("Do not attempt to install dependencies. (Implied by --force.)")
       description <<-EOT
         Do not attempt to install dependencies. Implied by --force.
       EOT
     end
 
     option "--ignore-changes", "-c" do
-      summary "Ignore and overwrite any local changes made. (Implied by --force.)"
+      summary _("Ignore and overwrite any local changes made. (Implied by --force.)")
       description <<-EOT
         Upgrade an installed module even if there are local changes to it.  (Implied by --force.)
       EOT
     end
 
     option "--version=" do
-      summary "The version of the module to upgrade to."
+      summary _("The version of the module to upgrade to.")
       description <<-EOT
         The version of the module to upgrade to.
       EOT
     end
 
+    option '--strict-semver' do
+      summary _('Whether version ranges should exclude pre-release versions')
+    end
+
     when_invoked do |name, options|
       name = name.gsub('/', '-')
-      Puppet.notice "Preparing to upgrade '#{name}' ..."
+      Puppet.notice _("Preparing to upgrade '%{name}' ...") % { name: name }
       Puppet::ModuleTool.set_option_defaults options
       Puppet::ModuleTool::Applications::Upgrader.new(name, options).run
     end

data/lib/puppet/face/node.rb

@@ -1,9 +1,9 @@
 require 'puppet/indirector/face'
 Puppet::Indirector::Face.define(:node, '0.0.1') do
   copyright "Puppet Inc.", 2011
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "View and manage node definitions."
+  summary _("View and manage node definitions.")
   description <<-'EOT'
     This subcommand interacts with node objects, which are used by Puppet to
     build a catalog. A node object consists of the node's facts, environment,
@@ -15,9 +15,9 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
   deactivate_action(:save)
 
   find = get_action(:find)
-  find.summary "Retrieve a node object."
-  find.arguments "<host>"
-  find.returns <<-'EOT'
+  find.summary _("Retrieve a node object.")
+  find.arguments _("<host>")
+  find.returns _(<<-'EOT')
     A hash containing the node's `classes`, `environment`, `expiration`, `name`,
     `parameters` (its facts, combined with any ENC-set parameters), and `time`.
     When used from the Ruby API: a Puppet::Node object.

data/lib/puppet/face/node/clean.rb

@@ -1,8 +1,8 @@
 Puppet::Face.define(:node, '0.0.1') do
   action(:clean) do
 
-    summary "Clean up signed certs, cached facts, node objects, and reports for a node stored by the puppetmaster"
-    arguments "<host1> [<host2> ...]"
+    summary _("Clean up signed certs, cached facts, node objects, and reports for a node stored by the puppetmaster")
+    arguments _("<host1> [<host2> ...]")
     description <<-'EOT'
       Cleans up the following information a puppet master knows about a node:
 
@@ -19,7 +19,7 @@ Puppet::Face.define(:node, '0.0.1') do
     when_invoked do |*args|
       nodes = args[0..-2]
       options = args.last
-      raise "At least one node should be passed" if nodes.empty? || nodes == options
+      raise _("At least one node should be passed") if nodes.empty? || nodes == options
 
       # This seems really bad; run_mode should be set as part of a class
       # definition, and should not be modifiable beyond that.  This is one of
@@ -56,28 +56,28 @@ Puppet::Face.define(:node, '0.0.1') do
     if Puppet::SSL::CertificateAuthority.ca?
       Puppet::Face[:ca, :current].revoke(node)
       Puppet::Face[:ca, :current].destroy(node)
-      Puppet.info "#{node} certificates removed from ca"
+      Puppet.info _("%{node} certificates removed from ca") % { node: node }
     else
-      Puppet.info "Not managing #{node} certs as this host is not a CA"
+      Puppet.info _("Not managing %{node} certs as this host is not a CA") % { node: node }
     end
   end
 
   # clean facts for +host+
   def clean_cached_facts(node)
     Puppet::Node::Facts.indirection.destroy(node)
-    Puppet.info "#{node}'s facts removed"
+    Puppet.info _("%{node}'s facts removed") % { node: node }
   end
 
   # clean cached node +host+
   def clean_cached_node(node)
     Puppet::Node.indirection.destroy(node)
-    Puppet.info "#{node}'s cached node removed"
+    Puppet.info _("%{node}'s cached node removed") % { node: node }
   end
 
   # clean node reports for +host+
   def clean_reports(node)
     Puppet::Transaction::Report.indirection.destroy(node)
-    Puppet.info "#{node}'s reports removed"
+    Puppet.info _("%{node}'s reports removed") % { node: node }
   end
 
   def environment

data/lib/puppet/face/parser.rb

@@ -3,14 +3,14 @@ require 'puppet/parser'
 
 Puppet::Face.define(:parser, '0.0.1') do
   copyright "Puppet Inc.", 2014
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "Interact directly with the parser."
+  summary _("Interact directly with the parser.")
 
   action :validate do
-    summary "Validate the syntax of one or more Puppet manifests."
-    arguments "[<manifest>] [<manifest> ...]"
-    returns "Nothing, or the first syntax error encountered."
+    summary _("Validate the syntax of one or more Puppet manifests.")
+    arguments _("[<manifest>] [<manifest> ...]")
+    returns _("Nothing, or the first syntax error encountered.")
     description <<-'EOT'
       This action validates Puppet DSL syntax without compiling a catalog or
       syncing any resources. If no manifest files are provided, it will
@@ -43,7 +43,7 @@ Puppet::Face.define(:parser, '0.0.1') do
         else
           manifest = Puppet.lookup(:current_environment).manifest
           files << manifest
-          Puppet.notice "No manifest specified. Validating the default manifest #{manifest}"
+          Puppet.notice _("No manifest specified. Validating the default manifest %{manifest}") % { manifest: manifest }
         end
       end
       missing_files = []
@@ -55,7 +55,7 @@ Puppet::Face.define(:parser, '0.0.1') do
         end
       end
       unless missing_files.empty?
-        raise Puppet::Error, "One or more file(s) specified did not exist:\n#{missing_files.collect {|f| " " * 3 + f + "\n"}}"
+        raise Puppet::Error, _("One or more file(s) specified did not exist:\n%{files}") % { files: missing_files.collect {|f| " " * 3 + f + "\n"} }
       end
       nil
     end
@@ -63,9 +63,9 @@ Puppet::Face.define(:parser, '0.0.1') do
 
 
   action (:dump) do
-    summary "Outputs a dump of the internal parse tree for debugging"
-    arguments "-e <source>| [<manifest> ...] "
-    returns "A dump of the resulting AST model unless there are syntax or validation errors."
+    summary _("Outputs a dump of the internal parse tree for debugging")
+    arguments "-e " + _("<source>| [<manifest> ...] ")
+    returns _("A dump of the resulting AST model unless there are syntax or validation errors.")
     description <<-'EOT'
       This action parses and validates the Puppet DSL syntax without compiling a catalog
       or syncing any resources.
@@ -78,13 +78,13 @@ Puppet::Face.define(:parser, '0.0.1') do
       not API, it may change from time to time.
     EOT
 
-    option "--e <source>" do
+    option "--e " + _("<source>") do
       default_to { nil }
-      summary "dump one source expression given on the command line."
+      summary _("dump one source expression given on the command line.")
     end
 
     option("--[no-]validate") do
-      summary "Whether or not to validate the parsed result, if no-validate only syntax errors are reported"
+      summary _("Whether or not to validate the parsed result, if no-validate only syntax errors are reported")
     end
 
     when_invoked do |*args|
@@ -96,7 +96,7 @@ Puppet::Face.define(:parser, '0.0.1') do
         if ! STDIN.tty?
           dump_parse(STDIN.read, 'stdin', options, false)
         else
-          raise Puppet::Error, "No input to parse given on command line or stdin"
+          raise Puppet::Error, _("No input to parse given on command line or stdin")
         end
       else
         missing_files = []
@@ -113,7 +113,7 @@ Puppet::Face.define(:parser, '0.0.1') do
         if missing_files.empty?
           dumps
         else
-          dumps + "One or more file(s) specified did not exist:\n" + missing_files.collect { |f| "   #{f}" }.join("\n")
+          dumps + _("One or more file(s) specified did not exist:\n") + missing_files.collect { |f| "   #{f}" }.join("\n")
         end
       end
     end
@@ -147,7 +147,7 @@ Puppet::Face.define(:parser, '0.0.1') do
   def validate_manifest(manifest = nil)
     env = Puppet.lookup(:current_environment)
     loaders = Puppet::Pops::Loaders.new(env)
-    Puppet.override( {:loaders => loaders } , 'For puppet parser validate') do
+    Puppet.override( {:loaders => loaders } , _('For puppet parser validate')) do
       begin
         validation_environment = manifest ? env.override_with(:manifest => manifest) : env
         validation_environment.check_for_reparse

data/lib/puppet/face/plugin.rb

@@ -4,9 +4,9 @@ require 'puppet/configurer/plugin_handler'
 
 Puppet::Face.define(:plugin, '0.0.1') do
   copyright "Puppet Inc.", 2011
-  license   "Apache 2 license; see COPYING"
+  license   _("Apache 2 license; see COPYING")
 
-  summary "Interact with the Puppet plugin system."
+  summary _("Interact with the Puppet plugin system.")
   description <<-'EOT'
     This subcommand provides network access to the puppet master's store of
     plugins.
@@ -18,13 +18,13 @@ Puppet::Face.define(:plugin, '0.0.1') do
   EOT
 
   action :download do
-    summary "Download plugins from the puppet master."
+    summary _("Download plugins from the puppet master.")
     description <<-'EOT'
       Downloads plugins from the configured puppet master. Any plugins
       downloaded in this way will be used in all subsequent Puppet activity.
       This action modifies files on disk.
     EOT
-    returns <<-'EOT'
+    returns _(<<-'EOT')
       A list of the files downloaded, or a confirmation that no files were
       downloaded. When used from the Ruby API, this action returns an array of
       the files downloaded, which will be empty if none were retrieved.
@@ -49,9 +49,9 @@ Puppet::Face.define(:plugin, '0.0.1') do
 
     when_rendering :console do |value|
       if value.empty? then
-        "No plugins downloaded."
+        _("No plugins downloaded.")
       else
-        "Downloaded these plugins: #{value.join(', ')}"
+        _("Downloaded these plugins: %{plugins}") % { plugins: value.join(', ') }
       end
     end
   end