puppet 2.7.26 → 3.0.0.rc4

data/lib/puppet/application/doc.rb

@@ -1,7 +1,6 @@
 require 'puppet/application'
 
 class Puppet::Application::Doc < Puppet::Application
-  should_not_parse_config
   run_mode :master
 
   attr_accessor :unknown_args, :manifest
@@ -50,7 +49,7 @@ class Puppet::Application::Doc < Puppet::Application
   end
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-doc(8) -- Generate Puppet documentation and references
 ========
@@ -60,6 +59,8 @@ SYNOPSIS
 Generates a reference for all Puppet types. Largely meant for internal
 Puppet Labs use.
 
+WARNING: RDoc support is only available under Ruby 1.8.7 and earlier.
+
 
 USAGE
 -----
@@ -83,6 +84,11 @@ can be changed with the 'outputdir' option.
 If the command is run with the name of a manifest file as an argument,
 puppet doc will output a single manifest's documentation on stdout.
 
+WARNING: RDoc support is only available under Ruby 1.8.7 and earlier.
+The internal API used to support manifest documentation has changed
+radically in newer versions, and support is not yet available for
+using those versions of RDoc.
+
 
 OPTIONS
 -------
@@ -100,7 +106,7 @@ OPTIONS
 * --mode:
   Determine the output mode. Valid modes are 'text', 'pdf' and 'rdoc'. The 'pdf'
   mode creates PDF formatted files in the /tmp directory. The default mode is
-  'text'. In 'rdoc' mode you must provide 'manifests-path'
+  'text'.
 
 * --reference:
   Build a particular reference. Get a list of references by running
@@ -120,7 +126,7 @@ OPTIONS
 * --environment:
   Used only in 'rdoc' mode. The configuration environment from which
   to read the modulepath and manifestdir settings, when reading said settings
-  from puppet.conf. Due to a known bug, this option is not currently effective.
+  from puppet.conf.
 
 
 EXAMPLE
@@ -182,8 +188,7 @@ HELP
         Puppet::Util::RDoc.rdoc(options[:outputdir], files, options[:charset])
       end
     rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      $stderr.puts "Could not generate documentation: #{detail}"
+      Puppet.log_exception(detail, "Could not generate documentation: #{detail}")
       exit_code = 1
     end
     exit exit_code
@@ -201,8 +206,7 @@ HELP
         # Add the per-section text, but with no ToC
         text += section.send(options[:format], with_contents)
       rescue => detail
-        puts detail.backtrace
-        $stderr.puts "Could not generate reference #{name}: #{detail}"
+        Puppet.log_exception(detail, "Could not generate reference #{name}: #{detail}")
         exit_code = 1
         next
       end
@@ -258,9 +262,6 @@ HELP
       end
     end
 
-    # Now parse the config
-    Puppet.parse_config
-
     # Handle the logging settings.
     if options[:debug] or options[:verbose]
       if options[:debug]

data/lib/puppet/application/face_base.rb

@@ -4,14 +4,13 @@ require 'optparse'
 require 'pp'
 
 class Puppet::Application::FaceBase < Puppet::Application
-  should_parse_config
   run_mode :agent
 
   option("--debug", "-d") do |arg|
     Puppet::Util::Log.level = :debug
   end
 
-  option("--verbose", "-v") do
+  option("--verbose", "-v") do |_|
     Puppet::Util::Log.level = :info
   end
 
@@ -19,10 +18,13 @@ class Puppet::Application::FaceBase < Puppet::Application
     self.render_as = format.to_sym
   end
 
+  # This seems like a bad thing; it seems like--in an ideal world--a given app/face should have one constant run mode.
+  #  This isn't currently possible because of issues relating to the certificate authority, but I've left some notes
+  #  about "run_mode" in settings.rb and defaults.rb, and if we are able to tighten up the behavior / implementation
+  #  of that setting, we might want to revisit this.  --cprice 2012-03-16
   option("--mode RUNMODE", "-r") do |arg|
     raise "Invalid run mode #{arg}; supported modes are user, agent, master" unless %w{user agent master}.include?(arg)
     self.class.run_mode(arg.to_sym)
