3 files changed, 19 insertions, 74 deletions

diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index 13daef89dcab..681cd0f85f8c 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mcollective
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://downloads.puppetlabs.com/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/mcollective/distinfo b/sysutils/mcollective/distinfo
index 743f2a1ccdee..9fa324cbbc53 100644
--- a/sysutils/mcollective/distinfo
+++ b/sysutils/mcollective/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mcollective-1.2.1.tgz) = 45da06779a1cf9e4efc6f533fa93fe378c6427d6ecc519eea4b53c7ec087b578
-SIZE (mcollective-1.2.1.tgz) = 928316
+SHA256 (mcollective-1.3.1.tgz) = 9aa93de4e072c8d026fdbf3b766b132e5c356a27d5534808004c4a2cab9a3e8c
+SIZE (mcollective-1.3.1.tgz) = 904071
diff --git a/sysutils/mcollective/pkg-plist b/sysutils/mcollective/pkg-plist
index d7d5b9233ca2..0a2abb79e158 100644
--- a/sysutils/mcollective/pkg-plist
+++ b/sysutils/mcollective/pkg-plist
@@ -23,37 +23,20 @@ sbin/mcollectived
 %%DATADIR%%/registration/agentlist.rb
 %%DATADIR%%/security/aes_security.rb
 %%DATADIR%%/security/psk.rb
-%%DATADIR%%/security/sshkey.rb
 %%DATADIR%%/security/ssl.rb
 %%ETCDIR%%/client.cfg.dist
 %%ETCDIR%%/server.cfg.dist
-%%PORTDOCS%%%%DOCSDIR%%/classes/Array.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Agent.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Agent/Discovery.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Agent/Rpcutil.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Agents.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Application.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Application/Controller.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Application/Facts.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Application/Find.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Application/Help.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Application/Inventory.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Application/Ping.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Application/Rpc.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Applications.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Client.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Config.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Connector.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Connector/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Connector/Stomp.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/DDLValidationError.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Facts.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Facts/Bar.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Facts/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Facts/Testfacts.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Facts/Yaml_facts.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Foo.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/InvalidRPCData.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Log.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Logger.html
@@ -61,8 +44,13 @@ sbin/mcollectived
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Logger/Console_logger.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Logger/File_logger.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Logger/Syslog_logger.html
+%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Matcher.html
+%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Matcher/Parser.html
+%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Matcher/Scanner.html
+%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Message.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/MissingRPCData.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/MsgDoesNotMatchRequestID.html
+%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/MsgTTLExpired.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/NotTargettedAtUs.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Optionparser.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/PluginManager.html
@@ -73,7 +61,6 @@ sbin/mcollectived
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPC/Client.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPC/DDL.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPC/Helpers.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPC/Logfile.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPC/Progress.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPC/Reply.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPC/Request.html
@@ -82,28 +69,19 @@ sbin/mcollectived
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPCAborted.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RPCError.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Registration.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Registration/Agentlist.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Registration/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Request.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Runner.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/RunnerStats.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/SSL.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Security.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Security/Aes_security.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Security/Base.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Security/Psk.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Security/Sshkey.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Security/Ssl.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/SecurityValidationFailed.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Shell.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/UnknownRPCAction.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/UnknownRPCError.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Util.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/MCollective/Vendor.html
-%%PORTDOCS%%%%DOCSDIR%%/classes/Object.html
 %%PORTDOCS%%%%DOCSDIR%%/classes/Symbol.html
 %%PORTDOCS%%%%DOCSDIR%%/created.rid
