Merge lp:~lynxman/ubuntu/quantal/mcollective/mcollective20 into lp:ubuntu/quantal/mcollective

[Marc Cluet]

mcollective (2.0.0+dfsg-1ubuntu1) quantal; urgency=low

  * Merge from debian unstable, remaining changes
    - debian/control: Package mcollective-middleware allows the user
      to install mcollective + his AMPQ server of choice, we now
      choose activemq by default but support for rabbitmq-stomp is
      also integrated
    - debian/mcollective.postinst: Added fix for mcollective server.cfg to
      avoid daemonize if running on system with upstart
    - debian/mcollective.upstart: Added support to respect default file
      behaviour and check on daemonize option in config file

 -- Marc Cluet <email address hidden> Tue, 29 May 2012 14:52:36 +0100

[Jamie Strandboge (jdstrand)]

Thanks for the merge. The debian/changelog ommitted the changes in 1.2.1+dfsg-2ubuntu1. I then diffed the package against the version in Debian, and discovered the following undocumented changes:
 * debian/mcollective-client.config is added
 * debian/mcollective-client.templates is added
 * debian/mcollective-middleware.postinst is added
 * debian/mcollective-middleware.postrm is added
 * debian/patches/drop-init-script.patch
 * debian/patches/nodaemonize.server.patch

Can you update debian/changelog for the above? That will make it much easier to know what was changed and to review in the future. Thanks!

review: Needs Fixing

[Marc Cluet (lynxman)]

Hi Jamie,

I've just fixed all the changes and did a proper merge using the method suggested by James Page, this should be all OK now and the branch has been rewritten.

[Stefano Rivera (stefanor)]

