puppet 4.10.0 → 5.0.0

data/lib/puppet/application/apply.rb

@@ -152,7 +152,7 @@ Luke Kanies
 
 COPYRIGHT
 ---------
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     HELP
   end
@@ -177,8 +177,11 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     else
       text = Puppet::FileSystem.read(options[:catalog], :encoding => 'utf-8')
     end
-    catalog = read_catalog(text)
-    apply_catalog(catalog)
+    env = Puppet.lookup(:environments).get(Puppet[:environment])
+    Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
+      catalog = read_catalog(text)
+      apply_catalog(catalog)
+    end
   end
 
   def main
@@ -187,8 +190,8 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       Puppet[:code] = options[:code] || STDIN.read
     else
       manifest = command_line.args.shift
-      raise "Could not find file #{manifest}" unless Puppet::FileSystem.exist?(manifest)
-      Puppet.warning("Only one file can be applied per run.  Skipping #{command_line.args.join(', ')}") if command_line.args.size > 0
+      raise _("Could not find file %{manifest}") % { manifest: manifest } unless Puppet::FileSystem.exist?(manifest)
+      Puppet.warning(_("Only one file can be applied per run.  Skipping %{files}") % { files: command_line.args.join(', ') }) if command_line.args.size > 0
     end
 
     # splay if needed
@@ -197,7 +200,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     unless Puppet[:node_name_fact].empty?
       # Collect our facts.
       unless facts = Puppet::Node::Facts.indirection.find(Puppet[:node_name_value])
-        raise "Could not find facts for #{Puppet[:node_name_value]}"
+        raise _("Could not find facts for %{node}") % { node: Puppet[:node_name_value] }
       end
 
       Puppet[:node_name_value] = facts.values[Puppet[:node_name_fact]]
@@ -206,7 +209,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
 
     # Find our Node
     unless node = Puppet::Node.indirection.find(Puppet[:node_name_value])
-      raise "Could not find node #{Puppet[:node_name_value]}"
+      raise _("Could not find node %{node}") % { node: Puppet[:node_name_value] }
     end
 
     configured_environment = node.environment || Puppet.lookup(:current_environment)
@@ -222,21 +225,20 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     # the :manifest setting of the apply_environment.
     node.environment = apply_environment
 
-    Puppet.override({:current_environment => apply_environment}, "For puppet apply") do
+    #TRANSLATORS "puppet apply" is a program command and should not be translated
+    Puppet.override({:current_environment => apply_environment}, _("For puppet apply")) do
       # Merge in the facts.
       node.merge(facts.values) if facts
 
       # Add server facts so $server_facts[environment] exists when doing a puppet apply
-      if Puppet[:trusted_server_facts]
-        node.add_server_facts({})
-      end
+      node.add_server_facts({})
 
       # Allow users to load the classes that puppet agent creates.
       if options[:loadclasses]
         file = Puppet[:classfile]
         if Puppet::FileSystem.exist?(file)
           unless FileTest.readable?(file)
-            $stderr.puts "#{file} is not readable"
+            $stderr.puts _("%{file} is not readable") % { file: file }
             exit(63)
           end
           node.classes = Puppet::FileSystem.read(file, :encoding => 'utf-8').split(/[\s\n]+/)
@@ -271,7 +273,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
           catalog.write_resource_file
         end
 
-        exit_status = apply_catalog(catalog)
+        exit_status = Puppet.override(:loaders => Puppet::Pops::Loaders.new(apply_environment)) { apply_catalog(catalog) }
 
         if not exit_status
           exit(1)
@@ -309,7 +311,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     Puppet::Util::Log.newdestination(:console) unless options[:setdest]
 
     Signal.trap(:INT) do
-      $stderr.puts "Exiting"
+      $stderr.puts _("Exiting")
       exit(1)
     end
 
@@ -335,11 +337,11 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   private
 
   def read_catalog(text)
+    format = Puppet::Resource::Catalog.default_format
     begin
-      catalog = Puppet::Resource::Catalog.convert_from(Puppet::Resource::Catalog.default_format,text)
-      catalog = Puppet::Resource::Catalog.pson_create(catalog) unless catalog.is_a?(Puppet::Resource::Catalog)
+      catalog = Puppet::Resource::Catalog.convert_from(format, text)
     rescue => detail