-    set_run_mode self.class.run_mode
   end
 
 
@@ -67,7 +69,7 @@ class Puppet::Application::FaceBase < Puppet::Application
 
     # REVISIT: These should be configurable versions, through a global
     # '--version' option, but we don't implement that yet... --daniel 2011-03-29
-    @type = self.class.name.to_s.sub(/.+:/, '').downcase.to_sym
+    @type = Puppet::Util::ConstantInflector.constant2file(self.class.name.to_s.sub(/.+:/, '')).to_sym
     @face = Puppet::Face[@type, :current]
 
     # Now, walk the command line and identify the action.  We skip over
@@ -116,17 +118,12 @@ class Puppet::Application::FaceBase < Puppet::Application
       if @action = @face.get_default_action() then
         @is_default_action = true
       else
-        # REVISIT: ...and this horror thanks to our log setup, which doesn't
-        # initialize destinations until the setup method, which we will never
-        # reach.  We could also just print here, but that is actually a little
-        # uglier and nastier in the long term, in which we should do log setup
-        # earlier if at all possible. --daniel 2011-05-31
-        Puppet::Util::Log.newdestination(:console)
-
         face   = @face.name
         action = action_name.nil? ? 'default' : "'#{action_name}'"
         msg = "'#{face}' has no #{action} action.  See `puppet help #{face}`."
+
         Puppet.err(msg)
+        Puppet::Util::Log.force_flushqueue()
 
         exit false
       end
@@ -254,8 +251,7 @@ class Puppet::Application::FaceBase < Puppet::Application
     status = detail.status
 
   rescue Exception => detail
-    puts detail.backtrace if Puppet[:trace]
-    Puppet.err detail.to_s
+    Puppet.log_exception(detail)
     Puppet.err "Try 'puppet help #{@face.name} #{@action.name}' for usage"
 
   ensure

data/lib/puppet/application/filebucket.rb

@@ -2,8 +2,6 @@ require 'puppet/application'
 
 class Puppet::Application::Filebucket < Puppet::Application
 
-  should_not_parse_config
-
   option("--bucket BUCKET","-b")
   option("--debug","-d")
   option("--local","-l")
@@ -13,7 +11,7 @@ class Puppet::Application::Filebucket < Puppet::Application
   attr :args
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-filebucket(8) -- Store and retrieve files in a filebucket
 ========
@@ -167,9 +165,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       Puppet::Log.level = :info
     end
 
-    # Now parse the config
-    Puppet.parse_config
-
       exit(Puppet.settings.print_configs ? 0 : 1) if Puppet.settings.print_configs?
 
     require 'puppet/file_bucket/dipper'
@@ -181,8 +176,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
         @client = Puppet::FileBucket::Dipper.new(:Server => Puppet[:server])
       end
     rescue => detail
-      $stderr.puts detail
-      puts detail.backtrace if Puppet[:trace]
+      Puppet.log_exception(detail)
       exit(1)
     end
   end

data/lib/puppet/application/inspect.rb

@@ -2,7 +2,6 @@ require 'puppet/application'
 
 class Puppet::Application::Inspect < Puppet::Application
 
-  should_parse_config
   run_mode :agent
 
   option("--debug","-d")
@@ -18,7 +17,7 @@ class Puppet::Application::Inspect < Puppet::Application
   end
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-inspect(8) -- Send an inspection report
 ========
@@ -136,8 +135,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
         begin
           audited_resource = ral_resource.to_resource
         rescue StandardError => detail