I still see several undocumented changes:
* Updating README.Debian and dependencies to mention libsystemu-ruby instead of ruby-systemu (which looks wrong btw)
* Updating dependencies from ruby-stomp to libruby-stop (again, looks wrong)
* Rewording package descriptions
* Rewording mcollective-common and mcollective debconf questions
* Changing tabs to spaces in debian/mcollective.postinst (one wonders why)
* Pointing libdir at /usr/libexec (err, why? We don't usually use /usr/libexec)

review: Needs Fixing

[Stefano Rivera (stefanor)]

Marking this merge proposal as work-in-progress to remove it from the sponsorship queue. Please set it back to "Nedes Review" when it's ready to be reviewed again.

[Marc Cluet (lynxman)]

Fixed stefano's suggestions:

* Changed dependency for libstomp-ruby to ruby-stomp
* Changed dependency for libsystemu-ruby to ruby-systemu
* Used debian templates for mcollective and mcollective-common debconf questions
* Removed unnecessary templates for mcollective-client debconf questions

About the ones I didn't change

* Rewording package descriptions
  Package descriptions were overwritten with the ones chosen by Debian to narrow the delta
* Pointing libdir at /usr/libexec (err, why? We don't usually use /usr/libexec)
  /usr/libexec is the default location for mcollective, even if bizarre it's compatible across all platforms. It's also working this way in other Linux distributions and its the way upstream recommends as well, I wouldn't change it unless there was a very very good reason to do so.

[lp:~lynxman/ubuntu/quantal/mcollective/mcollective20]

21. By Marc Cluet on 2012-06-06

Minor changelog fixes

22. By Marc Cluet on 2012-06-06

Fixed descriptions in control file to show debian descriptions

=== renamed directory '.pc' => '.pc'
=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-11-09 18:12:27 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-pluginsdir.patch

=== removed directory '.pc/pluginsdir.patch'
=== removed directory '.pc/pluginsdir.patch/etc'
=== removed file '.pc/pluginsdir.patch/etc/client.cfg.dist'
--- .pc/pluginsdir.patch/etc/client.cfg.dist	2011-11-09 18:12:27 +0000
+++ .pc/pluginsdir.patch/etc/client.cfg.dist	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-topicprefix = /topic/
-main_collective = mcollective
-collectives = mcollective
-libdir = /usr/libexec/mcollective
-logfile = /dev/null
-loglevel = info
-
-# Plugins
-securityprovider = psk
-plugin.psk = unset
-
-connector = stomp
-plugin.stomp.host = stomp.example.com
-plugin.stomp.port = 6163
-plugin.stomp.user = mcollective
-plugin.stomp.password = marionette
-
-# Facts
-factsource = yaml
-plugin.yaml = /etc/mcollective/facts.yaml
-

=== removed file '.pc/pluginsdir.patch/etc/server.cfg.dist'
--- .pc/pluginsdir.patch/etc/server.cfg.dist	2011-11-09 18:12:27 +0000
+++ .pc/pluginsdir.patch/etc/server.cfg.dist	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-topicprefix = /topic/
-main_collective = mcollective
-collectives = mcollective
-libdir = /usr/libexec/mcollective
-logfile = /var/log/mcollective.log
-loglevel = info
-daemonize = 1
-
-# Plugins
-securityprovider = psk
-plugin.psk = unset
-
-connector = stomp
-plugin.stomp.host = stomp.example.com
-plugin.stomp.port = 6163
-plugin.stomp.user = mcollective
-plugin.stomp.password = marionette
-
-# Facts
-factsource = yaml
-plugin.yaml = /etc/mcollective/facts.yaml
-

=== renamed file 'COPYING' => 'COPYING'
=== added directory 'bin'
=== added file 'bin/mc-call-agent'
--- bin/mc-call-agent	1970-01-01 00:00:00 +0000
+++ bin/mc-call-agent	2012-06-06 17:53:29 +0000
@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+
+require 'mcollective'
+require 'pp'
+
+oparser = MCollective::Optionparser.new({:verbose => true}, "filter")
+
+options = oparser.parse{|parser, options|
+  parser.define_head "Call an agent parsing an argument to it"
+  parser.banner = "Usage: mc-call-agent [options] --agent agent --argument arg"
+
+  parser.on('-a', '--agent AGENT', 'Agent to call') do |v|
+    options[:agent] = v
+  end
+
+  parser.on('--arg', '--argument ARGUMENT', 'Argument to pass to agent') do |v|
+    options[:argument] = v
+  end
+}
+
+if options[:agent] == nil || options[:argument] == nil
+  puts("Please use either --agent or --argument")
+  exit 1
+end
+
+begin
+  options[:filter]["agent"] << options[:agent]
+
+  client = MCollective::Client.new(options[:config])
+  client.options = options
+
+  c = 0
+
+  stats = client.discovered_req(options[:argument], options[:agent]) do |resp|
+    next if resp == nil
+
+    c += 1
+
+    if options[:verbose]
+      puts("#{resp[:senderid]}>")
+      pp resp[:body]
+    else
+      puts if c % 4 == 1
+      printf("%-30s", resp[:senderid])
+    end
+  end
+
+  client.disconnect
+rescue Exception => e
+  STDERR.puts "Could not call remote agent: #{e}"
+  exit 1
+end
+
+client.display_stats(stats)

=== added file 'bin/mco'
--- bin/mco	1970-01-01 00:00:00 +0000
+++ bin/mco	2012-06-06 17:53:29 +0000
@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+require 'mcollective'
+
+Version = MCollective.version
+known_applications = MCollective::Applications.list
+
+# links from mc-ping to mc will result in ping being run
+if $0 =~ /mc\-([a-zA-Z\-_\.]+)$/
+  app_name = $1
+else
+  app_name = ARGV.first
+  ARGV.delete_at(0)
+end
+
+if known_applications.include?(app_name)
+  # make sure the various options classes shows the right help etc
+  $0 = app_name
+
+  MCollective::Applications.run(app_name)
+else
+  puts "The Marionette Collective version #{MCollective.version}"
+  puts
+  puts "usage: #{$0} command <options>"
+  puts
+  puts "Known commands:"
+  puts
+
+  known_applications.sort.uniq.in_groups_of(3) do |apps|
+    puts "   %-20s %-20s %-20s" % [apps[0], apps[1], apps[2]]
+  end
+
+  puts
+  puts "Type '#{$0} help' for a detailed list of commands and '#{$0} help command'"
+  puts "to get detailed help for a command"
+  puts
+end

=== added file 'bin/mcollectived'
--- bin/mcollectived	1970-01-01 00:00:00 +0000
+++ bin/mcollectived	2012-06-06 17:53:29 +0000
@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+require 'mcollective'
+require 'getoptlong'
+
+opts = GetoptLong.new(
+  [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+  [ '--config', '-c', GetoptLong::REQUIRED_ARGUMENT],
+  [ '--pidfile', '-p', GetoptLong::REQUIRED_ARGUMENT]
+)
+
+configfile = "/etc/mcollective/server.cfg"
+pid = ""
+
+opts.each do |opt, arg|
+  case opt
+    when '--help'
+      puts "Usage: mcollectived.rb [--config /path/to/config] [--pidfile /path/to/pid]"
+      exit
+    when '--config'
+      configfile = arg
+    when '--pidfile'
+      pid = arg
+  end
+end
+
+config = MCollective::Config.instance
+
+config.loadconfig(configfile) unless config.configured
+
+MCollective::Log.info("The Marionette Collective #{MCollective::VERSION} started logging at #{config.loglevel} level")
+
+if config.daemonize
+  MCollective::Log.debug("Starting in the background (#{config.daemonize})")
+
+  if MCollective::Util.windows?
+    require 'mcollective/windows_daemon'
+
+    MCollective::WindowsDaemon.daemonize_runner
+  else
+    require 'mcollective/unix_daemon'
+
+    MCollective::UnixDaemon.daemonize_runner(pid)
+  end
+else
+  MCollective::Log.debug("Starting in the foreground")
+  runner = MCollective::Runner.new(configfile)
+  runner.run
+end

=== renamed directory 'debian' => 'debian'
=== modified file 'debian/README.source'
--- debian/README.source	2011-11-09 18:12:27 +0000
+++ debian/README.source	2012-06-06 17:53:29 +0000
@@ -3,7 +3,7 @@
 
 This source is created by pre-stripping the embedded systemu and json library
 from the upstream tarball. The Debian package of mcollective depends on
-libsystemu-ruby and ruby-json Debian packages.
+ruby-systemu and ruby-json Debian packages.
 
 Also ext/activemq/wlcg-patch.tgz and ext/activemq/apache-activemq.spec was
 removed from Debian source tarball. It contains stuff from the ActiveMQ

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-29 17:44:49 +0000
+++ debian/changelog	2012-06-06 17:53:29 +0000
@@ -1,3 +1,33 @@
+mcollective (2.0.0+dfsg-1ubuntu1) quantal; urgency=low
+
+  * Merge from debian unstable, remaning changes
+    - debian/control: Package mcollective-middleware allows the user 
+      to install mcollective + his AMPQ server of choice, we now 
+      choose activemq by default but support for rabbitmq-stomp is 
+      also integrated
+    - debian/mcollective.postinst: Added fix for mcollective server.cfg to 
+      avoid daemonize if running on system with upstart
+    - debian/mcollective.postinst: Fixed tabs
+    - debian/mcollective.upstart: Added upstart file
+   * Added checks to avoid starting when RUN=no and when daemonize=1 
+     on the config file (incompatible with upstart script)
+
+ -- Marc Cluet <[e-mail]>  Wed, 06 Jun 2012 14:18:14 +0100
+
+mcollective (2.0.0+dfsg-1) unstable; urgency=low
+
+  * New Upstream Release
+  * d/mcollective.README.Debian: added note about the log feature
+   of ActiveMQ. Thanks to R.I.Pienaar for the advice.
+  * d/mcollective.triggers: Merged from Ubuntu package
+  * Adding initial Dutch debconf translation from
+    Jeroen Schot <[e-mail]> (Closes: #671301)
+  * d/copyright: updated to version 1.0
+  * d/control: updated standards version
+  * d/control: updated binary list of mcollective-client
+
+ -- Jonas Genannt <[e-mail]>  Sun, 27 May 2012 16:53:56 +0200
+
 mcollective (1.2.1+dfsg-2ubuntu2) quantal; urgency=low
 
   * Fixed trigger issue in mcollective.postinst (LP: #999996)

=== modified file 'debian/control'
--- debian/control	2011-11-09 18:12:27 +0000
+++ debian/control	2012-06-06 17:53:29 +0000
@@ -5,7 +5,8 @@
 XSBC-Original-Maintainer: Puppet Package Maintainers <[e-mail]>
 Uploaders: Jonas Genannt <[e-mail]>, Micah Anderson <[e-mail]>
 Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.2
+DM-Upload-Allowed: yes
+Standards-Version: 3.9.3
 Homepage: http://projects.puppetlabs.com/projects/mcollective
 Vcs-Git: git://git.debian.org/git/pkg-puppet/mcollective.git
 Vcs-Browser: http://git.debian.org/?p=pkg-puppet/mcollective.git
@@ -15,7 +16,7 @@
 Depends: ${misc:Depends}, ruby | ruby-interpreter, mcollective-common (>= ${source:Version})
 Suggests: activemq
 Recommends: mcollective-client
-Description: Build server orchestration or parallel job execution systems
+Description: Marionette Collective clustering framework - server
  The Marionette Collective is a framework for building server
  orchestration and parallel job execution systems.
  .
@@ -23,7 +24,7 @@
 
 Package: mcollective-middleware
 Architecture: all
-Depends: ${misc:Depends}, activemq | rabbitmq-stomp, mcollective
+Depends: ${misc:Depends}, activemq | rabbitmq-stomp, mcollective (>= ${source:Version})
 Description: Build server orchestration or parallel job execution systems
  The Marionette Collective aka. mcollective is a framework
  to build server orchestration or parallel job execution system
@@ -36,25 +37,19 @@
 Architecture: all
 Suggests: mcollective
 Depends: ${misc:Depends}, ruby | ruby-interpreter, mcollective-common (>= ${source:Version})
-Description: Build server orchestration or parallel job execution systems
- The Marionette Collective aka. mcollective is a framework
- to build server orchestration or parallel job execution system
+Description: Marionette Collective clustering framework - clients
+ The Marionette Collective is a framework for building server
+ orchestration and parallel job execution systems.
  .
- This package contains the MCollective client utilities:
+ This package provides the MCollective client utilities:
   * mco
-  * mc-rpc
-  * mc-facts
-  * mc-find-hosts
-  * mc-ping
   * mc-call-agent
-  * mc-controller
-  * mc-inventory
 
 Package: mcollective-common
 Architecture: all
 Suggests: mcollective-doc
-Depends: ${misc:Depends}, ruby | ruby-interpreter, rubygems, libstomp-ruby, libsystemu-ruby, ruby-json
-Description: Build server orchestration or parallel job execution systems
+Depends: ${misc:Depends}, ruby | ruby-interpreter, rubygems, ruby-stomp, ruby-systemu, ruby-json
+Description: Marionette Collective clustering framework - common files
  The Marionette Collective is a framework for building server
  orchestration and parallel job execution systems.
  .
@@ -64,7 +59,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Documentation for mcollective
+Description: Marionette Collective clustering framework - documentation
  The Marionette Collective is a framework for building server
  orchestration and parallel job execution systems.
  .

=== modified file 'debian/copyright'
--- debian/copyright	2011-11-09 18:12:27 +0000
+++ debian/copyright	2012-06-06 17:53:29 +0000
@@ -1,10 +1,10 @@
-Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=135
-Maintainer: R.I.Pienaar <[e-mail]>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: R.I.Pienaar <[e-mail]>
 Source: http://downloads.puppetlabs.com/mcollective/
-Name: Mcollective
+Upstream-Name: Mcollective
 
 Files: *
-Copyright: 2010 - 2011 Puppet Labs
+Copyright: 2010-2011 Puppet Labs
 License: Apache
 
 Files: ext/stompclient
@@ -12,12 +12,12 @@
 License: Apache
 
 Files: ext/action_helpers/perl/lib/MCollective/Action.pm
-Copyright: 2011, Richard Clamp
+Copyright: 2011 Richard Clamp <[e-mail]>
 License: Artistic or GPL-1
 
 Files: debian/*
-Copyright: 2010 - 2011, Riccardo Setti <[e-mail]>
- 2011, Jonas Genannt <[e-mail]>
+Copyright: 2010-2011 Riccardo Setti <[e-mail]>
+           2011 Jonas Genannt <[e-mail]>
 License: Apache
 
 License: Apache

=== removed file 'debian/mcollective-client.config'
--- debian/mcollective-client.config	2011-06-27 10:09:19 +0000
+++ debian/mcollective-client.config	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-# A simplified version of debconf's own config script.
-. /usr/share/debconf/confmodule
-# Ask for the stomp host
-db_get mcollective/stomp_host || true
-[ -z "$RET" ] && db_set mcollective/stomp_host "$(hostname)"
-db_input high mcollective/stomp_host || true
-db_input medium mcollective/psk_key || true
-db_go

=== removed file 'debian/mcollective-client.templates'
--- debian/mcollective-client.templates	2011-07-11 06:49:27 +0000
+++ debian/mcollective-client.templates	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-Template: mcollective/stomp_host
-Type: string
-_Description: Location of the STOMP MPQ server:
-   mcollective depends on a STOMP server to pass messages
-   amongst the collective.
-
-Template: mcollective/psk_key
-Type: password
-_Description: PSK Key for mcollective:
-   mcollective encrypts all its messages using a pre-shared key (PSK)
-   by default it'll be set to "unset", you should change this

=== added file 'debian/mcollective-common.NEWS'
--- debian/mcollective-common.NEWS	1970-01-01 00:00:00 +0000
+++ debian/mcollective-common.NEWS	2012-06-06 17:53:29 +0000
@@ -0,0 +1,10 @@
+mcollective (2.0.0+dfsg-1) unstable; urgency=low
+
+   This release is not compatible with older versions. Client scripts and agents
+   written for older versions will continue to work but a network hosting both
+   2.0.0 clients and older one will effectively be split into 2 networks. While
+   planning your upgrade you should plan to have machines running the client for
+   both versions to retain full control during upgrade. The upgrade is best done
+   in an scheduled window where all machines are updated together.
+
+ -- Jonas Genannt <[e-mail]>  Sun, 27 May 2012 16:53:56 +0200

=== modified file 'debian/mcollective-common.templates'
--- debian/mcollective-common.templates	2011-11-09 18:12:27 +0000
+++ debian/mcollective-common.templates	2012-06-06 17:53:29 +0000
@@ -1,31 +1,42 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# [e-mail] for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: mcollective/security_psk
 Type: string
 Default: unset
-_Description: Security PSK key for all MCollective instances:
- Please specify the psk for security within your MCollective
- instances
+_Description: MCollective PSK:
+ Please specify the Pre-Shared Key that should be used between
+ MCollective instances.
 
 Template: mcollective/stomp_host
 Type: string
 Default: localhost
-_Description: Hostname of your ActiveMQ host:
- Please specify the hostname/ip address of your Message Queue
- server (Apache ActiceMQ).
+_Description: Message Queue server host:
+ Please specify the hostname or IP address of the Message Queue server
+ for MCollective.
 
 Template: mcollective/stomp_port
 Type: string
 Default: 6163
-_Description: Port of your ActiveMQ instance:
- Please specify the port of your Message Queue server (Apache ActiveMQ).
+_Description: Message Queue server port:
+ Please specify the listening port of the Message Queue server.
 
 Template: mcollective/stomp_user
 Type: string
 Default: mcollective
-_Description: STOMP user from your ActiveMQ instance:
- Please specify the username of your Message Queue server (Apache ActiveMQ).
+_Description: Message Queue server username:
+ Please specify the STOMP username that should be used with the
+ Message Queue server.
 
 Template: mcollective/stomp_password
 Type: password
 Default: marionette
-_Description: STOMP password from your ActiveMQ instance:
- Please specify the password of your Message Queue server (Apache ActiveMQ).
+_Description: Message Queue server password:
+ Please specify the STOMP password that should be used with the
+ Message Queue server.

=== modified file 'debian/mcollective.README.Debian'
--- debian/mcollective.README.Debian	2011-06-18 16:44:23 +0000
+++ debian/mcollective.README.Debian	2012-06-06 17:53:29 +0000
@@ -38,6 +38,11 @@
 
 Edit configuration, setup new password and username.
 
+In case you need logging:
+
+ # cp /etc/activemq/instances-available/main/log4j.properties \
+   /etc/activemq/instances-available/mcollective/
+
 Register new ActiveMQ instance:
 
  # ln -s /etc/activemq/instances-available/mcollective \
@@ -47,4 +52,12 @@
 
  # invoke-rc.d activemq start
 
+
+ActiveMQ Log configuration:
+--------------------------
+
+By default ActiveMQ does not log. To enabled logging you need to copy
+the file /etc/activemq/instances-available/main/log4j.properties into
+your MCollective instance configuration directory. Than restart your ActiveMQ.
+
  -- Jonas Genannt <[e-mail]>  Mon 25 Jul 2011 20:36:23 +0200

=== modified file 'debian/mcollective.postinst'
--- debian/mcollective.postinst	2012-05-29 17:44:49 +0000
+++ debian/mcollective.postinst	2012-06-06 17:53:29 +0000
@@ -13,58 +13,58 @@
 MCOLLECTIVE_SERVER_CFG="/etc/mcollective/server.cfg"
 
 case "$1" in
-	configure)
-		db_version 2.0
-
-		if [ ! -e "$MCOLLECTIVE_SERVER_CFG" ]; then
-			cp /usr/share/mcollective/server.cfg $MCOLLECTIVE_SERVER_CFG
-		fi
-
-		if [ -f /etc/init/mcollective.conf ]; then
-			sed -i "s@^daemonize.*@daemonize = 0@" $MCOLLECTIVE_SERVER_CFG
-		fi
-
-		chmod 600 $MCOLLECTIVE_SERVER_CFG
-
-		db_get mcollective/start_on_boot
-		MC_START_ONBOOT=${RET:-no}
-		if [ "$MC_START_ONBOOT" = "true" ]; then
-			MC_START_ONBOOT=yes
-		else
-			MC_START_ONBOOT=no
-		fi
-
-		db_get mcollective/security_psk
-		MC_SECURITY_PSK=${RET:-}
-
-		db_get mcollective/stomp_host
-		MC_STOMP_HOST=${RET:-}
-
-		db_get mcollective/stomp_port
-		MC_STOMP_PORT=${RET:-}
-
-		db_get mcollective/stomp_user
-		MC_STOMP_USER=${RET:-}
-
-		db_get mcollective/stomp_password
-		MC_STOMP_PASSWORD=${RET:-}
-
-		sed -i "s@^plugin.psk.*@plugin.psk = $MC_SECURITY_PSK@" $MCOLLECTIVE_SERVER_CFG
-		sed -i "s@^plugin.stomp.host.*@plugin.stomp.host= $MC_STOMP_HOST@" $MCOLLECTIVE_SERVER_CFG
-		sed -i "s@^plugin.stomp.port.*@plugin.stomp.port= $MC_STOMP_PORT@" $MCOLLECTIVE_SERVER_CFG
-		sed -i "s@^plugin.stomp.user.*@plugin.stomp.user= $MC_STOMP_USER@" $MCOLLECTIVE_SERVER_CFG
-		sed -i "s@^plugin.stomp.password.*@plugin.stomp.password= $MC_STOMP_PASSWORD@" $MCOLLECTIVE_SERVER_CFG
-
-		sed -i "s@^RUN.*@RUN=$MC_START_ONBOOT@" /etc/default/mcollective
-
-		db_stop
-	;;
-	abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-	*)
-		echo "postinst called with unknown argument \`${1}'" >&2
-		exit 1
-	;;
+    configure)
+        db_version 2.0
+
+        if [ ! -e "$MCOLLECTIVE_SERVER_CFG" ]; then
+            cp /usr/share/mcollective/server.cfg $MCOLLECTIVE_SERVER_CFG
+        fi
+
+        if [ -f /etc/init/mcollective.conf ]; then
+            sed -i "s@^daemonize.*@daemonize = 0@" $MCOLLECTIVE_SERVER_CFG
+        fi
+
+        chmod 600 $MCOLLECTIVE_SERVER_CFG
+
+        db_get mcollective/start_on_boot
+        MC_START_ONBOOT=${RET:-no}
+        if [ "$MC_START_ONBOOT" = "true" ]; then
+            MC_START_ONBOOT=yes
+        else
+            MC_START_ONBOOT=no
+        fi
+
+        db_get mcollective/security_psk
+        MC_SECURITY_PSK=${RET:-}
+
+        db_get mcollective/stomp_host
+        MC_STOMP_HOST=${RET:-}
+
+        db_get mcollective/stomp_port
+        MC_STOMP_PORT=${RET:-}
+
+        db_get mcollective/stomp_user
+        MC_STOMP_USER=${RET:-}
+
+        db_get mcollective/stomp_password
+        MC_STOMP_PASSWORD=${RET:-}
+
+        sed -i "s@^plugin.psk.*@plugin.psk = $MC_SECURITY_PSK@" $MCOLLECTIVE_SERVER_CFG
+        sed -i "s@^plugin.stomp.host.*@plugin.stomp.host= $MC_STOMP_HOST@" $MCOLLECTIVE_SERVER_CFG
+        sed -i "s@^plugin.stomp.port.*@plugin.stomp.port= $MC_STOMP_PORT@" $MCOLLECTIVE_SERVER_CFG
+        sed -i "s@^plugin.stomp.user.*@plugin.stomp.user= $MC_STOMP_USER@" $MCOLLECTIVE_SERVER_CFG
+        sed -i "s@^plugin.stomp.password.*@plugin.stomp.password= $MC_STOMP_PASSWORD@" $MCOLLECTIVE_SERVER_CFG
+
+        sed -i "s@^RUN.*@RUN=$MC_START_ONBOOT@" /etc/default/mcollective
+
+        db_stop
+    ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+    *)
+        echo "postinst called with unknown argument \`${1}'" >&2
+        exit 1
+    ;;
 esac
 
 #DEBHELPER#

=== modified file 'debian/mcollective.templates'
--- debian/mcollective.templates	2011-11-09 18:12:27 +0000
+++ debian/mcollective.templates	2012-06-06 17:53:29 +0000
@@ -1,5 +1,15 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# [e-mail] for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: mcollective/start_on_boot
 Type: boolean
 Default: false
-_Description: Should MCollective started onboot?
- Start MCollective daemon onboot.
+_Description: Start MCollective on boot?
+ Please choose whether the MCollective daemon should be started when
+ booting this machine.

=== modified file 'debian/mcollective.upstart'
--- debian/mcollective.upstart	2011-11-09 18:12:27 +0000
+++ debian/mcollective.upstart	2012-06-06 17:53:29 +0000
@@ -5,5 +5,20 @@
 stop on runlevel [!2345]
 respawn
 
+pre-start script
+ # Check that our configuration file is sane
+ if [ "$(cat /etc/mcollective/server.cfg | grep ^daemonize | awk -F"=" '{print $NF}' | tr -d " ")" -ne "0" ]
+    then
+    logger -is -t "$UPSTART_JOB" "ERROR: mcollective config in server.cfg sets daemonize=1, not compatible with upstart scripts, aborting start"
+    exit 1
+ fi
+ # Check that we're allowed to start
+ if [ "$(cat /etc/default/mcollective | grep -i ^run | awk '{print $NF}')" = "no" ]
+    then
+    logger -is -t "$UPSTART_JOB" "ERROR: mcollective default is set to RUN=no, edit /etc/default/mcollective to change behaviour"
+    exit 1
+ fi
+end script
+
 env RUBYLIB=/usr/local/lib/site_ruby/1.8:$RUBYLIB
 exec /usr/sbin/mcollectived --pid="/var/run/mcollectived.pid" --config="/etc/mcollective/server.cfg"

=== modified file 'debian/patches/pluginsdir.patch'
--- debian/patches/pluginsdir.patch	2011-11-09 18:12:27 +0000
+++ debian/patches/pluginsdir.patch	2012-06-06 17:53:29 +0000
@@ -1,30 +1,24 @@
-Description: Move plugins dir, change stomp host
+Description: Move plugins dir
 Author: <[e-mail]>
 Upstream: no
-diff -uNr mcollective-1.2.0.orig/etc/client.cfg.dist mcollective-1.2.0/etc/client.cfg.dist
---- mcollective-1.2.0.orig/etc/client.cfg.dist	2011-04-29 06:38:26.000000000 -0700
-+++ mcollective-1.2.0/etc/client.cfg.dist	2011-05-05 07:34:31.503846649 -0700
+
+diff --git a/etc/client.cfg.dist b/etc/client.cfg.dist
+index 3ad4203..dfb6530 100644
+--- a/etc/client.cfg.dist
++++ b/etc/client.cfg.dist
 @@ -1,7 +1,7 @@
  topicprefix = /topic/
  main_collective = mcollective
  collectives = mcollective
 -libdir = /usr/libexec/mcollective
 +libdir = /usr/share/mcollective/plugins
- logfile = /dev/null
- loglevel = info
- 
-@@ -10,7 +10,7 @@
- plugin.psk = unset
- 
- connector = stomp
--plugin.stomp.host = stomp.example.com
-+plugin.stomp.host = localhost
- plugin.stomp.port = 6163
- plugin.stomp.user = mcollective
- plugin.stomp.password = marionette
-diff -uNr mcollective-1.2.0.orig/etc/server.cfg.dist mcollective-1.2.0/etc/server.cfg.dist
---- mcollective-1.2.0.orig/etc/server.cfg.dist	2011-04-29 06:38:26.000000000 -0700
-+++ mcollective-1.2.0/etc/server.cfg.dist	2011-05-05 07:34:44.900541658 -0700
+ logger_type = console
+ loglevel = warn
+ 
+diff --git a/etc/server.cfg.dist b/etc/server.cfg.dist
+index 4fec901..487f64e 100644
+--- a/etc/server.cfg.dist
++++ b/etc/server.cfg.dist
 @@ -1,7 +1,7 @@
  topicprefix = /topic/
  main_collective = mcollective
@@ -34,12 +28,3 @@
  logfile = /var/log/mcollective.log
  loglevel = info
  daemonize = 1
-@@ -11,7 +11,7 @@
- plugin.psk = unset
- 
- connector = stomp
--plugin.stomp.host = stomp.example.com
-+plugin.stomp.host = localhost
- plugin.stomp.port = 6163
- plugin.stomp.user = mcollective
- plugin.stomp.password = marionette

=== added file 'debian/po/nl.po'
--- debian/po/nl.po	1970-01-01 00:00:00 +0000
+++ debian/po/nl.po	2012-06-06 17:53:29 +0000
@@ -0,0 +1,109 @@
+# Dutch translation of mcollective debconf templates.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the mcollective package.
+# Jeroen Schot <[e-mail]>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mcollective 1.2.1+dfsg-2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-10-10 07:09+0200\n"
+"PO-Revision-Date: 2012-05-03 09:27+0200\n"
+"Last-Translator: Jeroen Schot <[e-mail]>\n"
+"Language-Team: Debian l10n Dutch <[e-mail]>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../mcollective-common.templates:2001
+msgid "MCollective PSK:"
+msgstr "MCollective PSK:"
+
+#. Type: string
+#. Description
+#: ../mcollective-common.templates:2001
+msgid ""
+"Please specify the Pre-Shared Key that should be used between MCollective "
+"instances."
+msgstr ""
+"Geef de vooraf gedeelde sleutel (PSK) die gebruikt moet worden tussen de "
+"verschillende MCollective-instanties."
+
+#. Type: string
+#. Description
+#: ../mcollective-common.templates:3001
+msgid "Message Queue server host:"
+msgstr "Message-Qeueu-server:"
+
+#. Type: string
+#. Description
+#: ../mcollective-common.templates:3001
+msgid ""
+"Please specify the hostname or IP address of the Message Queue server for "
+"MCollective."
+msgstr ""
+"Wat is de computernaam of het IP-adres van de Message-Queue-server voor "
+"MCollective?"
+
+#. Type: string
+#. Description
+#: ../mcollective-common.templates:4001
+msgid "Message Queue server port:"
+msgstr "Message-Queue-serverpoort:"
+
+#. Type: string
+#. Description
+#: ../mcollective-common.templates:4001
+msgid "Please specify the listening port of the Message Queue server."
+msgstr "Op welke poort moet de Message-Queue-server luisteren?"
+
+#. Type: string
+#. Description
+#: ../mcollective-common.templates:5001
+msgid "Message Queue server username:"
+msgstr "Message Queue-servergebruikersnaam:"
+
+#. Type: string
+#. Description
+#: ../mcollective-common.templates:5001
+msgid ""
+"Please specify the STOMP username that should be used with the Message Queue "
+"server."
+msgstr ""
+"Welke STOMP-gebruikersnaam moet er worden gebruikt met de Message-Queue-"
+"server?"
+
+#. Type: password
+#. Description
+#: ../mcollective-common.templates:6001
+msgid "Message Queue server password:"
+msgstr "Message-Queue-serverwachtwoord:"
+
+#. Type: password
+#. Description
+#: ../mcollective-common.templates:6001
+msgid ""
+"Please specify the STOMP password that should be used with the Message Queue "
+"server."
+msgstr ""
+"Wat is het STOMP-wachtwoord dat moet worden gebruikt met de Message-Queue-"
+"server?"
+
+#. Type: boolean
+#. Description
+#: ../mcollective.templates:2001
+msgid "Start MCollective on boot?"
+msgstr "Mcollective opstarten bij de systeemstart?"
+
+#. Type: boolean
+#. Description
+#: ../mcollective.templates:2001
+msgid ""
+"Please choose whether the MCollective daemon should be started when booting "
+"this machine."
+msgstr ""
+"Geef aan of de MCollective-achtergronddienst moet worden opgestart bij het "
+"starten van deze computer."

=== renamed directory 'doc' => 'doc'
=== modified file 'doc/classes/Array.html'
--- doc/classes/Array.html	2011-11-09 18:12:27 +0000
+++ doc/classes/Array.html	2012-06-06 17:53:29 +0000
@@ -55,8 +55,8 @@
         <tr class="top-aligned-row">
             <td><strong>In:</strong></td>
             <td>
-                <a href="../files/plugins/mcollective/application/inventory_rb.html">
-                plugins/mcollective/application/inventory.rb
+                <a href="../files/lib/mcollective/monkey_patches_rb.html">
+                lib/mcollective/monkey_patches.rb
                 </a>
         <br />
             </td>
@@ -65,9 +65,7 @@
         <tr class="top-aligned-row">
             <td><strong>Parent:</strong></td>
             <td>
-                <a href="Object.html">
                 Object
-               </a>
             </td>
         </tr>
         </table>
@@ -82,8 +80,7 @@
 
     <div id="description">
       <p>
-Monkey patching array with a <a href="Array.html#M000002">in_groups_of</a>
-method that walks an array in groups, pass a block to call the block on
+a method # that walks an array in groups, pass a block to call the block on
 each sub array
 </p>
 
@@ -96,7 +93,7 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000002">in_groups_of</a>&nbsp;&nbsp;
+      <a href="#M000003">in_groups_of</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -118,43 +115,52 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000002" class="method-detail">
-        <a name="M000002"></a>
+      <div id="method-M000003" class="method-detail">
+        <a name="M000003"></a>
 
         <div class="method-heading">
-          <a href="#M000002" class="method-signature">
+          <a href="#M000003" class="method-signature">
           <span class="method-name">in_groups_of</span><span class="method-args">(chunk_size, padded_with=nil) {|a| ...}</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000002-source">
+            onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000003-source">
 <pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/inventory.rb, line 7</span>
- 7:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">in_groups_of</span>(<span class="ruby-identifier">chunk_size</span>, <span class="ruby-identifier">padded_with</span>=<span class="ruby-keyword kw">nil</span>)
- 8:         <span class="ruby-identifier">arr</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">clone</span>
- 9: 
-10:         <span class="ruby-comment cmt"># how many to add</span>
-11:         <span class="ruby-identifier">padding</span> = <span class="ruby-identifier">chunk_size</span> <span class="ruby-operator">-</span> (<span class="ruby-identifier">arr</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">%</span> <span class="ruby-identifier">chunk_size</span>)
-12: 
-13:         <span class="ruby-comment cmt"># pad at the end</span>
-14:         <span class="ruby-identifier">arr</span>.<span class="ruby-identifier">concat</span>([<span class="ruby-identifier">padded_with</span>] <span class="ruby-operator">*</span> <span class="ruby-identifier">padding</span>)
-15: 
-16:         <span class="ruby-comment cmt"># how many chunks we'll make</span>
-17:         <span class="ruby-identifier">count</span> = <span class="ruby-identifier">arr</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">/</span> <span class="ruby-identifier">chunk_size</span>
-18: 
-19:         <span class="ruby-comment cmt"># make that many arrays</span>
-20:         <span class="ruby-identifier">result</span> = []
-21:         <span class="ruby-identifier">count</span>.<span class="ruby-identifier">times</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">s</span><span class="ruby-operator">|</span> <span class="ruby-identifier">result</span> <span class="ruby-operator">&lt;&lt;</span>  <span class="ruby-identifier">arr</span>[<span class="ruby-identifier">s</span> <span class="ruby-operator">*</span> <span class="ruby-identifier">chunk_size</span>, <span class="ruby-identifier">chunk_size</span>]}
-22: 
-23:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
-24:             <span class="ruby-identifier">result</span>.<span class="ruby-identifier">each</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">a</span><span class="ruby-operator">|</span> <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">a</span>)}
-25:         <span class="ruby-keyword kw">else</span>
-26:             <span class="ruby-identifier">result</span>
-27:         <span class="ruby-keyword kw">end</span>
-28:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/mcollective/monkey_patches.rb, line 21</span>
+21:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">in_groups_of</span>(<span class="ruby-identifier">chunk_size</span>, <span class="ruby-identifier">padded_with</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">block</span>)
+22:     <span class="ruby-identifier">arr</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">clone</span>
+23: 
+24:     <span class="ruby-comment cmt"># how many to add</span>
+25:     <span class="ruby-identifier">padding</span> = <span class="ruby-identifier">chunk_size</span> <span class="ruby-operator">-</span> (<span class="ruby-identifier">arr</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">%</span> <span class="ruby-identifier">chunk_size</span>)
+26: 
+27:     <span class="ruby-comment cmt"># pad at the end</span>
+28:     <span class="ruby-identifier">arr</span>.<span class="ruby-identifier">concat</span>([<span class="ruby-identifier">padded_with</span>] <span class="ruby-operator">*</span> <span class="ruby-identifier">padding</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">padding</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">chunk_size</span>
+29: 
+30:     <span class="ruby-comment cmt"># how many chunks we'll make</span>
+31:     <span class="ruby-identifier">count</span> = <span class="ruby-identifier">arr</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">/</span> <span class="ruby-identifier">chunk_size</span>
+32: 
+33:     <span class="ruby-comment cmt"># make that many arrays</span>
+34:     <span class="ruby-identifier">result</span> = []
+35:     <span class="ruby-identifier">count</span>.<span class="ruby-identifier">times</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">s</span><span class="ruby-operator">|</span> <span class="ruby-identifier">result</span> <span class="ruby-operator">&lt;&lt;</span>  <span class="ruby-identifier">arr</span>[<span class="ruby-identifier">s</span> <span class="ruby-operator">*</span> <span class="ruby-identifier">chunk_size</span>, <span class="ruby-identifier">chunk_size</span>]}
+36: 
+37:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+38:       <span class="ruby-identifier">result</span>.<span class="ruby-identifier">each_with_index</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">a</span>, <span class="ruby-identifier">i</span><span class="ruby-operator">|</span>
+39:         <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">block</span>.<span class="ruby-identifier">arity</span>
+40:           <span class="ruby-keyword kw">when</span> <span class="ruby-value">1</span>
+41:             <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">a</span>)
+42:           <span class="ruby-keyword kw">when</span> <span class="ruby-value">2</span>
+43:             <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">a</span>, (<span class="ruby-identifier">i</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">result</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">-</span> <span class="ruby-value">1</span>))
+44:           <span class="ruby-keyword kw">else</span>
+45:             <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Expected 1 or 2 arguments, got #{block.arity}&quot;</span>
+46:         <span class="ruby-keyword kw">end</span>
+47:       <span class="ruby-keyword kw">end</span>
+48:     <span class="ruby-keyword kw">else</span>
+49:       <span class="ruby-identifier">result</span>
+50:     <span class="ruby-keyword kw">end</span>
+51:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

=== added file 'doc/classes/Dir.html'
--- doc/classes/Dir.html	1970-01-01 00:00:00 +0000
+++ doc/classes/Dir.html	2012-06-06 17:53:29 +0000
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>Class: Dir</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <meta http-equiv="Content-Script-Type" content="text/javascript" />
+  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
+  <script type="text/javascript">
+  // <![CDATA[
+
+  function popupCode( url ) {
+    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
+  }
+
+  function toggleCode( id ) {
+    if ( document.getElementById )
+      elem = document.getElementById( id );
+    else if ( document.all )
+      elem = eval( "document.all." + id );
+    else
+      return false;
+
+    elemStyle = elem.style;
+    
+    if ( elemStyle.display != "block" ) {
+      elemStyle.display = "block"
+    } else {
+      elemStyle.display = "none"
+    }
+
+    return true;
+  }
+  
+  // Make codeblocks hidden by default
+  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
+  
+  // ]]>
+  </script>
+
+</head>
+<body>
+
+
+
+    <div id="classHeader">
+        <table class="header-table">
+        <tr class="top-aligned-row">
+          <td><strong>Class</strong></td>
+          <td class="class-name-in-header">Dir</td>
+        </tr>
+        <tr class="top-aligned-row">
+            <td><strong>In:</strong></td>
+            <td>
+                <a href="../files/lib/mcollective/monkey_patches_rb.html">
+                lib/mcollective/monkey_patches.rb
+                </a>
+        <br />
+            </td>
+        </tr>
+
+        <tr class="top-aligned-row">
+            <td><strong>Parent:</strong></td>
+            <td>
+                Object
+            </td>
+        </tr>
+        </table>
+    </div>
+  <!-- banner header -->
+
+  <div id="bodyContent">
+
+
+
+  <div id="contextContent">
+
+
+
+   </div>
+
+    <div id="method-list">
+      <h3 class="section-bar">Methods</h3>
+
+      <div class="name-list">
+      <a href="#M000001">mktmpdir</a>&nbsp;&nbsp;
+      <a href="#M000002">tmpdir</a>&nbsp;&nbsp;
+      </div>
+    </div>
+
+  </div>
+
+
+    <!-- if includes -->
+
+    <div id="section">
+
+
+
+
+
+      
+
+
+    <!-- if method_list -->
+    <div id="methods">
+      <h3 class="section-bar">Public Class methods</h3>
+
+      <div id="method-M000001" class="method-detail">
+        <a name="M000001"></a>
+
+        <div class="method-heading">
+          <a href="#M000001" class="method-signature">
+          <span class="method-name">mktmpdir</span><span class="method-args">(prefix_suffix=nil, tmpdir=nil) {|path| ...}</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000001-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000001-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/mcollective/monkey_patches.rb, line 55</span>
+55:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">mktmpdir</span>(<span class="ruby-identifier">prefix_suffix</span>=<span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">tmpdir</span>=<span class="ruby-keyword kw">nil</span>)
+56:     <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">prefix_suffix</span>
+57:     <span class="ruby-keyword kw">when</span> <span class="ruby-keyword kw">nil</span>
+58:       <span class="ruby-identifier">prefix</span> = <span class="ruby-value str">&quot;d&quot;</span>
+59:       <span class="ruby-identifier">suffix</span> = <span class="ruby-value str">&quot;&quot;</span>
+60:     <span class="ruby-keyword kw">when</span> <span class="ruby-constant">String</span>
+61:       <span class="ruby-identifier">prefix</span> = <span class="ruby-identifier">prefix_suffix</span>
+62:       <span class="ruby-identifier">suffix</span> = <span class="ruby-value str">&quot;&quot;</span>
+63:     <span class="ruby-keyword kw">when</span> <span class="ruby-constant">Array</span>
+64:       <span class="ruby-identifier">prefix</span> = <span class="ruby-identifier">prefix_suffix</span>[<span class="ruby-value">0</span>]
+65:       <span class="ruby-identifier">suffix</span> = <span class="ruby-identifier">prefix_suffix</span>[<span class="ruby-value">1</span>]
+66:     <span class="ruby-keyword kw">else</span>
+67:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-node">&quot;unexpected prefix_suffix: #{prefix_suffix.inspect}&quot;</span>
+68:     <span class="ruby-keyword kw">end</span>
+69:     <span class="ruby-identifier">tmpdir</span> <span class="ruby-operator">||=</span> <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">tmpdir</span>
+70:     <span class="ruby-identifier">t</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>.<span class="ruby-identifier">strftime</span>(<span class="ruby-value str">&quot;%Y%m%d&quot;</span>)
+71:     <span class="ruby-identifier">n</span> = <span class="ruby-keyword kw">nil</span>
+72:     <span class="ruby-keyword kw">begin</span>
+73:       <span class="ruby-identifier">path</span> = <span class="ruby-node">&quot;#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}&quot;</span>
+74:       <span class="ruby-identifier">path</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;-#{n}&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">n</span>
+75:       <span class="ruby-identifier">path</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">suffix</span>
+76:       <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">mkdir</span>(<span class="ruby-identifier">path</span>, <span class="ruby-value">0700</span>)
+77:     <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">EEXIST</span>
+78:       <span class="ruby-identifier">n</span> <span class="ruby-operator">||=</span> <span class="ruby-value">0</span>
+79:       <span class="ruby-identifier">n</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>
+80:       <span class="ruby-keyword kw">retry</span>
+81:     <span class="ruby-keyword kw">end</span>
+82: 
+83:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+84:       <span class="ruby-keyword kw">begin</span>
+85:         <span class="ruby-keyword kw">yield</span> <span class="ruby-identifier">path</span>
+86:       <span class="ruby-keyword kw">ensure</span>
+87:         <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">remove_entry_secure</span> <span class="ruby-identifier">path</span>
+88:       <span class="ruby-keyword kw">end</span>
+89:     <span class="ruby-keyword kw">else</span>
+90:       <span class="ruby-identifier">path</span>
+91:     <span class="ruby-keyword kw">end</span>
+92:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000002" class="method-detail">
+        <a name="M000002"></a>
+
+        <div class="method-heading">
+          <a href="#M000002" class="method-signature">
+          <span class="method-name">tmpdir</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000002-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000002-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/monkey_patches.rb, line 94</span>
+ 94:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">tmpdir</span>
+ 95:     <span class="ruby-identifier">tmp</span> = <span class="ruby-value str">'.'</span>
+ 96:     <span class="ruby-keyword kw">for</span> <span class="ruby-identifier">dir</span> <span class="ruby-keyword kw">in</span> [<span class="ruby-constant">ENV</span>[<span class="ruby-value str">'TMPDIR'</span>], <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'TMP'</span>], <span class="ruby-constant">ENV</span>[<span class="ruby-value str">'TEMP'</span>], <span class="ruby-value str">'/tmp'</span>]
+ 97:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">dir</span> <span class="ruby-keyword kw">and</span> <span class="ruby-identifier">stat</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">stat</span>(<span class="ruby-identifier">dir</span>) <span class="ruby-keyword kw">and</span> <span class="ruby-identifier">stat</span>.<span class="ruby-identifier">directory?</span> <span class="ruby-keyword kw">and</span> <span class="ruby-identifier">stat</span>.<span class="ruby-identifier">writable?</span>
+ 98:         <span class="ruby-identifier">tmp</span> = <span class="ruby-identifier">dir</span>
+ 99:         <span class="ruby-keyword kw">break</span>
+100:       <span class="ruby-keyword kw">end</span> <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
+101:     <span class="ruby-keyword kw">end</span>
+102:     <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>(<span class="ruby-identifier">tmp</span>)
+103:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+
+    </div>
+
+
+  </div>
+
+
+<div id="validator-badges">
+  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+
+</body>
+</html>
\ No newline at end of file

=== modified file 'doc/classes/MCollective.html'
--- doc/classes/MCollective.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective.html	2012-06-06 17:53:29 +0000
@@ -55,106 +55,6 @@
         <tr class="top-aligned-row">
             <td><strong>In:</strong></td>
             <td>
-                <a href="../files/spec/unit/facts_spec_rb.html">
-                spec/unit/facts_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/optionparser_spec_rb.html">
-                spec/unit/optionparser_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/pluginmanager_spec_rb.html">
-                spec/unit/pluginmanager_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/log_spec_rb.html">
-                spec/unit/log_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/vendor_spec_rb.html">
-                spec/unit/vendor_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/shell_spec_rb.html">
-                spec/unit/shell_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/application_spec_rb.html">
-                spec/unit/application_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/rpc/actionrunner_spec_rb.html">
-                spec/unit/rpc/actionrunner_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/rpc/reply_spec_rb.html">
-                spec/unit/rpc/reply_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/rpc/request_spec_rb.html">
-                spec/unit/rpc/request_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/rpc/agent_spec_rb.html">
-                spec/unit/rpc/agent_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/rpc/result_spec_rb.html">
-                spec/unit/rpc/result_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/rpc/stats_spec_rb.html">
-                spec/unit/rpc/stats_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/config_spec_rb.html">
-                spec/unit/config_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/applications_spec_rb.html">
-                spec/unit/applications_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/util_spec_rb.html">
-                spec/unit/util_spec.rb
-                </a>
-        <br />
-                <a href="../files/spec/unit/ssl_spec_rb.html">
-                spec/unit/ssl_spec.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/logger_rb.html">
-                lib/mcollective/logger.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/pluginmanager_rb.html">
-                lib/mcollective/pluginmanager.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/optionparser_rb.html">
-                lib/mcollective/optionparser.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/vendor_rb.html">
-                lib/mcollective/vendor.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/runnerstats_rb.html">
-                lib/mcollective/runnerstats.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/application_rb.html">
-                lib/mcollective/application.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/runner_rb.html">
-                lib/mcollective/runner.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/security/base_rb.html">
-                lib/mcollective/security/base.rb
-                </a>
-        <br />
                 <a href="../files/lib/mcollective/logger/syslog_logger_rb.html">
                 lib/mcollective/logger/syslog_logger.rb
                 </a>
@@ -171,96 +71,80 @@
                 lib/mcollective/logger/file_logger.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/util_rb.html">
-                lib/mcollective/util.rb
+                <a href="../files/lib/mcollective/optionparser_rb.html">
+                lib/mcollective/optionparser.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/facts/base_rb.html">
-                lib/mcollective/facts/base.rb
+                <a href="../files/lib/mcollective/registration_rb.html">
+                lib/mcollective/registration.rb
                 </a>
         <br />
                 <a href="../files/lib/mcollective/log_rb.html">
                 lib/mcollective/log.rb
                 </a>
         <br />
+                <a href="../files/lib/mcollective/agents_rb.html">
+                lib/mcollective/agents.rb
+                </a>
+        <br />
                 <a href="../files/lib/mcollective/connector/base_rb.html">
                 lib/mcollective/connector/base.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/request_rb.html">
-                lib/mcollective/request.rb
+                <a href="../files/lib/mcollective/runner_rb.html">
+                lib/mcollective/runner.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/connector_rb.html">
-                lib/mcollective/connector.rb
+                <a href="../files/lib/mcollective/registration/base_rb.html">
+                lib/mcollective/registration/base.rb
                 </a>
         <br />
                 <a href="../files/lib/mcollective/ssl_rb.html">
                 lib/mcollective/ssl.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/shell_rb.html">
-                lib/mcollective/shell.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/security_rb.html">
-                lib/mcollective/security.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/agents_rb.html">
-                lib/mcollective/agents.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/facts_rb.html">
-                lib/mcollective/facts.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/config_rb.html">
-                lib/mcollective/config.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/rpc_rb.html">
-                lib/mcollective/rpc.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/registration_rb.html">
-                lib/mcollective/registration.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/client_rb.html">
-                lib/mcollective/client.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/rpc/ddl_rb.html">
-                lib/mcollective/rpc/ddl.rb
-                </a>
-        <br />
-                <a href="../files/lib/mcollective/rpc/stats_rb.html">
-                lib/mcollective/rpc/stats.rb
+                <a href="../files/lib/mcollective/application_rb.html">
+                lib/mcollective/application.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/matcher/scanner_rb.html">
+                lib/mcollective/matcher/scanner.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/matcher/parser_rb.html">
+                lib/mcollective/matcher/parser.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/rpc/reply_rb.html">
+                lib/mcollective/rpc/reply.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/rpc/request_rb.html">
+                lib/mcollective/rpc/request.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/rpc/audit_rb.html">
+                lib/mcollective/rpc/audit.rb
                 </a>
         <br />
                 <a href="../files/lib/mcollective/rpc/result_rb.html">
                 lib/mcollective/rpc/result.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/rpc/agent_rb.html">
-                lib/mcollective/rpc/agent.rb
-                </a>
-        <br />
                 <a href="../files/lib/mcollective/rpc/progress_rb.html">
                 lib/mcollective/rpc/progress.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/rpc/request_rb.html">
-                lib/mcollective/rpc/request.rb
-                </a>
-        <br />
                 <a href="../files/lib/mcollective/rpc/actionrunner_rb.html">
                 lib/mcollective/rpc/actionrunner.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/rpc/audit_rb.html">
-                lib/mcollective/rpc/audit.rb
+                <a href="../files/lib/mcollective/rpc/agent_rb.html">
+                lib/mcollective/rpc/agent.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/rpc/ddl_rb.html">
+                lib/mcollective/rpc/ddl.rb
                 </a>
         <br />
                 <a href="../files/lib/mcollective/rpc/client_rb.html">
@@ -271,74 +155,98 @@
                 lib/mcollective/rpc/helpers.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/rpc/reply_rb.html">
-                lib/mcollective/rpc/reply.rb
+                <a href="../files/lib/mcollective/rpc/stats_rb.html">
+                lib/mcollective/rpc/stats.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/shell_rb.html">
+                lib/mcollective/shell.rb
                 </a>
         <br />
                 <a href="../files/lib/mcollective/applications_rb.html">
                 lib/mcollective/applications.rb
                 </a>
         <br />
-                <a href="../files/lib/mcollective/registration/base_rb.html">
-                lib/mcollective/registration/base.rb
+                <a href="../files/lib/mcollective/rpc_rb.html">
+                lib/mcollective/rpc.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/client_rb.html">
+                lib/mcollective/client.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/pluginmanager_rb.html">
+                lib/mcollective/pluginmanager.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/facts_rb.html">
+                lib/mcollective/facts.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/message_rb.html">
+                lib/mcollective/message.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/util_rb.html">
+                lib/mcollective/util.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/facts/base_rb.html">
+                lib/mcollective/facts/base.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/security/base_rb.html">
+                lib/mcollective/security/base.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/config_rb.html">
+                lib/mcollective/config.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/matcher_rb.html">
+                lib/mcollective/matcher.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/unix_daemon_rb.html">
+                lib/mcollective/unix_daemon.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/pluginpackager_rb.html">
+                lib/mcollective/pluginpackager.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/security_rb.html">
+                lib/mcollective/security.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/pluginpackager/standard_definition_rb.html">
+                lib/mcollective/pluginpackager/standard_definition.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/pluginpackager/agent_definition_rb.html">
+                lib/mcollective/pluginpackager/agent_definition.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/runnerstats_rb.html">
+                lib/mcollective/runnerstats.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/connector_rb.html">
+                lib/mcollective/connector.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/windows_daemon_rb.html">
+                lib/mcollective/windows_daemon.rb
+                </a>
+        <br />
+                <a href="../files/lib/mcollective/logger_rb.html">
+                lib/mcollective/logger.rb
                 </a>
         <br />
                 <a href="../files/lib/mcollective_rb.html">
                 lib/mcollective.rb
                 </a>
         <br />
-                <a href="../files/plugins/mcollective/agent/discovery_rb.html">
-                plugins/mcollective/agent/discovery.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/agent/rpcutil_rb.html">
-                plugins/mcollective/agent/rpcutil.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/security/sshkey_rb.html">
-                plugins/mcollective/security/sshkey.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/security/ssl_rb.html">
-                plugins/mcollective/security/ssl.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/security/aes_security_rb.html">
-                plugins/mcollective/security/aes_security.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/security/psk_rb.html">
-                plugins/mcollective/security/psk.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/facts/yaml_facts_rb.html">
-                plugins/mcollective/facts/yaml_facts.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/connector/stomp_rb.html">
-                plugins/mcollective/connector/stomp.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/audit/logfile_rb.html">
-                plugins/mcollective/audit/logfile.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/application/help_rb.html">
-                plugins/mcollective/application/help.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/application/controller_rb.html">
-                plugins/mcollective/application/controller.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/application/ping_rb.html">
-                plugins/mcollective/application/ping.rb
-                </a>
-        <br />
-                <a href="../files/plugins/mcollective/registration/agentlist_rb.html">
-                plugins/mcollective/registration/agentlist.rb
-                </a>
-        <br />
             </td>
         </tr>
 
@@ -376,7 +284,7 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000004">version</a>&nbsp;&nbsp;
+      <a href="#M000005">version</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -390,11 +298,12 @@
     <div id="class-list">
       <h3 class="section-bar">Classes and Modules</h3>
 
-      Module <a href="MCollective/Agent.html" class="link">MCollective::Agent</a><br />
-Module <a href="MCollective/Connector.html" class="link">MCollective::Connector</a><br />
+      Module <a href="MCollective/Connector.html" class="link">MCollective::Connector</a><br />
 Module <a href="MCollective/Facts.html" class="link">MCollective::Facts</a><br />
 Module <a href="MCollective/Logger.html" class="link">MCollective::Logger</a><br />
+Module <a href="MCollective/Matcher.html" class="link">MCollective::Matcher</a><br />
 Module <a href="MCollective/PluginManager.html" class="link">MCollective::PluginManager</a><br />
+Module <a href="MCollective/PluginPackager.html" class="link">MCollective::PluginPackager</a><br />
 Module <a href="MCollective/RPC.html" class="link">MCollective::RPC</a><br />
 Module <a href="MCollective/Registration.html" class="link">MCollective::Registration</a><br />
 Module <a href="MCollective/Security.html" class="link">MCollective::Security</a><br />
@@ -405,24 +314,25 @@
 Class <a href="MCollective/Client.html" class="link">MCollective::Client</a><br />
 Class <a href="MCollective/Config.html" class="link">MCollective::Config</a><br />
 Class <a href="MCollective/DDLValidationError.html" class="link">MCollective::DDLValidationError</a><br />
-Class <a href="MCollective/Foo.html" class="link">MCollective::Foo</a><br />
 Class <a href="MCollective/InvalidRPCData.html" class="link">MCollective::InvalidRPCData</a><br />
 Class <a href="MCollective/Log.html" class="link">MCollective::Log</a><br />
+Class <a href="MCollective/Message.html" class="link">MCollective::Message</a><br />
 Class <a href="MCollective/MissingRPCData.html" class="link">MCollective::MissingRPCData</a><br />
 Class <a href="MCollective/MsgDoesNotMatchRequestID.html" class="link">MCollective::MsgDoesNotMatchRequestID</a><br />
+Class <a href="MCollective/MsgTTLExpired.html" class="link">MCollective::MsgTTLExpired</a><br />
 Class <a href="MCollective/NotTargettedAtUs.html" class="link">MCollective::NotTargettedAtUs</a><br />
 Class <a href="MCollective/Optionparser.html" class="link">MCollective::Optionparser</a><br />
 Class <a href="MCollective/RPCAborted.html" class="link">MCollective::RPCAborted</a><br />
 Class <a href="MCollective/RPCError.html" class="link">MCollective::RPCError</a><br />
-Class <a href="MCollective/Request.html" class="link">MCollective::Request</a><br />
 Class <a href="MCollective/Runner.html" class="link">MCollective::Runner</a><br />
 Class <a href="MCollective/RunnerStats.html" class="link">MCollective::RunnerStats</a><br />
 Class <a href="MCollective/SSL.html" class="link">MCollective::SSL</a><br />
 Class <a href="MCollective/SecurityValidationFailed.html" class="link">MCollective::SecurityValidationFailed</a><br />
 Class <a href="MCollective/Shell.html" class="link">MCollective::Shell</a><br />
+Class <a href="MCollective/UnixDaemon.html" class="link">MCollective::UnixDaemon</a><br />
 Class <a href="MCollective/UnknownRPCAction.html" class="link">MCollective::UnknownRPCAction</a><br />
 Class <a href="MCollective/UnknownRPCError.html" class="link">MCollective::UnknownRPCError</a><br />
-Class <a href="MCollective/Vendor.html" class="link">MCollective::Vendor</a><br />
+Class <a href="MCollective/WindowsDaemon.html" class="link">MCollective::WindowsDaemon</a><br />
 
     </div>
 
@@ -449,24 +359,24 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000004" class="method-detail">
-        <a name="M000004"></a>
+      <div id="method-M000005" class="method-detail">
+        <a name="M000005"></a>
 
         <div class="method-heading">
-          <a href="#M000004" class="method-signature">
+          <a href="#M000005" class="method-signature">
           <span class="method-name">version</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000004-source">
+            onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000005-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective.rb, line 60</span>
-60:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">version</span>
-61:         <span class="ruby-constant">VERSION</span>
-62:     <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/mcollective.rb, line 67</span>
+67:   <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">version</span>
+68:     <span class="ruby-constant">VERSION</span>
+69:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

=== removed directory 'doc/classes/MCollective/Agent'
=== removed file 'doc/classes/MCollective/Agent.html'
--- doc/classes/MCollective/Agent.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Agent.html	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Module: MCollective::Agent</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Module</strong></td>
-          <td class="class-name-in-header">MCollective::Agent</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../files/plugins/mcollective/agent/discovery_rb.html">
-                plugins/mcollective/agent/discovery.rb
-                </a>
-        <br />
-                <a href="../../files/plugins/mcollective/agent/rpcutil_rb.html">
-                plugins/mcollective/agent/rpcutil.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      Class <a href="Agent/Discovery.html" class="link">MCollective::Agent::Discovery</a><br />
-Class <a href="Agent/Rpcutil.html" class="link">MCollective::Agent::Rpcutil</a><br />
-
-    </div>
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file

=== removed file 'doc/classes/MCollective/Agent/Discovery.html'
--- doc/classes/MCollective/Agent/Discovery.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Agent/Discovery.html	1970-01-01 00:00:00 +0000
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: MCollective::Agent::Discovery</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">MCollective::Agent::Discovery</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/plugins/mcollective/agent/discovery_rb.html">
-                plugins/mcollective/agent/discovery.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                <a href="../../Object.html">
-                Object
-               </a>
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-    <div id="description">
-      <p>
-<a href="Discovery.html">Discovery</a> agent for The Marionette Collective
-</p>
-<p>
-Released under the Apache License, Version 2
-</p>
-
-    </div>
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000079">handlemsg</a>&nbsp;&nbsp;
-      <a href="#M000080">help</a>&nbsp;&nbsp;
-      <a href="#M000078">new</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-    <div id="attribute-list">
-      <h3 class="section-bar">Attributes</h3>
-
-      <div class="name-list">
-        <table>
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">meta</td>
-          <td class="context-item-value">&nbsp;[R]&nbsp;</td>
-          <td class="context-item-desc"></td>
-        </tr>
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">timeout</td>
-          <td class="context-item-value">&nbsp;[R]&nbsp;</td>
-          <td class="context-item-desc"></td>
-        </tr>
-        </table>
-      </div>
-    </div>
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Class methods</h3>
-
-      <div id="method-M000078" class="method-detail">
-        <a name="M000078"></a>
-
-        <div class="method-heading">
-          <a href="#M000078" class="method-signature">
-          <span class="method-name">new</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000078-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000078-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/agent/discovery.rb, line 9</span>
- 9:             <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
-10:                 <span class="ruby-identifier">config</span> = <span class="ruby-constant">Config</span>.<span class="ruby-identifier">instance</span>.<span class="ruby-identifier">pluginconf</span>
-11: 
-12:                 <span class="ruby-ivar">@timeout</span> = <span class="ruby-value">5</span>
-13:                 <span class="ruby-ivar">@timeout</span> = <span class="ruby-identifier">config</span>[<span class="ruby-value str">&quot;discovery.timeout&quot;</span>].<span class="ruby-identifier">to_i</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">config</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-value str">&quot;discovery.timeout&quot;</span>)
-14: 
-15:                 <span class="ruby-ivar">@meta</span> = {<span class="ruby-identifier">:license</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;Apache License, Version 2&quot;</span>,
-16:                          <span class="ruby-identifier">:author</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value str">&quot;R.I.Pienaar &lt;[e-mail]&gt;&quot;</span>,
-17:                          <span class="ruby-identifier">:timeout</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-ivar">@timeout</span>}
-18:             <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <h3 class="section-bar">Public Instance methods</h3>
-
-      <div id="method-M000079" class="method-detail">
-        <a name="M000079"></a>
-
-        <div class="method-heading">
-          <a href="#M000079" class="method-signature">
-          <span class="method-name">handlemsg</span><span class="method-args">(msg, stomp)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000079-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000079-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/agent/discovery.rb, line 20</span>
-20:             <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">handlemsg</span>(<span class="ruby-identifier">msg</span>, <span class="ruby-identifier">stomp</span>)
-21:                 <span class="ruby-identifier">reply</span> = <span class="ruby-value str">&quot;unknown request&quot;</span>
-22: 
-23:                 <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">msg</span>[<span class="ruby-identifier">:body</span>]
-24:                     <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;inventory&quot;</span>
-25:                         <span class="ruby-identifier">reply</span> = <span class="ruby-identifier">inventory</span>
-26: 
-27:                     <span class="ruby-keyword kw">when</span> <span class="ruby-regexp re">/echo (.+)/</span>
-28:                         <span class="ruby-identifier">reply</span> = <span class="ruby-identifier">$1</span>
-29: 
-30:                     <span class="ruby-keyword kw">when</span> <span class="ruby-value str">&quot;ping&quot;</span>
-31:                         <span class="ruby-identifier">reply</span> = <span class="ruby-value str">&quot;pong&quot;</span>
-32: 
-33:                     <span class="ruby-keyword kw">when</span> <span class="ruby-regexp re">/^get_fact (.+)/</span>
-34:                         <span class="ruby-identifier">reply</span> = <span class="ruby-constant">Facts</span>[<span class="ruby-identifier">$1</span>]
-35: 
-36:                     <span class="ruby-keyword kw">else</span>
-37:                         <span class="ruby-identifier">reply</span> = <span class="ruby-node">&quot;Unknown Request: #{msg[:body]}&quot;</span>
-38:                 <span class="ruby-keyword kw">end</span>
-39: 
-40:                 <span class="ruby-identifier">reply</span>
-41:             <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000080" class="method-detail">
-        <a name="M000080"></a>
-
-        <div class="method-heading">
-          <a href="#M000080" class="method-signature">
-          <span class="method-name">help</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000080-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000080-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/agent/discovery.rb, line 43</span>
-43:             <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">help</span>
-44:                 <span class="ruby-value str">&quot;Discovery Agent\n===============\n\nAgent to facilitate discovery of machines and data about machines.\n\nAccepted Messages\n-----------------\n\ninventory     - returns a hash with various bits of information like\nlist of agents, threads, etc\n\nping          - simply responds with 'pong'\nget_fact fact - replies with the value of a facter fact\n&quot;</span>
-45:             <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file

=== removed file 'doc/classes/MCollective/Agent/Rpcutil.html'
--- doc/classes/MCollective/Agent/Rpcutil.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Agent/Rpcutil.html	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: MCollective::Agent::Rpcutil</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">MCollective::Agent::Rpcutil</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/plugins/mcollective/agent/rpcutil_rb.html">
-                plugins/mcollective/agent/rpcutil.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                RPC::Agent
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file

=== modified file 'doc/classes/MCollective/Agents.html'
--- doc/classes/MCollective/Agents.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Agents.html	2012-06-06 17:53:29 +0000
@@ -65,9 +65,7 @@
         <tr class="top-aligned-row">
             <td><strong>Parent:</strong></td>
             <td>
-                <a href="../Object.html">
                 Object
-               </a>
             </td>
         </tr>
         </table>
@@ -96,14 +94,17 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000266">agentlist</a>&nbsp;&nbsp;
-      <a href="#M000265">dispatch</a>&nbsp;&nbsp;
-      <a href="#M000262">findagentfile</a>&nbsp;&nbsp;
-      <a href="#M000264">help</a>&nbsp;&nbsp;
-      <a href="#M000263">include?</a>&nbsp;&nbsp;
-      <a href="#M000261">loadagent</a>&nbsp;&nbsp;
-      <a href="#M000260">loadagents</a>&nbsp;&nbsp;
-      <a href="#M000259">new</a>&nbsp;&nbsp;
+      <a href="#M000313">activate_agent?</a>&nbsp;&nbsp;
+      <a href="#M000318">agentlist</a>&nbsp;&nbsp;
+      <a href="#M000312">class_for_agent</a>&nbsp;&nbsp;
+      <a href="#M000309">clear!</a>&nbsp;&nbsp;
+      <a href="#M000317">dispatch</a>&nbsp;&nbsp;
+      <a href="#M000314">findagentfile</a>&nbsp;&nbsp;
+      <a href="#M000316">help</a>&nbsp;&nbsp;
+      <a href="#M000315">include?</a>&nbsp;&nbsp;
+      <a href="#M000311">loadagent</a>&nbsp;&nbsp;
+      <a href="#M000310">loadagents</a>&nbsp;&nbsp;
+      <a href="#M000308">new</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -125,11 +126,11 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000266" class="method-detail">
-        <a name="M000266"></a>
+      <div id="method-M000318" class="method-detail">
+        <a name="M000318"></a>
 
         <div class="method-heading">
-          <a href="#M000266" class="method-signature">
+          <a href="#M000318" class="method-signature">
           <span class="method-name">agentlist</span><span class="method-args">()</span>
           </a>
         </div>
@@ -139,41 +140,41 @@
 Get a list of agents that we have
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000266-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000266-source">
+            onclick="toggleCode('M000318-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000318-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 123</span>
-123:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">agentlist</span>
-124:             <span class="ruby-ivar">@@agents</span>.<span class="ruby-identifier">keys</span>
-125:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 156</span>
+156:     <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">agentlist</span>
+157:       <span class="ruby-ivar">@@agents</span>.<span class="ruby-identifier">keys</span>
+158:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000259" class="method-detail">
-        <a name="M000259"></a>
+      <div id="method-M000308" class="method-detail">
+        <a name="M000308"></a>
 
         <div class="method-heading">
-          <a href="#M000259" class="method-signature">
-          <span class="method-name">new</span><span class="method-args">()</span>
+          <a href="#M000308" class="method-signature">
+          <span class="method-name">new</span><span class="method-args">(agents = {})</span>
           </a>
         </div>
       
         <div class="method-description">
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000259-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000259-source">
+            onclick="toggleCode('M000308-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000308-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 5</span>
- 5:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>
- 6:             <span class="ruby-ivar">@config</span> = <span class="ruby-constant">Config</span>.<span class="ruby-identifier">instance</span>
- 7:             <span class="ruby-identifier">raise</span> (<span class="ruby-value str">&quot;Configuration has not been loaded, can't load agents&quot;</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@config</span>.<span class="ruby-identifier">configured</span>
+ 5:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">agents</span> = {})
+ 6:       <span class="ruby-ivar">@config</span> = <span class="ruby-constant">Config</span>.<span class="ruby-identifier">instance</span>
+ 7:       <span class="ruby-identifier">raise</span> (<span class="ruby-value str">&quot;Configuration has not been loaded, can't load agents&quot;</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@config</span>.<span class="ruby-identifier">configured</span>
  8: 
- 9:             <span class="ruby-ivar">@@agents</span> = {}
+ 9:       <span class="ruby-ivar">@@agents</span> = <span class="ruby-identifier">agents</span>
 10: 
-11:             <span class="ruby-identifier">loadagents</span>
-12:         <span class="ruby-keyword kw">end</span>
+11:       <span class="ruby-identifier">loadagents</span>
+12:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -181,12 +182,106 @@
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000265" class="method-detail">
-        <a name="M000265"></a>
-
-        <div class="method-heading">
-          <a href="#M000265" class="method-signature">
-          <span class="method-name">dispatch</span><span class="method-args">(msg, target, connection) {|replies| ...}</span>
+      <div id="method-M000313" class="method-detail">
+        <a name="M000313"></a>
+
+        <div class="method-heading">
+          <a href="#M000313" class="method-signature">
+          <span class="method-name">activate_agent?</span><span class="method-args">(agent)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Checks if a plugin should be activated by calling activate? on it if it
+responds to that method else always activate it
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000313-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000313-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 80</span>
+80:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">activate_agent?</span>(<span class="ruby-identifier">agent</span>)
+81:       <span class="ruby-identifier">klass</span> = <span class="ruby-constant">Kernel</span>.<span class="ruby-identifier">const_get</span>(<span class="ruby-value str">&quot;MCollective&quot;</span>).<span class="ruby-identifier">const_get</span>(<span class="ruby-value str">&quot;Agent&quot;</span>).<span class="ruby-identifier">const_get</span>(<span class="ruby-identifier">agent</span>.<span class="ruby-identifier">capitalize</span>)
+82: 
+83:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">klass</span>.<span class="ruby-identifier">respond_to?</span>(<span class="ruby-value str">&quot;activate?&quot;</span>)
+84:         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">klass</span>.<span class="ruby-identifier">activate?</span>
+85:       <span class="ruby-keyword kw">else</span>
+86:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;#{klass} does not have an activate? method, activating as default&quot;</span>)
+87:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
+88:       <span class="ruby-keyword kw">end</span>
+89:     <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+90:       <span class="ruby-constant">Log</span>.<span class="ruby-identifier">warn</span>(<span class="ruby-node">&quot;Agent activation check for #{agent} failed: #{e.class}: #{e}&quot;</span>)
+91:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
+92:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000312" class="method-detail">
+        <a name="M000312"></a>
+
+        <div class="method-heading">
+          <a href="#M000312" class="method-signature">
+          <span class="method-name">class_for_agent</span><span class="method-args">(agent)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Builds a class name string given a Agent name
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000312-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000312-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 73</span>
+73:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">class_for_agent</span>(<span class="ruby-identifier">agent</span>)
+74:       <span class="ruby-node">&quot;MCollective::Agent::#{agent.capitalize}&quot;</span>
+75:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000309" class="method-detail">
+        <a name="M000309"></a>
+
+        <div class="method-heading">
+          <a href="#M000309" class="method-signature">
+          <span class="method-name">clear!</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Deletes all agents
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000309-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000309-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 15</span>
+15:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">clear!</span>
+16:       <span class="ruby-ivar">@@agents</span>.<span class="ruby-identifier">each_key</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">agent</span><span class="ruby-operator">|</span>
+17:         <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">delete</span> <span class="ruby-node">&quot;#{agent}_agent&quot;</span>
+18:         <span class="ruby-constant">Util</span>.<span class="ruby-identifier">unsubscribe</span>(<span class="ruby-constant">Util</span>.<span class="ruby-identifier">make_subscriptions</span>(<span class="ruby-identifier">agent</span>, <span class="ruby-identifier">:broadcast</span>))
+19:       <span class="ruby-keyword kw">end</span>
+20: 
+21:       <span class="ruby-ivar">@@agents</span> = {}
+22:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000317" class="method-detail">
+        <a name="M000317"></a>
+
+        <div class="method-heading">
+          <a href="#M000317" class="method-signature">
+          <span class="method-name">dispatch</span><span class="method-args">(request, connection) {|replies| ...}</span>
           </a>
         </div>
       
@@ -196,45 +291,45 @@
 there are any replies to process from the agent
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000265-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000265-source">
+            onclick="toggleCode('M000317-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000317-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 96</span>
- 96:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dispatch</span>(<span class="ruby-identifier">msg</span>, <span class="ruby-identifier">target</span>, <span class="ruby-identifier">connection</span>)
- 97:             <span class="ruby-constant">Log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Dispatching a message to agent #{target}&quot;</span>)
- 98: 
- 99:             <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> <span class="ruby-keyword kw">do</span>
-100:                 <span class="ruby-keyword kw">begin</span>
-101:                     <span class="ruby-identifier">agent</span> = <span class="ruby-constant">PluginManager</span>[<span class="ruby-node">&quot;#{target}_agent&quot;</span>]
-102: 
-103:                     <span class="ruby-constant">Timeout</span><span class="ruby-operator">::</span><span class="ruby-identifier">timeout</span>(<span class="ruby-identifier">agent</span>.<span class="ruby-identifier">timeout</span>) <span class="ruby-keyword kw">do</span>
-104:                         <span class="ruby-identifier">replies</span> = <span class="ruby-identifier">agent</span>.<span class="ruby-identifier">handlemsg</span>(<span class="ruby-identifier">msg</span>, <span class="ruby-identifier">connection</span>)
-105: 
-106:                         <span class="ruby-comment cmt"># Agents can decide if they wish to reply or not,</span>
-107:                         <span class="ruby-comment cmt"># returning nil will mean nothing goes back to the</span>
-108:                         <span class="ruby-comment cmt"># requestor</span>
-109:                         <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">replies</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>
-110:                             <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">replies</span>)
-111:                         <span class="ruby-keyword kw">end</span>
-112:                     <span class="ruby-keyword kw">end</span>
-113:                 <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Timeout</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-114:                     <span class="ruby-constant">Log</span>.<span class="ruby-identifier">warn</span>(<span class="ruby-node">&quot;Timeout while handling message for #{target}&quot;</span>)
-115:                 <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-116:                     <span class="ruby-constant">Log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Execution of #{target} failed: #{e}&quot;</span>)
-117:                     <span class="ruby-constant">Log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-identifier">e</span>.<span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;\n\t\t&quot;</span>))
-118:                 <span class="ruby-keyword kw">end</span>
-119:             <span class="ruby-keyword kw">end</span>
-120:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 129</span>
+129:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">dispatch</span>(<span class="ruby-identifier">request</span>, <span class="ruby-identifier">connection</span>)
+130:       <span class="ruby-constant">Log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Dispatching a message to agent #{request.agent}&quot;</span>)
+131: 
+132:       <span class="ruby-constant">Thread</span>.<span class="ruby-identifier">new</span> <span class="ruby-keyword kw">do</span>
+133:         <span class="ruby-keyword kw">begin</span>
+134:           <span class="ruby-identifier">agent</span> = <span class="ruby-constant">PluginManager</span>[<span class="ruby-node">&quot;#{request.agent}_agent&quot;</span>]
+135: 
+136:           <span class="ruby-constant">Timeout</span><span class="ruby-operator">::</span><span class="ruby-identifier">timeout</span>(<span class="ruby-identifier">agent</span>.<span class="ruby-identifier">timeout</span>) <span class="ruby-keyword kw">do</span>
+137:             <span class="ruby-identifier">replies</span> = <span class="ruby-identifier">agent</span>.<span class="ruby-identifier">handlemsg</span>(<span class="ruby-identifier">request</span>.<span class="ruby-identifier">payload</span>, <span class="ruby-identifier">connection</span>)
+138: 
+139:             <span class="ruby-comment cmt"># Agents can decide if they wish to reply or not,</span>
+140:             <span class="ruby-comment cmt"># returning nil will mean nothing goes back to the</span>
+141:             <span class="ruby-comment cmt"># requestor</span>
+142:             <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">replies</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">nil</span>
+143:               <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">replies</span>)
+144:             <span class="ruby-keyword kw">end</span>
+145:           <span class="ruby-keyword kw">end</span>
+146:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Timeout</span><span class="ruby-operator">::</span><span class="ruby-constant">Error</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+147:           <span class="ruby-constant">Log</span>.<span class="ruby-identifier">warn</span>(<span class="ruby-node">&quot;Timeout while handling message for #{request.agent}&quot;</span>)
+148:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+149:           <span class="ruby-constant">Log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Execution of #{request.agent} failed: #{e}&quot;</span>)
+150:           <span class="ruby-constant">Log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-identifier">e</span>.<span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;\n\t\t&quot;</span>))
+151:         <span class="ruby-keyword kw">end</span>
+152:       <span class="ruby-keyword kw">end</span>
+153:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000262" class="method-detail">
-        <a name="M000262"></a>
+      <div id="method-M000314" class="method-detail">
+        <a name="M000314"></a>
 
         <div class="method-heading">
-          <a href="#M000262" class="method-signature">
+          <a href="#M000314" class="method-signature">
           <span class="method-name">findagentfile</span><span class="method-args">(agentname)</span>
           </a>
         </div>
@@ -244,67 +339,67 @@
 searches the libdirs for agents
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000262-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000262-source">
+            onclick="toggleCode('M000314-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000314-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 62</span>
-62:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">findagentfile</span>(<span class="ruby-identifier">agentname</span>)
-63:             <span class="ruby-ivar">@config</span>.<span class="ruby-identifier">libdir</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">libdir</span><span class="ruby-operator">|</span>
-64:                 <span class="ruby-identifier">agentfile</span> = <span class="ruby-node">&quot;#{libdir}/mcollective/agent/#{agentname}.rb&quot;</span>
-65:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">agentfile</span>)
-66:                     <span class="ruby-constant">Log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Found #{agentname} at #{agentfile}&quot;</span>)
-67:                     <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">agentfile</span>
-68:                 <span class="ruby-keyword kw">end</span>
-69:             <span class="ruby-keyword kw">end</span>
-70:             <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
-71:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 95</span>
+ 95:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">findagentfile</span>(<span class="ruby-identifier">agentname</span>)
+ 96:       <span class="ruby-ivar">@config</span>.<span class="ruby-identifier">libdir</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">libdir</span><span class="ruby-operator">|</span>
+ 97:         <span class="ruby-identifier">agentfile</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>([<span class="ruby-identifier">libdir</span>, <span class="ruby-value str">&quot;mcollective&quot;</span>, <span class="ruby-value str">&quot;agent&quot;</span>, <span class="ruby-node">&quot;#{agentname}.rb&quot;</span>])
+ 98:         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">agentfile</span>)
+ 99:           <span class="ruby-constant">Log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Found #{agentname} at #{agentfile}&quot;</span>)
+100:           <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">agentfile</span>
+101:         <span class="ruby-keyword kw">end</span>
+102:       <span class="ruby-keyword kw">end</span>
+103:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
+104:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000264" class="method-detail">
-        <a name="M000264"></a>
+      <div id="method-M000316" class="method-detail">
+        <a name="M000316"></a>
 
         <div class="method-heading">
-          <a href="#M000264" class="method-signature">
+          <a href="#M000316" class="method-signature">
           <span class="method-name">help</span><span class="method-args">(agentname)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Returns the <a href="Agents.html#M000264">help</a> for an agent after first
+Returns the <a href="Agents.html#M000316">help</a> for an agent after first
 trying to get rid of some indentation infront
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000264-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000264-source">
+            onclick="toggleCode('M000316-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000316-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 80</span>
-80:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">help</span>(<span class="ruby-identifier">agentname</span>)
-81:             <span class="ruby-identifier">raise</span>(<span class="ruby-value str">&quot;No such agent&quot;</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">include?</span>(<span class="ruby-identifier">agentname</span>)
-82: 
-83:             <span class="ruby-identifier">body</span> = <span class="ruby-constant">PluginManager</span>[<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>].<span class="ruby-identifier">help</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">&quot;\n&quot;</span>)
-84: 
-85:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">body</span>.<span class="ruby-identifier">first</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^(\s+)\S/</span>
-86:                 <span class="ruby-identifier">indent</span> = <span class="ruby-identifier">$1</span>
-87: 
-88:                 <span class="ruby-identifier">body</span> = <span class="ruby-identifier">body</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">b</span><span class="ruby-operator">|</span> <span class="ruby-identifier">b</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-node">/^#{indent}/</span>, <span class="ruby-value str">&quot;&quot;</span>)}
-89:             <span class="ruby-keyword kw">end</span>
-90: 
-91:             <span class="ruby-identifier">body</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;\n&quot;</span>)
-92:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 113</span>
+113:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">help</span>(<span class="ruby-identifier">agentname</span>)
+114:       <span class="ruby-identifier">raise</span>(<span class="ruby-value str">&quot;No such agent&quot;</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">include?</span>(<span class="ruby-identifier">agentname</span>)
+115: 
+116:       <span class="ruby-identifier">body</span> = <span class="ruby-constant">PluginManager</span>[<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>].<span class="ruby-identifier">help</span>.<span class="ruby-identifier">split</span>(<span class="ruby-value str">&quot;\n&quot;</span>)
+117: 
+118:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">body</span>.<span class="ruby-identifier">first</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^(\s+)\S/</span>
+119:         <span class="ruby-identifier">indent</span> = <span class="ruby-identifier">$1</span>
+120: 
+121:         <span class="ruby-identifier">body</span> = <span class="ruby-identifier">body</span>.<span class="ruby-identifier">map</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">b</span><span class="ruby-operator">|</span> <span class="ruby-identifier">b</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-node">/^#{indent}/</span>, <span class="ruby-value str">&quot;&quot;</span>)}
+122:       <span class="ruby-keyword kw">end</span>
+123: 
+124:       <span class="ruby-identifier">body</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;\n&quot;</span>)
+125:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000263" class="method-detail">
-        <a name="M000263"></a>
+      <div id="method-M000315" class="method-detail">
+        <a name="M000315"></a>
 
         <div class="method-heading">
-          <a href="#M000263" class="method-signature">
+          <a href="#M000315" class="method-signature">
           <span class="method-name">include?</span><span class="method-args">(agentname)</span>
           </a>
         </div>
@@ -314,23 +409,23 @@
 Determines if we have an agent with a certain name
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000263-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000263-source">
+            onclick="toggleCode('M000315-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000315-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 74</span>
-74:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include?</span>(<span class="ruby-identifier">agentname</span>)
-75:             <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>)
-76:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 107</span>
+107:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">include?</span>(<span class="ruby-identifier">agentname</span>)
+108:       <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>)
+109:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000261" class="method-detail">
-        <a name="M000261"></a>
+      <div id="method-M000311" class="method-detail">
+        <a name="M000311"></a>
 
         <div class="method-heading">
-          <a href="#M000261" class="method-signature">
+          <a href="#M000311" class="method-signature">
           <span class="method-name">loadagent</span><span class="method-args">(agentname)</span>
           </a>
         </div>
@@ -340,42 +435,49 @@
 Loads a specified agent from disk if available
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000261-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000261-source">
+            onclick="toggleCode('M000311-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000311-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 38</span>
-38:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">loadagent</span>(<span class="ruby-identifier">agentname</span>)
-39:             <span class="ruby-identifier">agentfile</span> = <span class="ruby-identifier">findagentfile</span>(<span class="ruby-identifier">agentname</span>)
-40:             <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">agentfile</span>
-41:             <span class="ruby-identifier">classname</span> = <span class="ruby-node">&quot;MCollective::Agent::#{agentname.capitalize}&quot;</span>
-42: 
-43:             <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>)
-44: 
-45:             <span class="ruby-keyword kw">begin</span>
-46:                 <span class="ruby-identifier">single_instance</span> = [<span class="ruby-value str">&quot;registration&quot;</span>, <span class="ruby-value str">&quot;discovery&quot;</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">agentname</span>)
-47: 
-48:                 <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">loadclass</span>(<span class="ruby-identifier">classname</span>)
-49:                 <span class="ruby-constant">PluginManager</span> <span class="ruby-operator">&lt;&lt;</span> {<span class="ruby-identifier">:type</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{agentname}_agent&quot;</span>, <span class="ruby-identifier">:class</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">classname</span>, <span class="ruby-identifier">:single_instance</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">single_instance</span>}
-50: 
-51:                 <span class="ruby-constant">Util</span>.<span class="ruby-identifier">subscribe</span>(<span class="ruby-constant">Util</span>.<span class="ruby-identifier">make_target</span>(<span class="ruby-identifier">agentname</span>, <span class="ruby-identifier">:command</span>)) <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@@agents</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">agentname</span>)
-52: 
-53:                 <span class="ruby-ivar">@@agents</span>[<span class="ruby-identifier">agentname</span>] = {<span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">agentfile</span>}
-54:                 <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
-55:             <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-56:                 <span class="ruby-constant">Log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Loading agent #{agentname} failed: #{e}&quot;</span>)
-57:                 <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>)
-58:             <span class="ruby-keyword kw">end</span>
-59:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 42</span>
+42:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">loadagent</span>(<span class="ruby-identifier">agentname</span>)
+43:       <span class="ruby-identifier">agentfile</span> = <span class="ruby-identifier">findagentfile</span>(<span class="ruby-identifier">agentname</span>)
+44:       <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">agentfile</span>
+45:       <span class="ruby-identifier">classname</span> = <span class="ruby-identifier">class_for_agent</span>(<span class="ruby-identifier">agentname</span>)
+46: 
+47:       <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>)
+48: 
+49:       <span class="ruby-keyword kw">begin</span>
+50:         <span class="ruby-identifier">single_instance</span> = [<span class="ruby-value str">&quot;registration&quot;</span>, <span class="ruby-value str">&quot;discovery&quot;</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">agentname</span>)
+51: 
+52:         <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">loadclass</span>(<span class="ruby-identifier">classname</span>)
+53: 
+54:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">activate_agent?</span>(<span class="ruby-identifier">agentname</span>)
+55:           <span class="ruby-constant">PluginManager</span> <span class="ruby-operator">&lt;&lt;</span> {<span class="ruby-identifier">:type</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-node">&quot;#{agentname}_agent&quot;</span>, <span class="ruby-identifier">:class</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">classname</span>, <span class="ruby-identifier">:single_instance</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">single_instance</span>}
+56: 
+57:           <span class="ruby-constant">Util</span>.<span class="ruby-identifier">subscribe</span>(<span class="ruby-constant">Util</span>.<span class="ruby-identifier">make_subscriptions</span>(<span class="ruby-identifier">agentname</span>, <span class="ruby-identifier">:broadcast</span>)) <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@@agents</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">agentname</span>)
+58: 
+59:           <span class="ruby-ivar">@@agents</span>[<span class="ruby-identifier">agentname</span>] = {<span class="ruby-identifier">:file</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">agentfile</span>}
+60:           <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
+61:         <span class="ruby-keyword kw">else</span>
+62:           <span class="ruby-constant">Log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-node">&quot;Not activating agent #{agentname} due to agent policy in activate? method&quot;</span>)
+63:           <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
+64:         <span class="ruby-keyword kw">end</span>
+65:       <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+66:         <span class="ruby-constant">Log</span>.<span class="ruby-identifier">error</span>(<span class="ruby-node">&quot;Loading agent #{agentname} failed: #{e}&quot;</span>)
+67:         <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">delete</span>(<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>)
+68:         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
+69:       <span class="ruby-keyword kw">end</span>
+70:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000260" class="method-detail">
-        <a name="M000260"></a>
+      <div id="method-M000310" class="method-detail">
+        <a name="M000310"></a>
 
         <div class="method-heading">
-          <a href="#M000260" class="method-signature">
+          <a href="#M000310" class="method-signature">
           <span class="method-name">loadagents</span><span class="method-args">()</span>
           </a>
         </div>
@@ -385,31 +487,25 @@
 Loads all agents from disk
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000260-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000260-source">
+            onclick="toggleCode('M000310-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000310-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 15</span>
-15:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">loadagents</span>
-16:             <span class="ruby-constant">Log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-value str">&quot;Reloading all agents from disk&quot;</span>)
-17: 
-18:             <span class="ruby-comment cmt"># We're loading all agents so just nuke all the old agents and unsubscribe</span>
-19:             <span class="ruby-ivar">@@agents</span>.<span class="ruby-identifier">each_key</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">agent</span><span class="ruby-operator">|</span>
-20:                 <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">delete</span> <span class="ruby-node">&quot;#{agent}_agent&quot;</span>
-21:                 <span class="ruby-constant">Util</span>.<span class="ruby-identifier">unsubscribe</span>(<span class="ruby-constant">Util</span>.<span class="ruby-identifier">make_target</span>(<span class="ruby-identifier">agent</span>, <span class="ruby-identifier">:command</span>))
-22:             <span class="ruby-keyword kw">end</span>
-23: 
-24:             <span class="ruby-ivar">@@agents</span> = {}
-25: 
-26:             <span class="ruby-ivar">@config</span>.<span class="ruby-identifier">libdir</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">libdir</span><span class="ruby-operator">|</span>
-27:                 <span class="ruby-identifier">agentdir</span> = <span class="ruby-node">&quot;#{libdir}/mcollective/agent&quot;</span>
-28:                 <span class="ruby-keyword kw">next</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>(<span class="ruby-identifier">agentdir</span>)
+    <span class="ruby-comment cmt"># File lib/mcollective/agents.rb, line 25</span>
+25:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">loadagents</span>
+26:       <span class="ruby-constant">Log</span>.<span class="ruby-identifier">debug</span>(<span class="ruby-value str">&quot;Reloading all agents from disk&quot;</span>)
+27: 
+28:       <span class="ruby-identifier">clear!</span>
 29: 
-30:                 <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">agentdir</span>).<span class="ruby-identifier">grep</span>(<span class="ruby-regexp re">/\.rb$/</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">agent</span><span class="ruby-operator">|</span>
-31:                     <span class="ruby-identifier">agentname</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">agent</span>, <span class="ruby-value str">&quot;.rb&quot;</span>)
-32:                     <span class="ruby-identifier">loadagent</span>(<span class="ruby-identifier">agentname</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>)
-33:                 <span class="ruby-keyword kw">end</span>
-34:             <span class="ruby-keyword kw">end</span>
-35:         <span class="ruby-keyword kw">end</span>
+30:       <span class="ruby-ivar">@config</span>.<span class="ruby-identifier">libdir</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">libdir</span><span class="ruby-operator">|</span>
+31:         <span class="ruby-identifier">agentdir</span> = <span class="ruby-node">&quot;#{libdir}/mcollective/agent&quot;</span>
+32:         <span class="ruby-keyword kw">next</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>(<span class="ruby-identifier">agentdir</span>)
+33: 
+34:         <span class="ruby-constant">Dir</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">agentdir</span>).<span class="ruby-identifier">grep</span>(<span class="ruby-regexp re">/\.rb$/</span>).<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">agent</span><span class="ruby-operator">|</span>
+35:           <span class="ruby-identifier">agentname</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">basename</span>(<span class="ruby-identifier">agent</span>, <span class="ruby-value str">&quot;.rb&quot;</span>)
+36:           <span class="ruby-identifier">loadagent</span>(<span class="ruby-identifier">agentname</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">PluginManager</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-node">&quot;#{agentname}_agent&quot;</span>)
+37:         <span class="ruby-keyword kw">end</span>
+38:       <span class="ruby-keyword kw">end</span>
+39:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

=== removed directory 'doc/classes/MCollective/Application'
=== modified file 'doc/classes/MCollective/Application.html'
--- doc/classes/MCollective/Application.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Application.html	2012-06-06 17:53:29 +0000
@@ -65,9 +65,7 @@
         <tr class="top-aligned-row">
             <td><strong>Parent:</strong></td>
             <td>
-                <a href="../Object.html">
                 Object
-               </a>
             </td>
         </tr>
         </table>
@@ -88,24 +86,31 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000271">[]</a>&nbsp;&nbsp;
-      <a href="#M000270">[]=</a>&nbsp;&nbsp;
-      <a href="#M000282">application_cli_arguments</a>&nbsp;&nbsp;
-      <a href="#M000280">application_description</a>&nbsp;&nbsp;
-      <a href="#M000283">application_failure</a>&nbsp;&nbsp;
-      <a href="#M000269">application_options</a>&nbsp;&nbsp;
-      <a href="#M000279">application_parse_options</a>&nbsp;&nbsp;
-      <a href="#M000281">application_usage</a>&nbsp;&nbsp;
-      <a href="#M000276">configuration</a>&nbsp;&nbsp;
-      <a href="#M000272">description</a>&nbsp;&nbsp;
-      <a href="#M000275">intialize_application_options</a>&nbsp;&nbsp;
-      <a href="#M000285">main</a>&nbsp;&nbsp;
-      <a href="#M000274">option</a>&nbsp;&nbsp;
-      <a href="#M000277">options</a>&nbsp;&nbsp;
-      <a href="#M000286">rpcclient</a>&nbsp;&nbsp;
-      <a href="#M000284">run</a>&nbsp;&nbsp;
-      <a href="#M000273">usage</a>&nbsp;&nbsp;
-      <a href="#M000278">validate_option</a>&nbsp;&nbsp;
+      <a href="#M000285">[]</a>&nbsp;&nbsp;
+      <a href="#M000284">[]=</a>&nbsp;&nbsp;
+      <a href="#M000300">application_cli_arguments</a>&nbsp;&nbsp;
+      <a href="#M000298">application_description</a>&nbsp;&nbsp;
+      <a href="#M000301">application_failure</a>&nbsp;&nbsp;
+      <a href="#M000283">application_options</a>&nbsp;&nbsp;
+      <a href="#M000297">application_options</a>&nbsp;&nbsp;
+      <a href="#M000295">application_parse_options</a>&nbsp;&nbsp;
+      <a href="#M000299">application_usage</a>&nbsp;&nbsp;
+      <a href="#M000294">clioptions</a>&nbsp;&nbsp;
+      <a href="#M000291">configuration</a>&nbsp;&nbsp;
+      <a href="#M000286">description</a>&nbsp;&nbsp;
+      <a href="#M000304">disconnect</a>&nbsp;&nbsp;
+      <a href="#M000288">exclude_argument_sections</a>&nbsp;&nbsp;
+      <a href="#M000306">halt</a>&nbsp;&nbsp;
+      <a href="#M000302">help</a>&nbsp;&nbsp;
+      <a href="#M000290">intialize_application_options</a>&nbsp;&nbsp;
+      <a href="#M000305">main</a>&nbsp;&nbsp;
+      <a href="#M000289">option</a>&nbsp;&nbsp;
+      <a href="#M000292">options</a>&nbsp;&nbsp;
+      <a href="#M000307">rpcclient</a>&nbsp;&nbsp;
+      <a href="#M000303">run</a>&nbsp;&nbsp;
+      <a href="#M000287">usage</a>&nbsp;&nbsp;
+      <a href="#M000296">validate_cli_options</a>&nbsp;&nbsp;
+      <a href="#M000293">validate_option</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -123,18 +128,6 @@
 
     <div id="section">
 
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      Class <a href="Application/Controller.html" class="link">MCollective::Application::Controller</a><br />
-Class <a href="Application/Facts.html" class="link">MCollective::Application::Facts</a><br />
-Class <a href="Application/Find.html" class="link">MCollective::Application::Find</a><br />
-Class <a href="Application/Help.html" class="link">MCollective::Application::Help</a><br />
-Class <a href="Application/Inventory.html" class="link">MCollective::Application::Inventory</a><br />
-Class <a href="Application/Ping.html" class="link">MCollective::Application::Ping</a><br />
-Class <a href="Application/Rpc.html" class="link">MCollective::Application::Rpc</a><br />
-
-    </div>
 
 
 
@@ -146,152 +139,183 @@
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000271" class="method-detail">
-        <a name="M000271"></a>
+      <div id="method-M000285" class="method-detail">
+        <a name="M000285"></a>
 
         <div class="method-heading">
-          <a href="#M000271" class="method-signature">
+          <a href="#M000285" class="method-signature">
           <span class="method-name">[]</span><span class="method-args">(option)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-retrieves a specific <a href="Application.html#M000274">option</a>
+retrieves a specific <a href="Application.html#M000289">option</a>
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000271-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000271-source">
+            onclick="toggleCode('M000285-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000285-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 20</span>
-20:             <span class="ruby-keyword kw">def</span> <span class="ruby-operator">[]</span>(<span class="ruby-identifier">option</span>)
-21:                 <span class="ruby-identifier">intialize_application_options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@application_options</span>
-22:                 <span class="ruby-ivar">@application_options</span>[<span class="ruby-identifier">option</span>]
-23:             <span class="ruby-keyword kw">end</span>
+20:       <span class="ruby-keyword kw">def</span> <span class="ruby-operator">[]</span>(<span class="ruby-identifier">option</span>)
+21:         <span class="ruby-identifier">intialize_application_options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@application_options</span>
+22:         <span class="ruby-ivar">@application_options</span>[<span class="ruby-identifier">option</span>]
+23:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000270" class="method-detail">
-        <a name="M000270"></a>
+      <div id="method-M000284" class="method-detail">
+        <a name="M000284"></a>
 
         <div class="method-heading">
-          <a href="#M000270" class="method-signature">
+          <a href="#M000284" class="method-signature">
           <span class="method-name">[]=</span><span class="method-args">(option, value)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-set an <a href="Application.html#M000274">option</a> in the <a
-href="Application.html#M000277">options</a> hash
+set an <a href="Application.html#M000289">option</a> in the <a
+href="Application.html#M000292">options</a> hash
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000270-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000270-source">
+            onclick="toggleCode('M000284-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000284-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 14</span>
-14:             <span class="ruby-keyword kw">def</span> <span class="ruby-operator">[]=</span>(<span class="ruby-identifier">option</span>, <span class="ruby-identifier">value</span>)
-15:                 <span class="ruby-identifier">intialize_application_options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@application_options</span>
-16:                 <span class="ruby-ivar">@application_options</span>[<span class="ruby-identifier">option</span>] = <span class="ruby-identifier">value</span>
-17:             <span class="ruby-keyword kw">end</span>
+14:       <span class="ruby-keyword kw">def</span> <span class="ruby-operator">[]=</span>(<span class="ruby-identifier">option</span>, <span class="ruby-identifier">value</span>)
+15:         <span class="ruby-identifier">intialize_application_options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@application_options</span>
+16:         <span class="ruby-ivar">@application_options</span>[<span class="ruby-identifier">option</span>] = <span class="ruby-identifier">value</span>
+17:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000269" class="method-detail">
-        <a name="M000269"></a>
+      <div id="method-M000283" class="method-detail">
+        <a name="M000283"></a>
 
         <div class="method-heading">
-          <a href="#M000269" class="method-signature">
+          <a href="#M000283" class="method-signature">
           <span class="method-name">application_options</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Intialize a blank set of <a href="Application.html#M000277">options</a> if
+Intialize a blank set of <a href="Application.html#M000292">options</a> if
 its the first time used else returns active <a
-href="Application.html#M000277">options</a>
+href="Application.html#M000292">options</a>
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000269-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000269-source">
+            onclick="toggleCode('M000283-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000283-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 8</span>
- 8:             <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_options</span>
- 9:                 <span class="ruby-identifier">intialize_application_options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@application_options</span>
-10:                 <span class="ruby-ivar">@application_options</span>
-11:             <span class="ruby-keyword kw">end</span>
+ 8:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_options</span>
+ 9:         <span class="ruby-identifier">intialize_application_options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@application_options</span>
+10:         <span class="ruby-ivar">@application_options</span>
+11:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000272" class="method-detail">
-        <a name="M000272"></a>
+      <div id="method-M000286" class="method-detail">
+        <a name="M000286"></a>
 
         <div class="method-heading">
-          <a href="#M000272" class="method-signature">
+          <a href="#M000286" class="method-signature">
           <span class="method-name">description</span><span class="method-args">(descr)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Sets the application <a href="Application.html#M000272">description</a>,
-there can be only one <a href="Application.html#M000272">description</a>
+Sets the application <a href="Application.html#M000286">description</a>,
+there can be only one <a href="Application.html#M000286">description</a>
 per application so multiple calls will just change the <a
-href="Application.html#M000272">description</a>
+href="Application.html#M000286">description</a>
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000272-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000272-source">
+            onclick="toggleCode('M000286-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000286-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 28</span>
-28:             <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">description</span>(<span class="ruby-identifier">descr</span>)
-29:                 <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">:description</span>] = <span class="ruby-identifier">descr</span>
-30:             <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000275" class="method-detail">
-        <a name="M000275"></a>
-
-        <div class="method-heading">
-          <a href="#M000275" class="method-signature">
+28:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">description</span>(<span class="ruby-identifier">descr</span>)
+29:         <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">:description</span>] = <span class="ruby-identifier">descr</span>
+30:       <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000288" class="method-detail">
+        <a name="M000288"></a>
+
+        <div class="method-heading">
+          <a href="#M000288" class="method-signature">
+          <span class="method-name">exclude_argument_sections</span><span class="method-args">(*sections)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000288-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000288-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 38</span>
+38:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">exclude_argument_sections</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">sections</span>)
+39:         <span class="ruby-identifier">sections</span> = [<span class="ruby-identifier">sections</span>].<span class="ruby-identifier">flatten</span>
+40: 
+41:         <span class="ruby-identifier">sections</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">s</span><span class="ruby-operator">|</span>
+42:           <span class="ruby-identifier">raise</span> <span class="ruby-node">&quot;Unknown CLI argument section #{s}&quot;</span> <span class="ruby-keyword kw">unless</span> [<span class="ruby-value str">&quot;rpc&quot;</span>, <span class="ruby-value str">&quot;common&quot;</span>, <span class="ruby-value str">&quot;filter&quot;</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">s</span>)
+43:         <span class="ruby-keyword kw">end</span>
+44: 
+45:         <span class="ruby-identifier">intialize_application_options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@application_options</span>
+46:         <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">:exclude_arg_sections</span>] = <span class="ruby-identifier">sections</span>
+47:       <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000290" class="method-detail">
+        <a name="M000290"></a>
+
+        <div class="method-heading">
+          <a href="#M000290" class="method-signature">
           <span class="method-name">intialize_application_options</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Creates an empty set of <a href="Application.html#M000277">options</a>
+Creates an empty set of <a href="Application.html#M000292">options</a>
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000275-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000275-source">
+            onclick="toggleCode('M000290-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000290-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 68</span>
-68:             <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">intialize_application_options</span>
-69:                 <span class="ruby-ivar">@application_options</span> = {<span class="ruby-identifier">:description</span>   =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">nil</span>,
-70:                                         <span class="ruby-identifier">:usage</span>         =<span class="ruby-operator">&gt;</span> [],
-71:                                         <span class="ruby-identifier">:cli_arguments</span> =<span class="ruby-operator">&gt;</span> []}
-72:             <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 79</span>
+79:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">intialize_application_options</span>
+80:         <span class="ruby-ivar">@application_options</span> = {<span class="ruby-identifier">:description</span>          =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">nil</span>,
+81:                                 <span class="ruby-identifier">:usage</span>                =<span class="ruby-operator">&gt;</span> [],
+82:                                 <span class="ruby-identifier">:cli_arguments</span>        =<span class="ruby-operator">&gt;</span> [],
+83:                                 <span class="ruby-identifier">:exclude_arg_sections</span> =<span class="ruby-operator">&gt;</span> []}
+84:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000274" class="method-detail">
-        <a name="M000274"></a>
+      <div id="method-M000289" class="method-detail">
+        <a name="M000289"></a>
 
         <div class="method-heading">
-          <a href="#M000274" class="method-signature">
+          <a href="#M000289" class="method-signature">
           <span class="method-name">option</span><span class="method-args">(name, arguments)</span>
           </a>
         </div>
@@ -299,7 +323,7 @@
         <div class="method-description">
           <p>
 Wrapper to create command line <a
-href="Application.html#M000277">options</a>
+href="Application.html#M000292">options</a>
 </p>
 <pre>
  - name: varaible name that will be used to access the option value
@@ -312,58 +336,59 @@
    the supplied value
 
   option :foo,
-     :description =&gt; &quot;The foo option&quot;
-     :arguments   =&gt; [&quot;--foo ARG&quot;]
+         :description =&gt; &quot;The foo option&quot;
+         :arguments   =&gt; [&quot;--foo ARG&quot;]
 </pre>
 <p>
 after this the value supplied will be in <a
-href="Application.html#M000276">configuration</a>[:foo]
+href="Application.html#M000291">configuration</a>[:foo]
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000274-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000274-source">
+            onclick="toggleCode('M000289-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000289-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 54</span>
-54:             <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">option</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">arguments</span>)
-55:                 <span class="ruby-identifier">opt</span> = {<span class="ruby-identifier">:name</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">name</span>,
-56:                        <span class="ruby-identifier">:description</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">nil</span>,
-57:                        <span class="ruby-identifier">:arguments</span> =<span class="ruby-operator">&gt;</span> [],
-58:                        <span class="ruby-identifier">:type</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">String</span>,
-59:                        <span class="ruby-identifier">:required</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">false</span>,
-60:                        <span class="ruby-identifier">:validate</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">Proc</span>.<span class="ruby-identifier">new</span> { <span class="ruby-keyword kw">true</span> }}
-61: 
-62:                 <span class="ruby-identifier">arguments</span>.<span class="ruby-identifier">each_pair</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-identifier">opt</span>[<span class="ruby-identifier">k</span>] = <span class="ruby-identifier">v</span>}
-63: 
-64:                 <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">:cli_arguments</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">opt</span>
-65:             <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 65</span>
+65:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">option</span>(<span class="ruby-identifier">name</span>, <span class="ruby-identifier">arguments</span>)
+66:         <span class="ruby-identifier">opt</span> = {<span class="ruby-identifier">:name</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">name</span>,
+67:                <span class="ruby-identifier">:description</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">nil</span>,
+68:                <span class="ruby-identifier">:arguments</span> =<span class="ruby-operator">&gt;</span> [],
+69:                <span class="ruby-identifier">:type</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">String</span>,
+70:                <span class="ruby-identifier">:required</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">false</span>,
+71:                <span class="ruby-identifier">:validate</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">Proc</span>.<span class="ruby-identifier">new</span> { <span class="ruby-keyword kw">true</span> }}
+72: 
+73:         <span class="ruby-identifier">arguments</span>.<span class="ruby-identifier">each_pair</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">k</span>,<span class="ruby-identifier">v</span><span class="ruby-operator">|</span> <span class="ruby-identifier">opt</span>[<span class="ruby-identifier">k</span>] = <span class="ruby-identifier">v</span>}
+74: 
+75:         <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">:cli_arguments</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">opt</span>
+76:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000273" class="method-detail">
-        <a name="M000273"></a>
+      <div id="method-M000287" class="method-detail">
+        <a name="M000287"></a>
 
         <div class="method-heading">
-          <a href="#M000273" class="method-signature">
+          <a href="#M000287" class="method-signature">
           <span class="method-name">usage</span><span class="method-args">(usage)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Supplies <a href="Application.html#M000273">usage</a> information, calling
+Supplies <a href="Application.html#M000287">usage</a> information, calling
 multiple times will create multiple <a
-href="Application.html#M000273">usage</a> lines in &#8212;help output
+href="Application.html#M000287">usage</a> lines in &#8212;<a
+href="Application.html#M000302">help</a> output
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000273-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000273-source">
+            onclick="toggleCode('M000287-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000287-source">
 <pre>
     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 34</span>
-34:             <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usage</span>(<span class="ruby-identifier">usage</span>)
-35:                 <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">:usage</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">usage</span>
-36:             <span class="ruby-keyword kw">end</span>
+34:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">usage</span>(<span class="ruby-identifier">usage</span>)
+35:         <span class="ruby-keyword kw">self</span>[<span class="ruby-identifier">:usage</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">usage</span>
+36:       <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -371,11 +396,11 @@
 
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000282" class="method-detail">
-        <a name="M000282"></a>
+      <div id="method-M000300" class="method-detail">
+        <a name="M000300"></a>
 
         <div class="method-heading">
-          <a href="#M000282" class="method-signature">
+          <a href="#M000300" class="method-signature">
           <span class="method-name">application_cli_arguments</span><span class="method-args">()</span>
           </a>
         </div>
@@ -385,23 +410,23 @@
 Returns an array of all the arguments built using calls to optin
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000282-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000282-source">
+            onclick="toggleCode('M000300-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000300-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 202</span>
-202:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_cli_arguments</span>
-203:             <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">application_options</span>[<span class="ruby-identifier">:cli_arguments</span>]
-204:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 245</span>
+245:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_cli_arguments</span>
+246:       <span class="ruby-identifier">application_options</span>[<span class="ruby-identifier">:cli_arguments</span>]
+247:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000280" class="method-detail">
-        <a name="M000280"></a>
+      <div id="method-M000298" class="method-detail">
+        <a name="M000298"></a>
 
         <div class="method-heading">
-          <a href="#M000280" class="method-signature">
+          <a href="#M000298" class="method-signature">
           <span class="method-name">application_description</span><span class="method-args">()</span>
           </a>
         </div>
@@ -409,27 +434,27 @@
         <div class="method-description">
           <p>
 Retrieve the current application <a
-href="Application.html#M000272">description</a>
+href="Application.html#M000286">description</a>
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000280-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000280-source">
+            onclick="toggleCode('M000298-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000298-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 189</span>
-189:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_description</span>
-190:             <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">application_options</span>[<span class="ruby-identifier">:description</span>]
-191:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 232</span>
+232:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_description</span>
+233:       <span class="ruby-identifier">application_options</span>[<span class="ruby-identifier">:description</span>]
+234:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000283" class="method-detail">
-        <a name="M000283"></a>
+      <div id="method-M000301" class="method-detail">
+        <a name="M000301"></a>
 
         <div class="method-heading">
-          <a href="#M000283" class="method-signature">
-          <span class="method-name">application_failure</span><span class="method-args">(e)</span>
+          <a href="#M000301" class="method-signature">
+          <span class="method-name">application_failure</span><span class="method-args">(e, err_dest=STDERR)</span>
           </a>
         </div>
       
@@ -439,203 +464,372 @@
 will log backtraces if its in verbose mode only
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000283-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000283-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 208</span>
-208:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_failure</span>(<span class="ruby-identifier">e</span>)
-209:             <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{$0} failed to run: #{e} (#{e.class})&quot;</span>
-210: 
-211:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>
-212:                 <span class="ruby-identifier">e</span>.<span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">each</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">l</span><span class="ruby-operator">|</span> <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;\tfrom #{l}&quot;</span>} <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:verbose</span>]
-213:             <span class="ruby-keyword kw">else</span>
-214:                 <span class="ruby-identifier">e</span>.<span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">each</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">l</span><span class="ruby-operator">|</span> <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;\tfrom #{l}&quot;</span>}
-215:             <span class="ruby-keyword kw">end</span>
-216: 
-217:             <span class="ruby-constant">MCollective</span><span class="ruby-operator">::</span><span class="ruby-constant">PluginManager</span>[<span class="ruby-value str">&quot;connector_plugin&quot;</span>].<span class="ruby-identifier">disconnect</span> <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">true</span>
-218: 
-219:             <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
-220:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000279" class="method-detail">
-        <a name="M000279"></a>
-
-        <div class="method-heading">
-          <a href="#M000279" class="method-signature">
-          <span class="method-name">application_parse_options</span><span class="method-args">()</span>
+            onclick="toggleCode('M000301-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000301-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 251</span>
+251:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_failure</span>(<span class="ruby-identifier">e</span>, <span class="ruby-identifier">err_dest</span>=<span class="ruby-constant">STDERR</span>)
+252:       <span class="ruby-comment cmt"># peole can use exit() anywhere and not get nasty backtraces as a result</span>
+253:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">e</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">SystemExit</span>)
+254:         <span class="ruby-identifier">disconnect</span>
+255:         <span class="ruby-identifier">raise</span>(<span class="ruby-identifier">e</span>)
+256:       <span class="ruby-keyword kw">end</span>
+257: 
+258:       <span class="ruby-identifier">err_dest</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{$0} failed to run: #{e} (#{e.class})&quot;</span>
+259: 
+260:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-operator">||</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:verbose</span>]
+261:         <span class="ruby-identifier">e</span>.<span class="ruby-identifier">backtrace</span>.<span class="ruby-identifier">each</span>{<span class="ruby-operator">|</span><span class="ruby-identifier">l</span><span class="ruby-operator">|</span> <span class="ruby-identifier">err_dest</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;\tfrom #{l}&quot;</span>}
+262:       <span class="ruby-keyword kw">end</span>
+263: 
+264:       <span class="ruby-identifier">disconnect</span>
+265: 
+266:       <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
+267:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000297" class="method-detail">
+        <a name="M000297"></a>
+
+        <div class="method-heading">
+          <a href="#M000297" class="method-signature">
+          <span class="method-name">application_options</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Retrieves the full hash of application <a
+href="Application.html#M000292">options</a>
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000297-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000297-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 227</span>
+227:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_options</span>
+228:       <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">application_options</span>
+229:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000295" class="method-detail">
+        <a name="M000295"></a>
+
+        <div class="method-heading">
+          <a href="#M000295" class="method-signature">
+          <span class="method-name">application_parse_options</span><span class="method-args">(help=false)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
 Builds an ObjectParser config, parse the CLI <a
-href="Application.html#M000277">options</a> and validates based on the <a
-href="Application.html#M000274">option</a> config
+href="Application.html#M000292">options</a> and validates based on the <a
+href="Application.html#M000289">option</a> config
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000279-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000279-source">
+            onclick="toggleCode('M000295-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000295-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 99</span>
- 99:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_parse_options</span>
-100:             <span class="ruby-ivar">@options</span> = <span class="ruby-identifier">rpcoptions</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">parser</span>, <span class="ruby-identifier">options</span><span class="ruby-operator">|</span>
-101:                 <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">define_head</span> <span class="ruby-identifier">application_description</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">application_description</span>
-102:                 <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">banner</span> = <span class="ruby-value str">&quot;&quot;</span>
-103: 
-104:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">application_usage</span>
-105:                     <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">separator</span> <span class="ruby-value str">&quot;&quot;</span>
-106: 
-107:                     <span class="ruby-identifier">application_usage</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">u</span><span class="ruby-operator">|</span>
-108:                         <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">separator</span> <span class="ruby-node">&quot;Usage: #{u}&quot;</span>
-109:                     <span class="ruby-keyword kw">end</span>
-110: 
-111:                     <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">separator</span> <span class="ruby-value str">&quot;&quot;</span>
-112:                 <span class="ruby-keyword kw">end</span>
-113: 
-114:                 <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">define_tail</span> <span class="ruby-value str">&quot;&quot;</span>
-115:                 <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">define_tail</span> <span class="ruby-node">&quot;The Marionette Collective #{MCollective.version}&quot;</span>
-116: 
-117: 
-118:                 <span class="ruby-identifier">application_cli_arguments</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">carg</span><span class="ruby-operator">|</span>
-119:                     <span class="ruby-identifier">opts_array</span> = []
-120: 
-121:                     <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">:on</span>
-122: 
-123:                     <span class="ruby-comment cmt"># if a default is set from the application set it up front</span>
-124:                     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">:default</span>)
-125:                         <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] = <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:default</span>]
-126:                     <span class="ruby-keyword kw">end</span>
-127: 
-128:                     <span class="ruby-comment cmt"># :arguments are multiple possible ones</span>
-129:                     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:arguments</span>].<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Array</span>)
-130:                         <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:arguments</span>].<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">a</span><span class="ruby-operator">|</span> <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">a</span>}
-131:                     <span class="ruby-keyword kw">else</span>
-132:                         <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:arguments</span>]
-133:                     <span class="ruby-keyword kw">end</span>
-134: 
-135:                     <span class="ruby-comment cmt"># type was given and its not one of our special types, just pass it onto optparse</span>
-136:                     <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>] <span class="ruby-keyword kw">and</span> <span class="ruby-operator">!</span> [<span class="ruby-identifier">:bool</span>, <span class="ruby-identifier">:array</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>])
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 135</span>
+135:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_parse_options</span>(<span class="ruby-identifier">help</span>=<span class="ruby-keyword kw">false</span>)
+136:       <span class="ruby-ivar">@options</span> <span class="ruby-operator">||=</span> {<span class="ruby-identifier">:verbose</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">false</span>}
 137: 
-138:                     <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:description</span>]
-139: 
-140:                     <span class="ruby-comment cmt"># Handle our special types else just rely on the optparser to handle the types</span>
-141:                     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>] <span class="ruby-operator">==</span> <span class="ruby-identifier">:bool</span>
-142:                         <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">send</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">opts_array</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">v</span><span class="ruby-operator">|</span>
-143:                             <span class="ruby-identifier">validate_option</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:validate</span>], <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>], <span class="ruby-identifier">v</span>)
+138:       <span class="ruby-ivar">@options</span> = <span class="ruby-identifier">clioptions</span>(<span class="ruby-identifier">help</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">parser</span>, <span class="ruby-identifier">options</span><span class="ruby-operator">|</span>
+139:         <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">define_head</span> <span class="ruby-identifier">application_description</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">application_description</span>
+140:         <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">banner</span> = <span class="ruby-value str">&quot;&quot;</span>
+141: 
+142:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">application_usage</span>
+143:           <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">separator</span> <span class="ruby-value str">&quot;&quot;</span>
 144: 
-145:                             <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] = <span class="ruby-keyword kw">true</span>
-146:                         <span class="ruby-keyword kw">end</span>
-147: 
-148:                     <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>] <span class="ruby-operator">==</span> <span class="ruby-identifier">:array</span>
-149:                         <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">send</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">opts_array</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">v</span><span class="ruby-operator">|</span>
-150:                             <span class="ruby-identifier">validate_option</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:validate</span>], <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>], <span class="ruby-identifier">v</span>)
+145:           <span class="ruby-identifier">application_usage</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">u</span><span class="ruby-operator">|</span>
+146:             <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">separator</span> <span class="ruby-node">&quot;Usage: #{u}&quot;</span>
+147:           <span class="ruby-keyword kw">end</span>
+148: 
+149:           <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">separator</span> <span class="ruby-value str">&quot;&quot;</span>
+150:         <span class="ruby-keyword kw">end</span>
 151: 
-152:                             <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] = [] <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">configuration</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>])
-153:                             <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">v</span>
-154:                         <span class="ruby-keyword kw">end</span>
+152:         <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">define_tail</span> <span class="ruby-value str">&quot;&quot;</span>
+153:         <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">define_tail</span> <span class="ruby-node">&quot;The Marionette Collective #{MCollective.version}&quot;</span>
+154: 
 155: 
-156:                     <span class="ruby-keyword kw">else</span>
-157:                         <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">send</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">opts_array</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">v</span><span class="ruby-operator">|</span>
-158:                             <span class="ruby-identifier">validate_option</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:validate</span>], <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>], <span class="ruby-identifier">v</span>)
-159: 
-160:                             <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] = <span class="ruby-identifier">v</span>
-161:                         <span class="ruby-keyword kw">end</span>
-162:                     <span class="ruby-keyword kw">end</span>
-163:                 <span class="ruby-keyword kw">end</span>
-164:             <span class="ruby-keyword kw">end</span>
+156:         <span class="ruby-identifier">application_cli_arguments</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">carg</span><span class="ruby-operator">|</span>
+157:           <span class="ruby-identifier">opts_array</span> = []
+158: 
+159:           <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">:on</span>
+160: 
+161:           <span class="ruby-comment cmt"># if a default is set from the application set it up front</span>
+162:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">:default</span>)
+163:             <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] = <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:default</span>]
+164:           <span class="ruby-keyword kw">end</span>
 165: 
-166:             <span class="ruby-comment cmt"># Check all required parameters were set</span>
-167:             <span class="ruby-identifier">validation_passed</span> = <span class="ruby-keyword kw">true</span>
-168:             <span class="ruby-identifier">application_cli_arguments</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">carg</span><span class="ruby-operator">|</span>
-169:                 <span class="ruby-comment cmt"># Check for required arguments</span>
-170:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:required</span>]
-171:                     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">configuration</span>[ <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>] ]
-172:                         <span class="ruby-identifier">validation_passed</span> = <span class="ruby-keyword kw">false</span>
-173:                         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;The #{carg[:name]} option is mandatory&quot;</span>
-174:                     <span class="ruby-keyword kw">end</span>
-175:                 <span class="ruby-keyword kw">end</span>
-176:             <span class="ruby-keyword kw">end</span>
+166:           <span class="ruby-comment cmt"># :arguments are multiple possible ones</span>
+167:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:arguments</span>].<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Array</span>)
+168:             <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:arguments</span>].<span class="ruby-identifier">each</span> {<span class="ruby-operator">|</span><span class="ruby-identifier">a</span><span class="ruby-operator">|</span> <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">a</span>}
+169:           <span class="ruby-keyword kw">else</span>
+170:             <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:arguments</span>]
+171:           <span class="ruby-keyword kw">end</span>
+172: 
+173:           <span class="ruby-comment cmt"># type was given and its not one of our special types, just pass it onto optparse</span>
+174:           <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>] <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>] <span class="ruby-keyword kw">and</span> <span class="ruby-operator">!</span> [<span class="ruby-identifier">:bool</span>, <span class="ruby-identifier">:array</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>])
+175: 
+176:           <span class="ruby-identifier">opts_array</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:description</span>]
 177: 
-178:             <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">validation_passed</span>
-179:                 <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;\nPlease run with --help for detailed help&quot;</span>
-180:                 <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
-181:             <span class="ruby-keyword kw">end</span>
+178:           <span class="ruby-comment cmt"># Handle our special types else just rely on the optparser to handle the types</span>
+179:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>] <span class="ruby-operator">==</span> <span class="ruby-identifier">:bool</span>
+180:             <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">send</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">opts_array</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">v</span><span class="ruby-operator">|</span>
+181:               <span class="ruby-identifier">validate_option</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:validate</span>], <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>], <span class="ruby-identifier">v</span>)
 182: 
-183:             <span class="ruby-identifier">post_option_parser</span>(<span class="ruby-identifier">configuration</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:post_option_parser</span>)
-184:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-185:             <span class="ruby-identifier">application_failure</span>(<span class="ruby-identifier">e</span>)
-186:         <span class="ruby-keyword kw">end</span>
+183:               <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] = <span class="ruby-keyword kw">true</span>
+184:             <span class="ruby-keyword kw">end</span>
+185: 
+186:           <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:type</span>] <span class="ruby-operator">==</span> <span class="ruby-identifier">:array</span>
+187:             <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">send</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">opts_array</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">v</span><span class="ruby-operator">|</span>
+188:               <span class="ruby-identifier">validate_option</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:validate</span>], <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>], <span class="ruby-identifier">v</span>)
+189: 
+190:               <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] = [] <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">configuration</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>])
+191:               <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">v</span>
+192:             <span class="ruby-keyword kw">end</span>
+193: 
+194:           <span class="ruby-keyword kw">else</span>
+195:             <span class="ruby-identifier">parser</span>.<span class="ruby-identifier">send</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">opts_array</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">v</span><span class="ruby-operator">|</span>
+196:               <span class="ruby-identifier">validate_option</span>(<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:validate</span>], <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>], <span class="ruby-identifier">v</span>)
+197: 
+198:               <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>]] = <span class="ruby-identifier">v</span>
+199:             <span class="ruby-keyword kw">end</span>
+200:           <span class="ruby-keyword kw">end</span>
+201:         <span class="ruby-keyword kw">end</span>
+202:       <span class="ruby-keyword kw">end</span>
+203:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000281" class="method-detail">
-        <a name="M000281"></a>
+      <div id="method-M000299" class="method-detail">
+        <a name="M000299"></a>
 
         <div class="method-heading">
-          <a href="#M000281" class="method-signature">
+          <a href="#M000299" class="method-signature">
           <span class="method-name">application_usage</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Return the current <a href="Application.html#M000273">usage</a> text false
+Return the current <a href="Application.html#M000287">usage</a> text false
 if nothing is set
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000281-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000281-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 194</span>
-194:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_usage</span>
-195:             <span class="ruby-identifier">usage</span> = <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">class</span>.<span class="ruby-identifier">application_options</span>[<span class="ruby-identifier">:usage</span>]
-196: 
-197:             <span class="ruby-identifier">usage</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-value">? </span><span class="ruby-keyword kw">false</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">usage</span>
-198:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000276" class="method-detail">
-        <a name="M000276"></a>
-
-        <div class="method-heading">
-          <a href="#M000276" class="method-signature">
+            onclick="toggleCode('M000299-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000299-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 237</span>
+237:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">application_usage</span>
+238:       <span class="ruby-identifier">usage</span> = <span class="ruby-identifier">application_options</span>[<span class="ruby-identifier">:usage</span>]
+239: 
+240:       <span class="ruby-identifier">usage</span>.<span class="ruby-identifier">empty?</span> <span class="ruby-value">? </span><span class="ruby-keyword kw">false</span> <span class="ruby-operator">:</span> <span class="ruby-identifier">usage</span>
+241:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000294" class="method-detail">
+        <a name="M000294"></a>
+
+        <div class="method-heading">
+          <a href="#M000294" class="method-signature">
+          <span class="method-name">clioptions</span><span class="method-args">(help) {|parser, options| ...}</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Creates a standard <a href="Application.html#M000292">options</a> hash,
+pass in a block to add extra headings etc see <a
+href="Optionparser.html">Optionparser</a>
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000294-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000294-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 111</span>
+111:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">clioptions</span>(<span class="ruby-identifier">help</span>)
+112:       <span class="ruby-identifier">oparser</span> = <span class="ruby-constant">Optionparser</span>.<span class="ruby-identifier">new</span>({<span class="ruby-identifier">:verbose</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">false</span>, <span class="ruby-identifier">:progress_bar</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-keyword kw">true</span>}, <span class="ruby-value str">&quot;filter&quot;</span>, <span class="ruby-identifier">application_options</span>[<span class="ruby-identifier">:exclude_arg_sections</span>])
+113: 
+114:       <span class="ruby-identifier">options</span> = <span class="ruby-identifier">oparser</span>.<span class="ruby-identifier">parse</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">parser</span>, <span class="ruby-identifier">options</span><span class="ruby-operator">|</span>
+115:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">block_given?</span>
+116:           <span class="ruby-keyword kw">yield</span>(<span class="ruby-identifier">parser</span>, <span class="ruby-identifier">options</span>)
+117:         <span class="ruby-keyword kw">end</span>
+118: 
+119:         <span class="ruby-constant">RPC</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">add_simplerpc_options</span>(<span class="ruby-identifier">parser</span>, <span class="ruby-identifier">options</span>) <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">application_options</span>[<span class="ruby-identifier">:exclude_arg_sections</span>].<span class="ruby-identifier">include?</span>(<span class="ruby-value str">&quot;rpc&quot;</span>)
+120:       <span class="ruby-keyword kw">end</span>
+121: 
+122:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">oparser</span>.<span class="ruby-identifier">parser</span>.<span class="ruby-identifier">help</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">help</span>
+123: 
+124:       <span class="ruby-identifier">validate_cli_options</span>
+125: 
+126:       <span class="ruby-identifier">post_option_parser</span>(<span class="ruby-identifier">configuration</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:post_option_parser</span>)
+127: 
+128:       <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">options</span>
+129:     <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+130:       <span class="ruby-identifier">application_failure</span>(<span class="ruby-identifier">e</span>)
+131:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000291" class="method-detail">
+        <a name="M000291"></a>
+
+        <div class="method-heading">
+          <a href="#M000291" class="method-signature">
           <span class="method-name">configuration</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-The application <a href="Application.html#M000276">configuration</a> built
+The application <a href="Application.html#M000291">configuration</a> built
 from CLI arguments
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000276-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000276-source">
-<pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 76</span>
-76:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configuration</span>
-77:             <span class="ruby-ivar">@application_configuration</span> <span class="ruby-operator">||=</span> {}
-78:             <span class="ruby-ivar">@application_configuration</span>
-79:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000285" class="method-detail">
-        <a name="M000285"></a>
-
-        <div class="method-heading">
-          <a href="#M000285" class="method-signature">
+            onclick="toggleCode('M000291-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000291-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 88</span>
+88:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">configuration</span>
+89:       <span class="ruby-ivar">@application_configuration</span> <span class="ruby-operator">||=</span> {}
+90:       <span class="ruby-ivar">@application_configuration</span>
+91:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000304" class="method-detail">
+        <a name="M000304"></a>
+
+        <div class="method-heading">
+          <a href="#M000304" class="method-signature">
+          <span class="method-name">disconnect</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000304-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000304-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 291</span>
+291:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">disconnect</span>
+292:       <span class="ruby-constant">MCollective</span><span class="ruby-operator">::</span><span class="ruby-constant">PluginManager</span>[<span class="ruby-value str">&quot;connector_plugin&quot;</span>].<span class="ruby-identifier">disconnect</span>
+293:     <span class="ruby-keyword kw">rescue</span>
+294:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000306" class="method-detail">
+        <a name="M000306"></a>
+
+        <div class="method-heading">
+          <a href="#M000306" class="method-signature">
+          <span class="method-name">halt</span><span class="method-args">(stats)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+A helper that creates a consistent exit code for applications by looking at
+an instance of <a href="RPC/Stats.html">MCollective::RPC::Stats</a>
+</p>
+<p>
+Exit with 0 if nodes were discovered and all passed Exit with 0 if no
+discovery were done and &gt; 0 responses were received Exit with 1 if no
+nodes were discovered Exit with 2 if nodes were discovered but some <a
+href="RPC.html">RPC</a> requests failed Exit with 3 if nodes were
+discovered, but not responses receivedif Exit with 4 if no discovery were
+done and no responses were received
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000306-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000306-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 312</span>
+312:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">halt</span>(<span class="ruby-identifier">stats</span>)
+313:       <span class="ruby-identifier">request_stats</span> = {<span class="ruby-identifier">:discoverytime</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>,
+314:                        <span class="ruby-identifier">:discovered</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>,
+315:                        <span class="ruby-identifier">:failcount</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>}.<span class="ruby-identifier">merge</span>(<span class="ruby-identifier">stats</span>.<span class="ruby-identifier">to_hash</span>)
+316: 
+317:       <span class="ruby-comment cmt"># was discovery done?</span>
+318:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">request_stats</span>[<span class="ruby-identifier">:discoverytime</span>] <span class="ruby-operator">!=</span> <span class="ruby-value">0</span>
+319:         <span class="ruby-comment cmt"># was any nodes discovered</span>
+320:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">request_stats</span>[<span class="ruby-identifier">:discovered</span>] <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
+321:           <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
+322: 
+323:         <span class="ruby-comment cmt"># nodes were discovered, did we get responses</span>
+324:         <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">request_stats</span>[<span class="ruby-identifier">:responses</span>] <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
+325:           <span class="ruby-identifier">exit</span> <span class="ruby-value">3</span>
+326: 
+327:         <span class="ruby-keyword kw">else</span>
+328:           <span class="ruby-comment cmt"># we got responses and discovery was done, no failures</span>
+329:           <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">request_stats</span>[<span class="ruby-identifier">:failcount</span>] <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
+330:             <span class="ruby-identifier">exit</span> <span class="ruby-value">0</span>
+331:           <span class="ruby-keyword kw">else</span>
+332:             <span class="ruby-identifier">exit</span> <span class="ruby-value">2</span>
+333:           <span class="ruby-keyword kw">end</span>
+334:         <span class="ruby-keyword kw">end</span>
+335:       <span class="ruby-keyword kw">else</span>
+336:         <span class="ruby-comment cmt"># discovery wasnt done and we got no responses</span>
+337:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">request_stats</span>[<span class="ruby-identifier">:responses</span>] <span class="ruby-operator">==</span> <span class="ruby-value">0</span>
+338:           <span class="ruby-identifier">exit</span> <span class="ruby-value">4</span>
+339:         <span class="ruby-keyword kw">else</span>
+340:           <span class="ruby-identifier">exit</span> <span class="ruby-value">0</span>
+341:         <span class="ruby-keyword kw">end</span>
+342:       <span class="ruby-keyword kw">end</span>
+343:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000302" class="method-detail">
+        <a name="M000302"></a>
+
+        <div class="method-heading">
+          <a href="#M000302" class="method-signature">
+          <span class="method-name">help</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000302-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000302-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 269</span>
+269:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">help</span>
+270:       <span class="ruby-identifier">application_parse_options</span>(<span class="ruby-keyword kw">true</span>)
+271:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000305" class="method-detail">
+        <a name="M000305"></a>
+
+        <div class="method-heading">
+          <a href="#M000305" class="method-signature">
           <span class="method-name">main</span><span class="method-args">()</span>
           </a>
         </div>
@@ -643,130 +837,170 @@
         <div class="method-description">
           <p>
 Fake abstract class that logs if the user tries to use an application
-without supplying a <a href="Application.html#M000285">main</a> override
+without supplying a <a href="Application.html#M000305">main</a> override
 method.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000285-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000285-source">
+            onclick="toggleCode('M000305-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000305-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 242</span>
-242:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">main</span>
-243:             <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Applications need to supply a 'main' method&quot;</span>
-244:             <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
-245:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 298</span>
+298:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">main</span>
+299:       <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;Applications need to supply a 'main' method&quot;</span>
+300:       <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
+301:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000277" class="method-detail">
-        <a name="M000277"></a>
+      <div id="method-M000292" class="method-detail">
+        <a name="M000292"></a>
 
         <div class="method-heading">
-          <a href="#M000277" class="method-signature">
+          <a href="#M000292" class="method-signature">
           <span class="method-name">options</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-The active <a href="Application.html#M000277">options</a> hash used for
-MC::Client and other <a href="Application.html#M000276">configuration</a>
+The active <a href="Application.html#M000292">options</a> hash used for
+MC::Client and other <a href="Application.html#M000291">configuration</a>
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000277-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000277-source">
+            onclick="toggleCode('M000292-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000292-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 82</span>
-82:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">options</span>
-83:             <span class="ruby-ivar">@options</span>
-84:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 94</span>
+94:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">options</span>
+95:       <span class="ruby-ivar">@options</span>
+96:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000286" class="method-detail">
-        <a name="M000286"></a>
+      <div id="method-M000307" class="method-detail">
+        <a name="M000307"></a>
 
         <div class="method-heading">
-          <a href="#M000286" class="method-signature">
+          <a href="#M000307" class="method-signature">
           <span class="method-name">rpcclient</span><span class="method-args">(agent, flags = {})</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Wrapper around <a href="RPC.html#M000082">MC::RPC#rpcclient</a> that
-forcably supplies our <a href="Application.html#M000277">options</a> hash
+Wrapper around <a href="RPC.html#M000070">MC::RPC#rpcclient</a> that
+forcably supplies our <a href="Application.html#M000292">options</a> hash
 if someone forgets to pass in <a
-href="Application.html#M000277">options</a> in an application the filters
-and other cli <a href="Application.html#M000277">options</a> wouldnt take
+href="Application.html#M000292">options</a> in an application the filters
+and other cli <a href="Application.html#M000292">options</a> wouldnt take
 effect which could have a disasterous outcome
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000286-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000286-source">
+            onclick="toggleCode('M000307-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000307-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 250</span>
-250:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rpcclient</span>(<span class="ruby-identifier">agent</span>, <span class="ruby-identifier">flags</span> = {})
-251:             <span class="ruby-identifier">flags</span>[<span class="ruby-identifier">:options</span>] = <span class="ruby-identifier">options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">flags</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">:options</span>)
-252: 
-253:             <span class="ruby-keyword kw">super</span>
-254:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 348</span>
+348:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">rpcclient</span>(<span class="ruby-identifier">agent</span>, <span class="ruby-identifier">flags</span> = {})
+349:       <span class="ruby-identifier">flags</span>[<span class="ruby-identifier">:options</span>] = <span class="ruby-identifier">options</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">flags</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">:options</span>)
+350: 
+351:       <span class="ruby-keyword kw">super</span>
+352:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000284" class="method-detail">
-        <a name="M000284"></a>
+      <div id="method-M000303" class="method-detail">
+        <a name="M000303"></a>
 
         <div class="method-heading">
-          <a href="#M000284" class="method-signature">
+          <a href="#M000303" class="method-signature">
           <span class="method-name">run</span><span class="method-args">()</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-The <a href="Application.html#M000285">main</a> logic loop, builds up the
-<a href="Application.html#M000277">options</a>, validate <a
-href="Application.html#M000276">configuration</a> and calls the <a
-href="Application.html#M000285">main</a> as supplied by the user.
+The <a href="Application.html#M000305">main</a> logic loop, builds up the
+<a href="Application.html#M000292">options</a>, validate <a
+href="Application.html#M000291">configuration</a> and calls the <a
+href="Application.html#M000305">main</a> as supplied by the user.
 Disconnects when done and pass any exception onto the <a
-href="Application.html#M000283">application_failure</a> helper
+href="Application.html#M000301">application_failure</a> helper
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000284-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000284-source">
-<pre>
-     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 225</span>
-225:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">run</span>
-226:             <span class="ruby-identifier">application_parse_options</span>
-227: 
-228:             <span class="ruby-identifier">validate_configuration</span>(<span class="ruby-identifier">configuration</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:validate_configuration</span>)
-229: 
-230:             <span class="ruby-identifier">main</span>
-231: 
-232:             <span class="ruby-constant">MCollective</span><span class="ruby-operator">::</span><span class="ruby-constant">PluginManager</span>[<span class="ruby-value str">&quot;connector_plugin&quot;</span>].<span class="ruby-identifier">disconnect</span> <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">true</span>
-233: 
-234:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">SystemExit</span>
-235:             <span class="ruby-identifier">raise</span>
-236:         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-237:             <span class="ruby-identifier">application_failure</span>(<span class="ruby-identifier">e</span>)
-238:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000278" class="method-detail">
-        <a name="M000278"></a>
-
-        <div class="method-heading">
-          <a href="#M000278" class="method-signature">
+            onclick="toggleCode('M000303-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000303-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 276</span>
+276:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">run</span>
+277:       <span class="ruby-identifier">application_parse_options</span>
+278: 
+279:       <span class="ruby-identifier">validate_configuration</span>(<span class="ruby-identifier">configuration</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">:validate_configuration</span>)
+280: 
+281:       <span class="ruby-constant">Util</span>.<span class="ruby-identifier">setup_windows_sleeper</span> <span class="ruby-keyword kw">if</span> <span class="ruby-constant">Util</span>.<span class="ruby-identifier">windows?</span>
+282: 
+283:       <span class="ruby-identifier">main</span>
+284: 
+285:       <span class="ruby-identifier">disconnect</span>
+286: 
+287:     <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+288:       <span class="ruby-identifier">application_failure</span>(<span class="ruby-identifier">e</span>)
+289:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000296" class="method-detail">
+        <a name="M000296"></a>
+
+        <div class="method-heading">
+          <a href="#M000296" class="method-signature">
+          <span class="method-name">validate_cli_options</span><span class="method-args">()</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000296-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000296-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 205</span>
+205:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">validate_cli_options</span>
+206:       <span class="ruby-comment cmt"># Check all required parameters were set</span>
+207:       <span class="ruby-identifier">validation_passed</span> = <span class="ruby-keyword kw">true</span>
+208:       <span class="ruby-identifier">application_cli_arguments</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">carg</span><span class="ruby-operator">|</span>
+209:         <span class="ruby-comment cmt"># Check for required arguments</span>
+210:         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:required</span>]
+211:           <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">configuration</span>[ <span class="ruby-identifier">carg</span>[<span class="ruby-identifier">:name</span>] ]
+212:             <span class="ruby-identifier">validation_passed</span> = <span class="ruby-keyword kw">false</span>
+213:             <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;The #{carg[:name]} option is mandatory&quot;</span>
+214:           <span class="ruby-keyword kw">end</span>
+215:         <span class="ruby-keyword kw">end</span>
+216:       <span class="ruby-keyword kw">end</span>
+217: 
+218:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">validation_passed</span>
+219:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;\nPlease run with --help for detailed help&quot;</span>
+220:         <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
+221:       <span class="ruby-keyword kw">end</span>
+222: 
+223: 
+224:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000293" class="method-detail">
+        <a name="M000293"></a>
+
+        <div class="method-heading">
+          <a href="#M000293" class="method-signature">
           <span class="method-name">validate_option</span><span class="method-args">(blk, name, value)</span>
           </a>
         </div>
@@ -774,22 +1008,22 @@
         <div class="method-description">
           <p>
 Calls the supplied block in an <a
-href="Application.html#M000274">option</a> for validation, an error raised
+href="Application.html#M000289">option</a> for validation, an error raised
 will log to STDERR and exit the application
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000278-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000278-source">
+            onclick="toggleCode('M000293-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000293-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 88</span>
-88:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">validate_option</span>(<span class="ruby-identifier">blk</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">value</span>)
-89:             <span class="ruby-identifier">validation_result</span> = <span class="ruby-identifier">blk</span>.<span class="ruby-identifier">call</span>(<span class="ruby-identifier">value</span>)
-90: 
-91:             <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">validation_result</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">true</span>
-92:                 <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Validation of #{name} failed: #{validation_result}&quot;</span>
-93:                 <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
-94:             <span class="ruby-keyword kw">end</span>
-95:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/mcollective/application.rb, line 100</span>
+100:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">validate_option</span>(<span class="ruby-identifier">blk</span>, <span class="ruby-identifier">name</span>, <span class="ruby-identifier">value</span>)
+101:       <span class="ruby-identifier">validation_result</span> = <span class="ruby-identifier">blk</span>.<span class="ruby-identifier">call</span>(<span class="ruby-identifier">value</span>)
+102: 
+103:       <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">validation_result</span> <span class="ruby-operator">==</span> <span class="ruby-keyword kw">true</span>
+104:         <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Validation of #{name} failed: #{validation_result}&quot;</span>
+105:         <span class="ruby-identifier">exit</span> <span class="ruby-value">1</span>
+106:       <span class="ruby-keyword kw">end</span>
+107:     <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

=== removed file 'doc/classes/MCollective/Application/Controller.html'
--- doc/classes/MCollective/Application/Controller.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Application/Controller.html	1970-01-01 00:00:00 +0000
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: MCollective::Application::Controller</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">MCollective::Application::Controller</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/plugins/mcollective/application/controller_rb.html">
-                plugins/mcollective/application/controller.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Application
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000313">main</a>&nbsp;&nbsp;
-      <a href="#M000311">post_option_parser</a>&nbsp;&nbsp;
-      <a href="#M000310">print_statistics</a>&nbsp;&nbsp;
-      <a href="#M000312">validate_configuration</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-
-      <div id="method-M000313" class="method-detail">
-        <a name="M000313"></a>
-
-        <div class="method-heading">
-          <a href="#M000313" class="method-signature">
-          <span class="method-name">main</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000313-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000313-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/controller.rb, line 53</span>
-53:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">main</span>
-54:             <span class="ruby-identifier">client</span> = <span class="ruby-constant">MCollective</span><span class="ruby-operator">::</span><span class="ruby-constant">Client</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">options</span>[<span class="ruby-identifier">:config</span>])
-55:             <span class="ruby-identifier">client</span>.<span class="ruby-identifier">options</span> = <span class="ruby-identifier">options</span>
-56: 
-57:             <span class="ruby-identifier">counter</span> = <span class="ruby-value">0</span>
-58: 
-59:             <span class="ruby-identifier">command</span> = <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:command</span>]
-60:             <span class="ruby-identifier">command</span> <span class="ruby-operator">+=</span> <span class="ruby-node">&quot; #{configuration[:argument]}&quot;</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:argument</span>]
-61: 
-62:             <span class="ruby-identifier">statistics</span> = <span class="ruby-identifier">client</span>.<span class="ruby-identifier">discovered_req</span>(<span class="ruby-identifier">command</span>, <span class="ruby-value str">'mcollective'</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">response</span><span class="ruby-operator">|</span>
-63:                 <span class="ruby-keyword kw">next</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">response</span>
-64: 
-65:                 <span class="ruby-identifier">counter</span> <span class="ruby-operator">+=</span> <span class="ruby-value">1</span>
-66: 
-67:                 <span class="ruby-identifier">sender</span> = <span class="ruby-identifier">response</span>[<span class="ruby-identifier">:senderid</span>]
-68:                 <span class="ruby-identifier">body</span>   = <span class="ruby-identifier">response</span>[<span class="ruby-identifier">:body</span>]
-69: 
-70:                 <span class="ruby-keyword kw">case</span> <span class="ruby-identifier">command</span>
-71:                     <span class="ruby-keyword kw">when</span> <span class="ruby-regexp re">/^stats$/</span>
-72:                         <span class="ruby-identifier">print_statistics</span>(<span class="ruby-identifier">sender</span>, <span class="ruby-identifier">body</span>[<span class="ruby-identifier">:stats</span>])
-73:                     <span class="ruby-keyword kw">when</span> <span class="ruby-regexp re">/^reload_agent(?:.+)/</span>
-74:                         <span class="ruby-identifier">printf</span>(<span class="ruby-value str">&quot;%40s&gt; %s\n&quot;</span>, <span class="ruby-identifier">sender</span>, <span class="ruby-identifier">body</span>)
-75:                     <span class="ruby-keyword kw">else</span>
-76:                         <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:verbose</span>]
-77:                             <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;#{sender}&gt;&quot;</span>
-78:                             <span class="ruby-identifier">pp</span> <span class="ruby-identifier">body</span>
-79:                         <span class="ruby-keyword kw">else</span>
-80:                             <span class="ruby-identifier">puts</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">counter</span> <span class="ruby-operator">%</span> <span class="ruby-value">4</span> <span class="ruby-operator">==</span> <span class="ruby-value">1</span>
-81:                             <span class="ruby-identifier">print</span> <span class="ruby-node">&quot;#{sender} &quot;</span>
-82:                         <span class="ruby-keyword kw">end</span>
-83:                 <span class="ruby-keyword kw">end</span>
-84:             <span class="ruby-keyword kw">end</span>
-85: 
-86:             <span class="ruby-identifier">client</span>.<span class="ruby-identifier">disconnect</span>
-87: 
-88:             <span class="ruby-identifier">client</span>.<span class="ruby-identifier">display_stats</span>(<span class="ruby-identifier">statistics</span>, <span class="ruby-keyword kw">false</span>, <span class="ruby-value str">&quot;mcollectived controller summary&quot;</span>)
-89:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000311" class="method-detail">
-        <a name="M000311"></a>
-
-        <div class="method-heading">
-          <a href="#M000311" class="method-signature">
-          <span class="method-name">post_option_parser</span><span class="method-args">(configuration)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000311-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000311-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/controller.rb, line 31</span>
-31:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post_option_parser</span>(<span class="ruby-identifier">configuration</span>)
-32:             <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:command</span>] = <span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">shift</span> <span class="ruby-keyword kw">if</span> <span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-33:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000310" class="method-detail">
-        <a name="M000310"></a>
-
-        <div class="method-heading">
-          <a href="#M000310" class="method-signature">
-          <span class="method-name">print_statistics</span><span class="method-args">(sender, statistics)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000310-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000310-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/controller.rb, line 23</span>
-23:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">print_statistics</span>(<span class="ruby-identifier">sender</span>, <span class="ruby-identifier">statistics</span>)
-24:             <span class="ruby-identifier">printf</span>(<span class="ruby-value str">&quot;%40s&gt; total=%d, replies=%d, valid=%d, invalid=%d, &quot;</span> <span class="ruby-operator">+</span>
-25:                 <span class="ruby-value str">&quot;filtered=%d, passed=%d\n&quot;</span>, <span class="ruby-identifier">sender</span>,
-26:                 <span class="ruby-identifier">statistics</span>[<span class="ruby-identifier">:total</span>], <span class="ruby-identifier">statistics</span>[<span class="ruby-identifier">:replies</span>],
-27:                 <span class="ruby-identifier">statistics</span>[<span class="ruby-identifier">:validated</span>], <span class="ruby-identifier">statistics</span>[<span class="ruby-identifier">:unvalidated</span>],
-28:                 <span class="ruby-identifier">statistics</span>[<span class="ruby-identifier">:filtered</span>], <span class="ruby-identifier">statistics</span>[<span class="ruby-identifier">:passed</span>])
-29:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000312" class="method-detail">
-        <a name="M000312"></a>
-
-        <div class="method-heading">
-          <a href="#M000312" class="method-signature">
-          <span class="method-name">validate_configuration</span><span class="method-args">(configuration)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000312-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000312-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/controller.rb, line 35</span>
-35:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">validate_configuration</span>(<span class="ruby-identifier">configuration</span>)
-36:             <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">configuration</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">:command</span>)
-37:                 <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Please specify a command and optional arguments&quot;</span>
-38:             <span class="ruby-keyword kw">end</span>
-39: 
-40:             <span class="ruby-comment cmt">#</span>
-41:             <span class="ruby-comment cmt"># When asked to restart an agent we need to make sure that</span>
-42:             <span class="ruby-comment cmt"># we have this agent name and set appropriate filters ...</span>
-43:             <span class="ruby-comment cmt">#</span>
-44:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:command</span>].<span class="ruby-identifier">match</span>(<span class="ruby-regexp re">/^reload_agent$/</span>)
-45:                 <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">configuration</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">:argument</span>)
-46:                     <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Please specify an agent name to reload with --argument&quot;</span>
-47:                 <span class="ruby-keyword kw">end</span>
-48: 
-49:                 <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:filter</span>][<span class="ruby-value str">'agent'</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:argument</span>]
-50:             <span class="ruby-keyword kw">end</span>
-51:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file

=== removed file 'doc/classes/MCollective/Application/Facts.html'
--- doc/classes/MCollective/Application/Facts.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Application/Facts.html	1970-01-01 00:00:00 +0000
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: MCollective::Application::Facts</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">MCollective::Application::Facts</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/plugins/mcollective/application/facts_rb.html">
-                plugins/mcollective/application/facts.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                <a href="../Application.html">
-                MCollective::Application
-               </a>
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000319">main</a>&nbsp;&nbsp;
-      <a href="#M000316">post_option_parser</a>&nbsp;&nbsp;
-      <a href="#M000318">show_single_fact_report</a>&nbsp;&nbsp;
-      <a href="#M000317">validate_configuration</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-
-      <div id="method-M000319" class="method-detail">
-        <a name="M000319"></a>
-
-        <div class="method-heading">
-          <a href="#M000319" class="method-signature">
-          <span class="method-name">main</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000319-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000319-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/facts.rb, line 30</span>
-30:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">main</span>
-31:         <span class="ruby-identifier">rpcutil</span> = <span class="ruby-identifier">rpcclient</span>(<span class="ruby-value str">&quot;rpcutil&quot;</span>)
-32:         <span class="ruby-identifier">rpcutil</span>.<span class="ruby-identifier">progress</span> = <span class="ruby-keyword kw">false</span>
-33: 
-34:         <span class="ruby-identifier">facts</span> = {}
-35: 
-36:         <span class="ruby-identifier">rpcutil</span>.<span class="ruby-identifier">get_fact</span>(<span class="ruby-identifier">:fact</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:fact</span>]) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">resp</span><span class="ruby-operator">|</span>
-37:             <span class="ruby-keyword kw">begin</span>
-38:                 <span class="ruby-identifier">value</span> = <span class="ruby-identifier">resp</span>[<span class="ruby-identifier">:body</span>][<span class="ruby-identifier">:data</span>][<span class="ruby-identifier">:value</span>]
-39:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">value</span>
-40:                     <span class="ruby-identifier">facts</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">value</span>) <span class="ruby-operator">?</span> <span class="ruby-identifier">facts</span>[<span class="ruby-identifier">value</span>] <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">resp</span>[<span class="ruby-identifier">:senderid</span>] <span class="ruby-operator">:</span> <span class="ruby-identifier">facts</span>[<span class="ruby-identifier">value</span>] = [ <span class="ruby-identifier">resp</span>[<span class="ruby-identifier">:senderid</span>] ]
-41:                 <span class="ruby-keyword kw">end</span>
-42:             <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Exception</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-43:                 <span class="ruby-constant">STDERR</span>.<span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;Could not parse facts for #{resp[:senderid]}: #{e.class}: #{e}&quot;</span>
-44:             <span class="ruby-keyword kw">end</span>
-45:         <span class="ruby-keyword kw">end</span>
-46: 
-47:         <span class="ruby-identifier">show_single_fact_report</span>(<span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:fact</span>], <span class="ruby-identifier">facts</span>, <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:verbose</span>])
-48: 
-49:         <span class="ruby-identifier">printrpcstats</span>
-50:     <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000316" class="method-detail">
-        <a name="M000316"></a>
-
-        <div class="method-heading">
-          <a href="#M000316" class="method-signature">
-          <span class="method-name">post_option_parser</span><span class="method-args">(configuration)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000316-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000316-source">
-<pre>
-   <span class="ruby-comment cmt"># File plugins/mcollective/application/facts.rb, line 4</span>
-4:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post_option_parser</span>(<span class="ruby-identifier">configuration</span>)
-5:         <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:fact</span>] = <span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">shift</span> <span class="ruby-keyword kw">if</span> <span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-6:     <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000318" class="method-detail">
-        <a name="M000318"></a>
-
-        <div class="method-heading">
-          <a href="#M000318" class="method-signature">
-          <span class="method-name">show_single_fact_report</span><span class="method-args">(fact, facts, verbose=false)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000318-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000318-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/facts.rb, line 12</span>
-12:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">show_single_fact_report</span>(<span class="ruby-identifier">fact</span>, <span class="ruby-identifier">facts</span>, <span class="ruby-identifier">verbose</span>=<span class="ruby-keyword kw">false</span>)
-13:         <span class="ruby-identifier">puts</span>(<span class="ruby-node">&quot;Report for fact: #{fact}\n\n&quot;</span>)
-14: 
-15:         <span class="ruby-identifier">facts</span>.<span class="ruby-identifier">keys</span>.<span class="ruby-identifier">sort</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">k</span><span class="ruby-operator">|</span>
-16:             <span class="ruby-identifier">printf</span>(<span class="ruby-value str">&quot;        %-40sfound %d times\n&quot;</span>, <span class="ruby-identifier">k</span>, <span class="ruby-identifier">facts</span>[<span class="ruby-identifier">k</span>].<span class="ruby-identifier">size</span>)
-17: 
-18:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">verbose</span>
-19:                 <span class="ruby-identifier">puts</span>
-20: 
-21:                 <span class="ruby-identifier">facts</span>[<span class="ruby-identifier">k</span>].<span class="ruby-identifier">sort</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">f</span><span class="ruby-operator">|</span>
-22:                     <span class="ruby-identifier">puts</span>(<span class="ruby-node">&quot;            #{f}&quot;</span>)
-23:                 <span class="ruby-keyword kw">end</span>
-24: 
-25:                 <span class="ruby-identifier">puts</span>
-26:             <span class="ruby-keyword kw">end</span>
-27:         <span class="ruby-keyword kw">end</span>
-28:     <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000317" class="method-detail">
-        <a name="M000317"></a>
-
-        <div class="method-heading">
-          <a href="#M000317" class="method-signature">
-          <span class="method-name">validate_configuration</span><span class="method-args">(configuration)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000317-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000317-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/facts.rb, line 8</span>
- 8:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">validate_configuration</span>(<span class="ruby-identifier">configuration</span>)
- 9:         <span class="ruby-identifier">raise</span> <span class="ruby-value str">&quot;Please specify a fact to report for&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">configuration</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">:fact</span>)
-10:     <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file

=== removed file 'doc/classes/MCollective/Application/Find.html'
--- doc/classes/MCollective/Application/Find.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Application/Find.html	1970-01-01 00:00:00 +0000
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: MCollective::Application::Find</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">MCollective::Application::Find</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/plugins/mcollective/application/find_rb.html">
-                plugins/mcollective/application/find.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                <a href="../Application.html">
-                MCollective::Application
-               </a>
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000314">main</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-
-      <div id="method-M000314" class="method-detail">
-        <a name="M000314"></a>
-
-        <div class="method-heading">
-          <a href="#M000314" class="method-signature">
-          <span class="method-name">main</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000314-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000314-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/find.rb, line 4</span>
- 4:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">main</span>
- 5:         <span class="ruby-identifier">client</span> = <span class="ruby-constant">MCollective</span><span class="ruby-operator">::</span><span class="ruby-constant">Client</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">options</span>[<span class="ruby-identifier">:config</span>])
- 6:         <span class="ruby-identifier">client</span>.<span class="ruby-identifier">options</span> = <span class="ruby-identifier">options</span>
- 7: 
- 8:         <span class="ruby-identifier">stats</span> = <span class="ruby-identifier">client</span>.<span class="ruby-identifier">req</span>(<span class="ruby-value str">&quot;ping&quot;</span>, <span class="ruby-value str">&quot;discovery&quot;</span>) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">resp</span><span class="ruby-operator">|</span>
- 9:             <span class="ruby-identifier">puts</span> <span class="ruby-identifier">resp</span>[<span class="ruby-identifier">:senderid</span>]
-10:         <span class="ruby-keyword kw">end</span>
-11: 
-12:         <span class="ruby-identifier">client</span>.<span class="ruby-identifier">display_stats</span>(<span class="ruby-identifier">stats</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:verbose</span>]
-13:     <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file

=== removed file 'doc/classes/MCollective/Application/Help.html'
--- doc/classes/MCollective/Application/Help.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Application/Help.html	1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: MCollective::Application::Help</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">MCollective::Application::Help</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../../files/plugins/mcollective/application/help_rb.html">
-                plugins/mcollective/application/help.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Application
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000288">main</a>&nbsp;&nbsp;
-      <a href="#M000287">post_option_parser</a>&nbsp;&nbsp;
-      </div>
-    </div>
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Instance methods</h3>
-
-      <div id="method-M000288" class="method-detail">
-        <a name="M000288"></a>
-
-        <div class="method-heading">
-          <a href="#M000288" class="method-signature">
-          <span class="method-name">main</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000288-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000288-source">
-<pre>
-    <span class="ruby-comment cmt"># File plugins/mcollective/application/help.rb, line 10</span>
-10:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">main</span>
-11:             <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">configuration</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">:agent</span>)
-12:                 <span class="ruby-identifier">ddl</span> = <span class="ruby-constant">MCollective</span><span class="ruby-operator">::</span><span class="ruby-constant">RPC</span><span class="ruby-operator">::</span><span class="ruby-constant">DDL</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:agent</span>])
-13:                 <span class="ruby-identifier">puts</span> <span class="ruby-identifier">ddl</span>.<span class="ruby-identifier">help</span>(<span class="ruby-constant">Config</span>.<span class="ruby-identifier">instance</span>.<span class="ruby-identifier">rpchelptemplate</span>)
-14:             <span class="ruby-keyword kw">else</span>
-15:                 <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;The Marionette Collective version #{MCollective.version}&quot;</span>
-16:                 <span class="ruby-identifier">puts</span>
-17: 
-18:                 <span class="ruby-constant">Applications</span>.<span class="ruby-identifier">list</span>.<span class="ruby-identifier">sort</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">app</span><span class="ruby-operator">|</span>
-19:                     <span class="ruby-identifier">puts</span> <span class="ruby-value str">&quot;  %-15s %s&quot;</span> <span class="ruby-operator">%</span> [<span class="ruby-identifier">app</span>, <span class="ruby-constant">Applications</span>[<span class="ruby-identifier">app</span>].<span class="ruby-identifier">application_description</span>]
-20:                 <span class="ruby-keyword kw">end</span>
-21: 
-22:                 <span class="ruby-identifier">puts</span>
-23:             <span class="ruby-keyword kw">end</span>
-24:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-      <div id="method-M000287" class="method-detail">
-        <a name="M000287"></a>
-
-        <div class="method-heading">
-          <a href="#M000287" class="method-signature">
-          <span class="method-name">post_option_parser</span><span class="method-args">(configuration)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000287-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000287-source">
-<pre>
-   <span class="ruby-comment cmt"># File plugins/mcollective/application/help.rb, line 6</span>
-6:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">post_option_parser</span>(<span class="ruby-identifier">configuration</span>)
-7:             <span class="ruby-identifier">configuration</span>[<span class="ruby-identifier">:agent</span>] = <span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">shift</span> <span class="ruby-keyword kw">if</span> <span class="ruby-constant">ARGV</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-8:         <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
-        </div>
-      </div>
-
-
-    </div>
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file

=== removed file 'doc/classes/MCollective/Application/Inventory.html'
--- doc/classes/MCollective/Application/Inventory.html	2011-11-09 18:12:27 +0000
+++ doc/classes/MCollective/Application/Inventory.html	1970-01-01 00:00:00 +0000
@@ -1,798 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: MCollective::Application::Inventory</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>