-      raise Puppet::Error, "Could not deserialize catalog from pson: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not deserialize catalog from %{format}: %{detail}") % { format: format, detail: detail }, detail.backtrace
     end
 
     catalog.to_ral

data/lib/puppet/application/cert.rb

@@ -250,7 +250,7 @@ Luke Kanies
 
 COPYRIGHT
 ---------
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     HELP
   end
@@ -322,7 +322,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   # Create and run an applicator.  I wanted to build an interface where you could do
   # something like 'ca.apply(:generate).to(:all) but I don't think it's really possible.
   def apply(ca, method, options)
-    raise ArgumentError, "You must specify the hosts to apply to; valid values are an array or the symbol :all" unless options[:to]
+    raise ArgumentError, _("You must specify the hosts to apply to; valid values are an array or the symbol :all") unless options[:to]
     applier = Puppet::SSL::CertificateAuthority::Interface.new(method, options)
     applier.apply(ca)
   end

data/lib/puppet/application/describe.rb

@@ -11,7 +11,7 @@ class Formatter
     work = (opts[:scrub] ? scrub(txt) : txt)
     indent = (opts[:indent] ? opts[:indent] : 0)
     textLen = @width - indent
-    patt = Regexp.new("^(.{0,#{textLen}})[ \n]")
+    patt = Regexp.new("\\A(.{0,#{textLen}})[ \n]")
     prefix = " " * indent
 
     res = []
@@ -226,7 +226,7 @@ David Lutterkort
 
 COPYRIGHT
 ---------
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     HELP
   end

data/lib/puppet/application/device.rb

@@ -19,7 +19,7 @@ class Puppet::Application::Device < Puppet::Application
   def preinit
     # Do an initial trap, so that cancels don't get a stack trace.
     Signal.trap(:INT) do
-      $stderr.puts "Cancelling startup"
+      $stderr.puts _("Cancelling startup")
       exit(0)
     end
 
@@ -30,6 +30,7 @@ class Puppet::Application::Device < Puppet::Application
       :debug => false,
       :centrallogs => false,
       :setdest => false,
+      :target => nil,
     }.each do |opt,val|
       options[opt] = val
     end
@@ -57,6 +58,10 @@ class Puppet::Application::Device < Puppet::Application
     @args[:Port] = arg
   end
 
+  option("--target DEVICE", "-t") do |arg|
+    options[:target] = arg.to_s
+  end
+
     def help
       <<-'HELP'
 
@@ -72,9 +77,10 @@ Currently must be run out periodically, using cron or something similar.
 
 USAGE
 -----
-  puppet device [-d|--debug] [--detailed-exitcodes] [-V|--version]
+  puppet device [-d|--debug] [--detailed-exitcodes] [--deviceconfig <file>]
                 [-h|--help] [-l|--logdest syslog|<file>|console]
                 [-v|--verbose] [-w|--waitforcert <seconds>]
+                [-t|--target <device>] [-V|--version]
 
 
 DESCRIPTION
@@ -120,6 +126,10 @@ parameter, so you can specify '--server <servername>' as an argument.
   means at least one device had resource failures. Exit codes of '3', '5', '6',
   or '7' means that a bitwise combination of the preceding exit codes happened.
 
+* --deviceconfig:
+  Path to the device config file for puppet device.
+  Default: $confdir/device.conf
+
 * --help:
   Print this help message
 
@@ -133,6 +143,10 @@ parameter, so you can specify '--server <servername>' as an argument.
   appending nature of logging. It must be appended manually to make the content
   valid JSON.
 
+* --target:
+  Target a specific device/certificate in the device.conf. Doing so will perform a
+  device run against only that device/certificate.
+
 * --verbose:
   Turn on verbose reporting.
 
@@ -155,7 +169,7 @@ Brice Figureau
 
 COPYRIGHT
 ---------
-Copyright (c) 2011 Puppet Labs, LLC
+Copyright (c) 2011 Puppet Inc., LLC
 Licensed under the Apache 2.0 License
       HELP
     end
@@ -166,51 +180,62 @@ Licensed under the Apache 2.0 License
     confdir = Puppet[:confdir]
     certname = Puppet[:certname]
 