-%%PORTDOCS%%%%DOCSDIR%%/files/ext/mc-rpc-restserver_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/agents_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/application_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/applications_rb.html
@@ -119,12 +97,15 @@ sbin/mcollectived
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/logger/file_logger_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/logger/syslog_logger_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/logger_rb.html
+%%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/matcher/parser_rb.html
+%%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/matcher/scanner_rb.html
+%%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/matcher_rb.html
+%%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/message_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/monkey_patches_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/optionparser_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/pluginmanager_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/registration/base_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/registration_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/request_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/rpc/actionrunner_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/rpc/agent_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/rpc/audit_rb.html
@@ -144,49 +125,8 @@ sbin/mcollectived
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/shell_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/ssl_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/util_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective/vendor_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/lib/mcollective_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/files/mcollectived_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/agent/discovery_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/agent/rpcutil_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/application/controller_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/application/facts_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/application/find_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/application/help_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/application/inventory_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/application/ping_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/application/rpc_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/audit/logfile_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/connector/stomp_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/facts/yaml_facts_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/registration/agentlist_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/security/aes_security_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/security/psk_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/security/sshkey_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/plugins/mcollective/security/ssl_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/monkey_patches/instance_variable_defined_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/spec_helper_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/application_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/applications_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/config_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/facts/base_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/facts_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/log_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/logger/base_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/optionparser_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/pluginmanager_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/rpc/actionrunner_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/rpc/agent_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/rpc/reply_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/rpc/request_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/rpc/result_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/rpc/stats_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/security/base_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/security/psk_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/shell_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/ssl_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/util_spec_rb.html
-%%PORTDOCS%%%%DOCSDIR%%/files/spec/unit/vendor_spec_rb.html
 %%PORTDOCS%%%%DOCSDIR%%/fr_class_index.html
 %%PORTDOCS%%%%DOCSDIR%%/fr_file_index.html
 %%PORTDOCS%%%%DOCSDIR%%/fr_method_index.html
@@ -208,12 +148,15 @@ sbin/mcollectived
 %%RUBY_SITELIBDIR%%/mcollective/logger/console_logger.rb
 %%RUBY_SITELIBDIR%%/mcollective/logger/file_logger.rb
 %%RUBY_SITELIBDIR%%/mcollective/logger/syslog_logger.rb
+%%RUBY_SITELIBDIR%%/mcollective/matcher.rb
+%%RUBY_SITELIBDIR%%/mcollective/matcher/parser.rb
+%%RUBY_SITELIBDIR%%/mcollective/matcher/scanner.rb
+%%RUBY_SITELIBDIR%%/mcollective/message.rb
 %%RUBY_SITELIBDIR%%/mcollective/monkey_patches.rb
 %%RUBY_SITELIBDIR%%/mcollective/optionparser.rb
 %%RUBY_SITELIBDIR%%/mcollective/pluginmanager.rb
 %%RUBY_SITELIBDIR%%/mcollective/registration.rb
 %%RUBY_SITELIBDIR%%/mcollective/registration/base.rb
-%%RUBY_SITELIBDIR%%/mcollective/request.rb
 %%RUBY_SITELIBDIR%%/mcollective/rpc.rb
 %%RUBY_SITELIBDIR%%/mcollective/rpc/actionrunner.rb
 %%RUBY_SITELIBDIR%%/mcollective/rpc/agent.rb
@@ -400,6 +343,7 @@ sbin/mcollectived
 @dirrm %%RUBY_SITELIBDIR%%/mcollective/connector
 @dirrm %%RUBY_SITELIBDIR%%/mcollective/facts
 @dirrm %%RUBY_SITELIBDIR%%/mcollective/logger
+@dirrm %%RUBY_SITELIBDIR%%/mcollective/matcher
 @dirrm %%RUBY_SITELIBDIR%%/mcollective/registration
 @dirrm %%RUBY_SITELIBDIR%%/mcollective/rpc
 @dirrm %%RUBY_SITELIBDIR%%/mcollective/security
@@ -438,6 +382,7 @@ sbin/mcollectived
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/classes/MCollective/Connector
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/classes/MCollective/Facts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/classes/MCollective/Logger
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/classes/MCollective/Matcher
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/classes/MCollective/RPC
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/classes/MCollective/Registration
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/classes/MCollective/Security
@@ -447,6 +392,7 @@ sbin/mcollectived
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/files/lib/mcollective/connector
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/files/lib/mcollective/facts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/files/lib/mcollective/logger
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/files/lib/mcollective/matcher
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/files/lib/mcollective/registration
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/files/lib/mcollective/rpc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/files/lib/mcollective/security