-          puts detail.backtrace if Puppet[:trace]
-          ral_resource.err "Could not inspect #{ral_resource}; skipping: #{detail}"
+          ral_resource.log_exception(detail, "Could not inspect #{ral_resource}; skipping: #{detail}")
           audited_attributes.each do |name|
             event = ral_resource.event(
                                        :property => name,
@@ -183,8 +181,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       begin
         Puppet::Transaction::Report.indirection.save(@report)
       rescue => detail
-        puts detail.backtrace if Puppet[:trace]
-        Puppet.err "Could not send report: #{detail}"
+        Puppet.log_exception(detail, "Could not send report: #{detail}")
       end
     end
   end

data/lib/puppet/application/instrumentation_data.rb

@@ -1,4 +1,7 @@
 require 'puppet/application/indirection_base'
 
+# NOTE: this is using an "old" naming convention (underscores instead of camel-case), for backwards
+#  compatibility with 2.7.x.  When the old naming convention is officially and publicly deprecated,
+#  this should be changed to camel-case.
 class Puppet::Application::Instrumentation_data < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/instrumentation_listener.rb

@@ -1,4 +1,7 @@
 require 'puppet/application/indirection_base'
 
+# NOTE: this is using an "old" naming convention (underscores instead of camel-case), for backwards
+#  compatibility with 2.7.x.  When the old naming convention is officially and publicly deprecated,
+#  this should be changed to camel-case.
 class Puppet::Application::Instrumentation_listener < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/instrumentation_probe.rb

@@ -1,4 +1,7 @@
 require 'puppet/application/indirection_base'
 
+# NOTE: this is using an "old" naming convention (underscores instead of camel-case), for backwards
+#  compatibility with 2.7.x.  When the old naming convention is officially and publicly deprecated,
+#  this should be changed to camel-case.
 class Puppet::Application::Instrumentation_probe < Puppet::Application::IndirectionBase
 end

data/lib/puppet/application/kick.rb

@@ -2,8 +2,6 @@ require 'puppet/application'
 
 class Puppet::Application::Kick < Puppet::Application
 
-  should_not_parse_config
-
   attr_accessor :hosts, :tags, :classes
 
   option("--all","-a")
@@ -38,7 +36,7 @@ class Puppet::Application::Kick < Puppet::Application
   end
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-kick(8) -- Remotely control puppet agent
 ========
@@ -262,8 +260,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       result = run.status
       puts "status is #{result}"
     rescue => detail
-      puts detail.backtrace if Puppet[:trace]
-      $stderr.puts "Host #{host} failed: #{detail}\n"
+      Puppet.log_exception(detail, "Host #{host} failed: #{detail}\n")
       exit(2)
     end
 
@@ -309,9 +306,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       Puppet::Util::Log.level = :info
     end
 
-    # Now parse the config
-    Puppet.parse_config
-
     if Puppet[:node_terminus] == "ldap" and (options[:all] or @classes)
       if options[:all]
         @hosts = Puppet::Node.indirection.search("whatever", :fqdn => options[:fqdn]).collect { |node| node.name }

data/lib/puppet/application/master.rb

@@ -2,7 +2,6 @@ require 'puppet/application'
 
 class Puppet::Application::Master < Puppet::Application
 
-  should_parse_config
   run_mode :master
 
   option("--debug", "-d")
@@ -20,8 +19,7 @@ class Puppet::Application::Master < Puppet::Application
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail
-      puts detail.backtrace if Puppet[:debug]
-      $stderr.puts detail.to_s
+      Puppet.log_exception(detail)
     end
   end
 
@@ -31,7 +29,7 @@ class Puppet::Application::Master < Puppet::Application
   end
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-master(8) -- The puppet master daemon
 ========
@@ -127,6 +125,10 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     HELP
   end
 
+  def app_defaults()
+    super.merge :facts_terminus => 'yaml'
+  end
+
   def preinit
     Signal.trap(:INT) do
       $stderr.puts "Cancelling startup"
@@ -166,10 +168,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def main
     require 'etc'
 
-    xmlrpc_handlers = [:Status, :FileServer, :Master, :Report, :Filebucket]
-
-    xmlrpc_handlers << :CA if Puppet[:ca]
-
     # Make sure we've got a localhost ssl cert
     Puppet::SSL::Host.localhost
 
@@ -181,19 +179,18 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       begin
         Puppet::Util.chuser
       rescue => detail
-        puts detail.backtrace if Puppet[:trace]
-        $stderr.puts "Could not change user to #{Puppet[:user]}: #{detail}"
+        Puppet.log_exception(detail, "Could not change user to #{Puppet[:user]}: #{detail}")
         exit(39)
       end
     end
 
     unless options[:rack]
       require 'puppet/network/server'
-      @daemon.server = Puppet::Network::Server.new(:xmlrpc_handlers => xmlrpc_handlers)
+      @daemon.server = Puppet::Network::Server.new()
       @daemon.daemonize if Puppet[:daemonize]
     else
       require 'puppet/network/http/rack'
-      @app = Puppet::Network::HTTP::Rack.new(:xmlrpc_handlers => xmlrpc_handlers, :protocols => [:rest, :xmlrpc])
+      @app = Puppet::Network::HTTP::Rack.new()
     end
 
     Puppet.notice "Starting Puppet master version #{Puppet.version}"
@@ -227,9 +224,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
     require 'puppet/file_serving/content'
     require 'puppet/file_serving/metadata'
 
-    # Cache our nodes in yaml.  Currently not configurable.
-    Puppet::Node.indirection.cache_class = :yaml
-
     Puppet::FileServing::Content.indirection.terminus_class = :file_server
     Puppet::FileServing::Metadata.indirection.terminus_class = :file_server
 

data/lib/puppet/application/module.rb

@@ -1,11 +1,4 @@
 require 'puppet/application/face_base'
 
 class Puppet::Application::Module < Puppet::Application::FaceBase
-  def setup
-    super
-    if self.render_as.name == :console
-      Puppet::Util::Log.close(:console)
-      Puppet::Util::Log.newdestination(:telly_prototype_console)
-    end
-  end
 end

data/lib/puppet/application/queue.rb

@@ -2,9 +2,12 @@ require 'puppet/application'
 require 'puppet/util'
 
 class Puppet::Application::Queue < Puppet::Application
-  should_parse_config
 
   attr_accessor :daemon
+  
+  def app_defaults()
+    super.merge( :pidfile => "$rundir/queue.pid" )
+  end
 
   def preinit
     require 'puppet/daemon'
@@ -113,14 +116,13 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
       Puppet::Util::Log.newdestination(arg)
       options[:setdest] = true
     rescue => detail
-      puts detail.backtrace if Puppet[:debug]
-      $stderr.puts detail.to_s
+      Puppet.log_exception(detail)
     end
   end
 
   def main
     require 'puppet/indirector/catalog/queue' # provides Puppet::Indirector::Queue.subscribe
-    Puppet.notice "Starting puppetqd #{Puppet.version}"
+    Puppet.notice "Starting puppet queue #{Puppet.version}"
     Puppet::Resource::Catalog::Queue.subscribe do |catalog|
       # Once you have a Puppet::Resource::Catalog instance, passing it to save should suffice
       # to put it through to the database via its active_record indirector (which is determined
@@ -129,8 +131,7 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
         begin
           Puppet::Resource::Catalog.indirection.save(catalog)
         rescue => detail
-          puts detail.backtrace if Puppet[:trace]
-          Puppet.err "Could not save queued catalog for #{catalog.name}: #{detail}"
+          Puppet.log_exception(detail, "Could not save queued catalog for #{catalog.name}: #{detail}")
         end
       end
     end

data/lib/puppet/application/resource.rb

@@ -2,8 +2,6 @@ require 'puppet/application'
 
 class Puppet::Application::Resource < Puppet::Application
 
-  should_not_parse_config
-
   attr_accessor :host, :extra_params
 
   def preinit
@@ -35,7 +33,7 @@ class Puppet::Application::Resource < Puppet::Application
   end
 
   def help
-    <<-'HELP'
+    <<-HELP
 
 puppet-resource(8) -- The resource abstraction layer shell
 ========
@@ -154,8 +152,6 @@ Copyright (c) 2011 Puppet Labs, LLC Licensed under the Apache 2.0 License
   def setup
     Puppet::Util::Log.newdestination(:console)
 
-    Puppet.parse_config
-
     if options[:debug]
       Puppet::Util::Log.level = :debug
     elsif options[:verbose]

data/lib/puppet/application/resource_type.rb

@@ -1,4 +1,7 @@
 require 'puppet/application/indirection_base'
 
+# NOTE: this is using an "old" naming convention (underscores instead of camel-case), for backwards
+#  compatibility with 2.7.x.  When the old naming convention is officially and publicly deprecated,
+#  this should be changed to camel-case.
 class Puppet::Application::Resource_type < Puppet::Application::IndirectionBase
 end