-    # find device list
-    require 'puppet/util/network_device/config'
-    devices = Puppet::Util::NetworkDevice::Config.devices
-    if devices.empty?
-      Puppet.err "No device found in #{Puppet[:deviceconfig]}"
-      exit(1)
-    end
-    returns = devices.collect do |devicename,device|
-      begin
-        device_url = URI.parse(device.url)
-        # Handle nil scheme & port
-        scheme = "#{device_url.scheme}://" if device_url.scheme
-        port = ":#{device_url.port}" if device_url.port
-        Puppet.info "starting applying configuration to #{device.name} at #{scheme}#{device_url.host}#{port}#{device_url.path}"
-
-        # override local $vardir and $certname
-        Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
-        Puppet[:vardir] = ::File.join(Puppet[:devicedir], device.name)
-        Puppet[:certname] = device.name
-
-        # this will reload and recompute default settings and create the devices sub vardir, or we hope so :-)
-        Puppet.settings.use :main, :agent, :ssl
-
-        # this init the device singleton, so that the facts terminus
-        # and the various network_device provider can use it
-        Puppet::Util::NetworkDevice.init(device)
-
-        # ask for a ssl cert if needed, but at least
-        # setup the ssl system for this device.
-        setup_host
-
-        require 'puppet/configurer'
-        configurer = Puppet::Configurer.new
-        configurer.run(:network_device => true, :pluginsync => Puppet::Configurer.should_pluginsync?)
-      rescue => detail
-        Puppet.log_exception(detail)
-        # If we rescued an error, then we return 1 as the exit code
-        1
-      ensure
-        Puppet[:vardir] = vardir
-        Puppet[:confdir] = confdir
-        Puppet[:certname] = certname
-        Puppet::SSL::Host.reset
+    env = Puppet.lookup(:environments).get(Puppet[:environment])
+    returns = Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
+      # find device list
+      require 'puppet/util/network_device/config'
+      devices = Puppet::Util::NetworkDevice::Config.devices.dup
+      if options[:target]
+        devices.select! { |key, value| key == options[:target] }
+      end
+      if devices.empty?
+        if options[:target]
+          Puppet.err _("Target device / certificate '%{target}' not found in %{config}") % { target: options[:target], config: Puppet[:deviceconfig] }
+        else
+          Puppet.err _("No device found in %{config}") % { config: Puppet[:deviceconfig] }
+          exit(1)
+        end
+      end
+      devices.collect do |devicename,device|
+        begin
+          device_url = URI.parse(device.url)
+          # Handle nil scheme & port
+          scheme = "#{device_url.scheme}://" if device_url.scheme
+          port = ":#{device_url.port}" if device_url.port
+          Puppet.info _("starting applying configuration to %{target} at %{scheme}%{url_host}%{port}%{url_path}") % { target: device.name, scheme: scheme, url_host: device_url.host, port: port, url_path: device_url.path }
+
+          # override local $vardir and $certname
+          Puppet[:confdir] = ::File.join(Puppet[:devicedir], device.name)
+          Puppet[:vardir] = ::File.join(Puppet[:devicedir], device.name)
+          Puppet[:certname] = device.name
+
+          # this will reload and recompute default settings and create the devices sub vardir, or we hope so :-)
+          Puppet.settings.use :main, :agent, :ssl
+
+          # this init the device singleton, so that the facts terminus
+          # and the various network_device provider can use it
+          Puppet::Util::NetworkDevice.init(device)
+
+          # ask for a ssl cert if needed, but at least
+          # setup the ssl system for this device.
+          setup_host
+
+          require 'puppet/configurer'
+          configurer = Puppet::Configurer.new
+          configurer.run(:network_device => true, :pluginsync => Puppet::Configurer.should_pluginsync?)
+        rescue => detail
+          Puppet.log_exception(detail)
+          # If we rescued an error, then we return 1 as the exit code
+          1
+        ensure
+          Puppet[:vardir] = vardir
+          Puppet[:confdir] = confdir
+          Puppet[:certname] = certname
+          Puppet::SSL::Host.reset
+        end
       end
     end
+
     if ! returns or returns.compact.empty?
       exit(1)
     elsif options[:detailed_exitcodes]

data/lib/puppet/application/doc.rb

@@ -25,7 +25,7 @@ class Puppet::Application::Doc < Puppet::Application
     if Puppet::Util::Reference.method_defined?(method)
       options[:format] = method
     else
-      raise "Invalid output format #{arg}"
+      raise _("Invalid output format %{arg}") % { arg: arg }
     end
   end
 
@@ -34,7 +34,7 @@ class Puppet::Application::Doc < Puppet::Application
     if Puppet::Util::Reference.modes.include?(arg) or arg.intern==:rdoc
       options[:mode] = arg.intern
     else
-      raise "Invalid output mode #{arg}"
+      raise _("Invalid output mode %{arg}") % { arg: arg }
     end
   end
 
@@ -57,7 +57,7 @@ puppet-doc(8) -- Generate Puppet references
 SYNOPSIS
 --------
 Generates a reference for all Puppet types. Largely meant for internal
-Puppet Labs use. (Deprecated)
+Puppet Inc. use. (Deprecated)
 
 
 USAGE
@@ -71,7 +71,7 @@ DESCRIPTION
 This deprecated command generates a Markdown document to stdout
 describing all installed Puppet types or all allowable arguments to
 puppet executables. It is largely meant for internal use and is used to
-generate the reference document available on the Puppet Labs web site.
+generate the reference document available on the Puppet Inc. web site.
 
 For Puppet module documentation (and all other use cases) this command
 has been superseded by the "puppet-strings"
@@ -104,7 +104,7 @@ Luke Kanies
 
 COPYRIGHT
 ---------
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
 HELP
   end
@@ -127,7 +127,7 @@ HELP
       files << ::File.dirname(env.manifest) if env.manifest != Puppet::Node::Environment::NO_MANIFEST
     end
     files += command_line.args
-    Puppet.info "scanning: #{files.inspect}"
+    Puppet.info _("scanning: %{files}") % { files: files.inspect }
 
     Puppet.settings[:document_all] = options[:all] || false
     begin
@@ -139,7 +139,7 @@ HELP
         Puppet::Util::RDoc.rdoc(options[:outputdir], files, options[:charset])
       end
     rescue => detail
-      Puppet.log_exception(detail, "Could not generate documentation: #{detail}")
+      Puppet.log_exception(detail, _("Could not generate documentation: %{detail}") % { detail: detail })
       exit_code = 1
     end
     exit exit_code
@@ -151,13 +151,13 @@ HELP
     exit_code = 0
     require 'puppet/util/reference'
     options[:references].sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-      raise "Could not find reference #{name}" unless section = Puppet::Util::Reference.reference(name)
+      raise _("Could not find reference %{name}") % { name: name } unless section = Puppet::Util::Reference.reference(name)
 
       begin
         # Add the per-section text, but with no ToC
         text += section.send(options[:format], with_contents)
       rescue => detail
-        Puppet.log_exception(detail, "Could not generate reference #{name}: #{detail}")
+        Puppet.log_exception(detail, _("Could not generate reference %{name}: %{detail}") % { name: name, detail: detail })
         exit_code = 1
         next
       end

data/lib/puppet/application/face_base.rb

@@ -30,12 +30,8 @@ class Puppet::Application::FaceBase < Puppet::Application
   attr_accessor :face, :action, :type, :arguments, :render_as
 
   def render_as=(format)
-    if format == :json then
-      @render_as = Puppet::Network::FormatHandler.format(:pson)
-    else
-      @render_as = Puppet::Network::FormatHandler.format(format)
-    end
-    @render_as or raise ArgumentError, "I don't know how to render '#{format}'"
+    @render_as = Puppet::Network::FormatHandler.format(format)
+    @render_as or raise ArgumentError, _("I don't know how to render '%{format}'") % { format: format }
   end
 
   def render(result, args_and_options)
@@ -57,7 +53,7 @@ class Puppet::Application::FaceBase < Puppet::Application
   def preinit
     super
     Signal.trap(:INT) do
-      $stderr.puts "Cancelling Face"
+      $stderr.puts _("Cancelling Face")
       exit(0)
     end
   end
@@ -129,7 +125,7 @@ class Puppet::Application::FaceBase < Puppet::Application
 
         face   = @face.name
         action = action_name.nil? ? 'default' : "'#{action_name}'"
-        msg = "'#{face}' has no #{action} action.  See `puppet help #{face}`."
+        msg = _("'%{face}' has no %{action} action.  See `puppet help %{face}`.") % { face: face, action: action }
 
         Puppet.err(msg)
         Puppet::Util::Log.force_flushqueue()
@@ -207,7 +203,7 @@ class Puppet::Application::FaceBase < Puppet::Application
     # Call the method associated with the provided action (e.g., 'find').
     unless @action
       puts Puppet::Face[:help, :current].help(@face.name)
-      raise "#{face} does not respond to action #{arguments.first}"
+      raise _("%{face} does not respond to action %{arg}") % { face: face, arg: arguments.first }
     end
 
     # We need to do arity checking here because this is generic code
@@ -240,13 +236,12 @@ class Puppet::Application::FaceBase < Puppet::Application
     # --daniel 2011-04-27
     if (arity = @action.positional_arg_count) > 0
       unless (count = arguments.length) == arity then
-        s = arity == 2 ? '' : 's'
-        raise ArgumentError, "puppet #{@face.name} #{@action.name} takes #{arity-1} argument#{s}, but you gave #{count-1}"
+        raise ArgumentError, n_("puppet %{face} %{action} takes %{arg_count} argument, but you gave %{given_count}", "puppet %{face} %{action} takes %{arg_count} arguments, but you gave %{given_count}", arity - 1) % { face: @face.name, action: @action.name, arg_count: arity-1, given_count: count-1 }
       end
     end
 
     if @face.deprecated?
-      Puppet.deprecation_warning("'puppet #{@face.name}' is deprecated and will be removed in a future release")
+      Puppet.deprecation_warning(_("'puppet %{face}' is deprecated and will be removed in a future release") % { face: @face.name })
     end
 
     result = @face.send(@action.name, *arguments)
@@ -265,7 +260,7 @@ class Puppet::Application::FaceBase < Puppet::Application
 
   rescue => detail
     Puppet.log_exception(detail)
-    Puppet.err "Try 'puppet help #{@face.name} #{@action.name}' for usage"
+    Puppet.err _("Try 'puppet help %{face} %{action}' for usage") % { face: @face.name, action: @action.name }
 
   ensure
     exit status

data/lib/puppet/application/filebucket.rb

@@ -146,7 +146,7 @@ Luke Kanies
 
 COPYRIGHT
 ---------
-Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
+Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
     HELP
   end
@@ -166,15 +166,15 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def backup
-    raise "You must specify a file to back up" unless args.length > 0
+    raise _("You must specify a file to back up") unless args.length > 0
 
     args.each do |file|
       unless Puppet::FileSystem.exist?(file)
-        $stderr.puts "#{file}: no such file"
+        $stderr.puts _("%{file}: no such file") % { file: file }
         next
       end
       unless FileTest.readable?(file)
-        $stderr.puts "#{file}: cannot read file"
+        $stderr.puts _("%{file}: cannot read file") % { file: file }
         next
       end
       md5 = @client.backup(file)
@@ -196,7 +196,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   end
 
   def diff
-    raise Puppet::Error, "Need exactly two arguments: filebucket diff <file_a> <file_b>" unless args.count == 2
+    raise Puppet::Error, _("Need exactly two arguments: filebucket diff <file_a> <file_b>") unless args.count == 2
     left = args.shift
     right = args.shift
     if Puppet::FileSystem.exist?(left)
@@ -216,10 +216,10 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       checksum_b = right
     end
     if (checksum_a || file_a) && (checksum_b || file_b)
-      Puppet.info("Comparing #{checksum_a} #{checksum_b} #{file_a} #{file_b}")
+      Puppet.info(_("Comparing %{checksum_a} %{checksum_b} %{file_a} %{file_b}") % { checksum_a: checksum_a, checksum_b: checksum_b, file_a: file_a, file_b: file_b })
       print @client.diff(checksum_a, checksum_b, file_a, file_b)
     else
-      raise Puppet::Error, "Need exactly two arguments: filebucket diff <file_a> <file_b>"
+      raise Puppet::Error, _("Need exactly two arguments: filebucket diff <file_a> <file_b>")
     end
   end
 
@@ -230,7 +230,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     @server = nil
 
     Signal.trap(:INT) do
-      $stderr.puts "Cancelling"
+      $stderr.puts _("Cancelling")
       exit(1)
     end