mcollective-client 2.11.4 → 2.12.0

data/lib/mcollective.rb

@@ -59,7 +59,7 @@ module MCollective
 
   MCollective::Vendor.load_vendored
 
-  VERSION="2.11.4"
+  VERSION="2.12.0"
 
   def self.version
     VERSION

data/lib/mcollective/config.rb

@@ -17,7 +17,7 @@ module MCollective
     attr_reader :default_discovery_method, :default_discovery_options
     attr_reader :publish_timeout, :threaded, :soft_shutdown, :activate_agents
     attr_reader :registration_splay, :discovery_timeout, :soft_shutdown_timeout
-    attr_reader :connection_timeout
+    attr_reader :connection_timeout, :default_batch_size, :default_batch_sleep_time
 
     def initialize
       @configured = false
@@ -125,6 +125,10 @@ module MCollective
                   @soft_shutdown_timeout = Integer(val)
                 when "activate_agents"
                   @activate_agents = Util.str_to_bool(val)
+                when "default_batch_size"
+                  @default_batch_size = Integer(val)
+                when "default_batch_sleep_time"
+                  @default_batch_sleep_time = Float(val)
                 when "topicprefix", "topicsep", "queueprefix", "rpchelptemplate", "helptemplatedir"
                   Log.warn("Use of deprecated '#{key}' option.  This option is ignored and should be removed from '#{configfile}'")
                 else
@@ -212,6 +216,8 @@ module MCollective
       @soft_shutdown_timeout = nil
       @activate_agents = true
       @connection_timeout = nil
+      @default_batch_size = 0
+      @default_batch_sleep_time = 1
     end
 
     def libdir

data/lib/mcollective/connector/activemq.rb

@@ -437,7 +437,7 @@ module MCollective
 
         # We expect all messages we get to be of STOMP frame type MESSAGE, raise on unexpected types
         if msg.command != 'MESSAGE'
-          Log.debug("Unexpected '#{msg.command}' frame.  Headers: #{msg.headers.inspect} Body: #{msg.body.inspect}")
+          Log.warn("Unexpected '#{msg.command}' frame.  Headers: #{msg.headers.inspect} Body: #{msg.body.inspect}")
           raise UnexpectedMessageType.new(exponential_back_off),
             "Received frame of type '#{msg.command}' expected 'MESSAGE'"
         end

data/lib/mcollective/facts/yaml_facts.rb

@@ -23,7 +23,11 @@ module MCollective
         fact_files.each do |file|
           begin
             if File.exist?(file)
-              facts.merge!(YAML.load(File.read(file)))
+	      if YAML.respond_to? :safe_load
+                facts.merge!(YAML.safe_load(File.read(file))) 
+	      else
+                facts.merge!(YAML.load(File.read(file)))  # rubocop:disable Security/YAMLLoad
+              end
             else
               raise("Can't find YAML file to load: #{file}")
             end

data/lib/mcollective/logger/file_logger.rb

@@ -15,6 +15,8 @@ module MCollective
 
         @logger = ::Logger.new(config.logfile, config.keeplogs, config.max_log_size)
         @logger.formatter = ::Logger::Formatter.new
+        # ISO-8601 with sub-second precision and offset from UTC.
+        @logger.formatter.datetime_format = "%Y-%m-%dT%H:%M:%S.%6N%:z "
 
         set_level(config.loglevel.to_sym)
       end

data/lib/mcollective/rpc/client.rb

@@ -71,8 +71,8 @@ module MCollective
         @discovery_options = initial_options[:discovery_options] || []
         @force_display_mode = initial_options[:force_display_mode] || false
 
-        @batch_size = initial_options[:batch_size] || 0
-        @batch_sleep_time = Float(initial_options[:batch_sleep_time] || 1)
+        @batch_size = initial_options[:batch_size] || Config.instance.default_batch_size
+        @batch_sleep_time = Float(initial_options[:batch_sleep_time] || Config.instance.default_batch_sleep_time)
         @batch_mode = determine_batch_mode(@batch_size)
 
         agent_filter agent

data/spec/unit/mcollective/connector/activemq_spec.rb

@@ -412,8 +412,8 @@ module MCollective
 
           Message.stubs(:new)
 
-          Log.stubs(:debug)
-          Log.expects(:debug).with('Unexpected \'ERROR\' frame.  Headers: "headers" Body: "Out of cheese exception"')
+          Log.stubs(:warn)
+          Log.expects(:warn).with('Unexpected \'ERROR\' frame.  Headers: "headers" Body: "Out of cheese exception"')
 
           expect { connector.receive }.to raise_error(UnexpectedMessageType, /Received frame of type 'ERROR' expected 'MESSAGE'/)
         end

data/spec/unit/mcollective/logger/file_logger_spec.rb

@@ -8,6 +8,7 @@ module MCollective
   module Logger
     describe File_logger do
       let(:mock_logger) { mock('logger') }
+      let(:mock_formatter) { mock('formatter') }
 
       before :each do
         Config.instance.stubs(:loglevel).returns("error")
@@ -17,6 +18,9 @@ module MCollective
         ::Logger.stubs(:new).returns(mock_logger)
         mock_logger.stubs(:formatter=)
         mock_logger.stubs(:level=)
+
+        mock_logger.stubs(:formatter).returns(mock_formatter)
+        mock_formatter.stubs(:datetime_format=)
       end
 
       describe "#start" do

data/spec/unit/mcollective/rpc/client_spec.rb

@@ -156,6 +156,18 @@ module MCollective
           c = Client.new("rspec", :options => {:config => "/nonexisting", :disctimeout => 10})
           c.instance_variable_get("@discovery_timeout").should == 10
         end
+
+        it "should default to configured batch options" do
+          expect(@client.batch_size).to eq(0)
+          expect(@client.batch_sleep_time).to eq(1)
+
+          Config.instance.stubs(:default_batch_size).returns(1000)
+          Config.instance.stubs(:default_batch_sleep_time).returns(30)
+          c = Client.new("rspec", :options => {})
+
+          expect(c.batch_size).to eq(1000)
+          expect(c.batch_sleep_time).to eq(30)
+        end
       end
 
       describe "#validate_request" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcollective-client
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -66,266 +66,266 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/mcollective/rpc.rb
-- lib/mcollective/monkey_patches.rb
-- lib/mcollective/connector.rb
-- lib/mcollective/pluginmanager.rb
-- lib/mcollective/client.rb
-- lib/mcollective/rpc/helpers.rb
-- lib/mcollective/rpc/client.rb
-- lib/mcollective/rpc/progress.rb
-- lib/mcollective/rpc/reply.rb
-- lib/mcollective/rpc/audit.rb
-- lib/mcollective/rpc/result.rb
-- lib/mcollective/rpc/agent.rb
-- lib/mcollective/rpc/request.rb
-- lib/mcollective/rpc/stats.rb
-- lib/mcollective/rpc/actionrunner.rb
-- lib/mcollective/facts/yaml_facts.rb
-- lib/mcollective/facts/base.rb
-- lib/mcollective/security.rb
-- lib/mcollective/log.rb
-- lib/mcollective/matcher.rb
-- lib/mcollective/unix_daemon.rb
-- lib/mcollective/application/rpc.rb
-- lib/mcollective/application/plugin.rb
-- lib/mcollective/application/ping.rb
-- lib/mcollective/application/completion.rb
-- lib/mcollective/application/describe_filter.rb
-- lib/mcollective/application/facts.rb
-- lib/mcollective/application/help.rb
-- lib/mcollective/application/inventory.rb
-- lib/mcollective/application/find.rb
-- lib/mcollective/validator/regex_validator.ddl
-- lib/mcollective/validator/typecheck_validator.ddl
-- lib/mcollective/validator/shellsafe_validator.ddl
-- lib/mcollective/validator/ipv6address_validator.ddl
-- lib/mcollective/validator/length_validator.ddl
-- lib/mcollective/validator/shellsafe_validator.rb
-- lib/mcollective/validator/ipv4address_validator.ddl
-- lib/mcollective/validator/ipv4address_validator.rb
-- lib/mcollective/validator/array_validator.ddl
-- lib/mcollective/validator/length_validator.rb
-- lib/mcollective/validator/regex_validator.rb
-- lib/mcollective/validator/ipv6address_validator.rb
-- lib/mcollective/validator/array_validator.rb
-- lib/mcollective/validator/typecheck_validator.rb
-- lib/mcollective/windows_daemon.rb
-- lib/mcollective/aggregate/sum.ddl
+- lib/mcollective.rb
+- lib/mcollective/agent.rb
+- lib/mcollective/agent/discovery.rb
+- lib/mcollective/agent/rpcutil.ddl
+- lib/mcollective/agent/rpcutil.rb
+- lib/mcollective/agents.rb
+- lib/mcollective/aggregate.rb
 - lib/mcollective/aggregate/average.ddl
-- lib/mcollective/aggregate/summary.ddl
+- lib/mcollective/aggregate/average.rb
+- lib/mcollective/aggregate/base.rb
+- lib/mcollective/aggregate/result.rb
+- lib/mcollective/aggregate/result/base.rb
 - lib/mcollective/aggregate/result/collection_result.rb
 - lib/mcollective/aggregate/result/numeric_result.rb
-- lib/mcollective/aggregate/result/base.rb
+- lib/mcollective/aggregate/sum.ddl
 - lib/mcollective/aggregate/sum.rb
-- lib/mcollective/aggregate/result.rb
-- lib/mcollective/aggregate/average.rb
+- lib/mcollective/aggregate/summary.ddl
 - lib/mcollective/aggregate/summary.rb
-- lib/mcollective/aggregate/base.rb
-- lib/mcollective/optionparser.rb
-- lib/mcollective/ssl.rb
-- lib/mcollective/runnerstats.rb
-- lib/mcollective/shell.rb
-- lib/mcollective/validator.rb
-- lib/mcollective/vendor/require_vendored.rb
-- lib/mcollective/matcher/parser.rb
-- lib/mcollective/matcher/scanner.rb
-- lib/mcollective/audit/logfile.rb
-- lib/mcollective/config.rb
-- lib/mcollective/message.rb
 - lib/mcollective/application.rb
-- lib/mcollective/pluginpackager.rb
-- lib/mcollective/facts.rb
-- lib/mcollective/aggregate.rb
-- lib/mcollective/cache.rb
-- lib/mcollective/exceptions.rb
-- lib/mcollective/registration/agentlist.rb
-- lib/mcollective/registration/base.rb
-- lib/mcollective/discovery/mc.rb
-- lib/mcollective/discovery/mc.ddl
-- lib/mcollective/discovery/flatfile.ddl
-- lib/mcollective/discovery/stdin.ddl
-- lib/mcollective/discovery/stdin.rb
-- lib/mcollective/discovery/flatfile.rb
+- lib/mcollective/application/completion.rb
+- lib/mcollective/application/describe_filter.rb
+- lib/mcollective/application/facts.rb
+- lib/mcollective/application/find.rb
+- lib/mcollective/application/help.rb
+- lib/mcollective/application/inventory.rb
+- lib/mcollective/application/ping.rb
+- lib/mcollective/application/plugin.rb
+- lib/mcollective/application/rpc.rb
 - lib/mcollective/applications.rb
-- lib/mcollective/generators.rb
-- lib/mcollective/data/fact_data.ddl
-- lib/mcollective/data/agent_data.rb
-- lib/mcollective/data/collective_data.rb
+- lib/mcollective/audit/logfile.rb
+- lib/mcollective/cache.rb
+- lib/mcollective/client.rb
+- lib/mcollective/config.rb
+- lib/mcollective/connector.rb
+- lib/mcollective/connector/activemq.ddl
+- lib/mcollective/connector/activemq.rb
+- lib/mcollective/connector/base.rb
+- lib/mcollective/connector/rabbitmq.ddl
+- lib/mcollective/connector/rabbitmq.rb
+- lib/mcollective/data.rb
 - lib/mcollective/data/agent_data.ddl
-- lib/mcollective/data/result.rb
+- lib/mcollective/data/agent_data.rb
+- lib/mcollective/data/base.rb
 - lib/mcollective/data/collective_data.ddl
+- lib/mcollective/data/collective_data.rb
+- lib/mcollective/data/fact_data.ddl
 - lib/mcollective/data/fact_data.rb
 - lib/mcollective/data/fstat_data.ddl
 - lib/mcollective/data/fstat_data.rb
-- lib/mcollective/data/base.rb
+- lib/mcollective/data/result.rb
+- lib/mcollective/ddl.rb
+- lib/mcollective/ddl/agentddl.rb
+- lib/mcollective/ddl/base.rb
 - lib/mcollective/ddl/dataddl.rb
 - lib/mcollective/ddl/discoveryddl.rb
 - lib/mcollective/ddl/validatorddl.rb
-- lib/mcollective/ddl/agentddl.rb
-- lib/mcollective/ddl/base.rb
-- lib/mcollective/data.rb
-- lib/mcollective/logger/file_logger.rb
-- lib/mcollective/logger/console_logger.rb
-- lib/mcollective/logger/syslog_logger.rb
-- lib/mcollective/logger/base.rb
-- lib/mcollective/registration.rb
 - lib/mcollective/discovery.rb
-- lib/mcollective/util.rb
+- lib/mcollective/discovery/flatfile.ddl
+- lib/mcollective/discovery/flatfile.rb
+- lib/mcollective/discovery/mc.ddl
+- lib/mcollective/discovery/mc.rb
+- lib/mcollective/discovery/stdin.ddl
+- lib/mcollective/discovery/stdin.rb
+- lib/mcollective/exceptions.rb
+- lib/mcollective/facts.rb
+- lib/mcollective/facts/base.rb
+- lib/mcollective/facts/yaml_facts.rb
+- lib/mcollective/generators.rb
+- lib/mcollective/generators/agent_generator.rb
+- lib/mcollective/generators/base.rb
+- lib/mcollective/generators/data_generator.rb
+- lib/mcollective/generators/templates/action_snippet.erb
+- lib/mcollective/generators/templates/data_input_snippet.erb
+- lib/mcollective/generators/templates/ddl.erb
+- lib/mcollective/generators/templates/plugin.erb
+- lib/mcollective/log.rb
 - lib/mcollective/logger.rb
+- lib/mcollective/logger/base.rb
+- lib/mcollective/logger/console_logger.rb
+- lib/mcollective/logger/file_logger.rb
+- lib/mcollective/logger/syslog_logger.rb
+- lib/mcollective/matcher.rb
+- lib/mcollective/matcher/parser.rb
+- lib/mcollective/matcher/scanner.rb
+- lib/mcollective/message.rb
+- lib/mcollective/monkey_patches.rb
+- lib/mcollective/optionparser.rb
+- lib/mcollective/pluginmanager.rb
+- lib/mcollective/pluginpackager.rb
 - lib/mcollective/pluginpackager/agent_definition.rb
+- lib/mcollective/pluginpackager/debpackage_packager.rb
+- lib/mcollective/pluginpackager/modulepackage_packager.rb
+- lib/mcollective/pluginpackager/ospackage_packager.rb
+- lib/mcollective/pluginpackager/rpmpackage_packager.rb
+- lib/mcollective/pluginpackager/standard_definition.rb
+- lib/mcollective/pluginpackager/templates/debian/Makefile.erb
+- lib/mcollective/pluginpackager/templates/debian/changelog.erb
 - lib/mcollective/pluginpackager/templates/debian/compat.erb
 - lib/mcollective/pluginpackager/templates/debian/control.erb
-- lib/mcollective/pluginpackager/templates/debian/rules.erb
-- lib/mcollective/pluginpackager/templates/debian/changelog.erb
-- lib/mcollective/pluginpackager/templates/debian/Makefile.erb
 - lib/mcollective/pluginpackager/templates/debian/copyright.erb
+- lib/mcollective/pluginpackager/templates/debian/rules.erb
+- lib/mcollective/pluginpackager/templates/module/Modulefile.erb
 - lib/mcollective/pluginpackager/templates/module/README.md.erb
 - lib/mcollective/pluginpackager/templates/module/_manifest.pp.erb
-- lib/mcollective/pluginpackager/templates/module/Modulefile.erb
 - lib/mcollective/pluginpackager/templates/redhat/rpm_spec.erb
-- lib/mcollective/pluginpackager/standard_definition.rb
-- lib/mcollective/pluginpackager/rpmpackage_packager.rb
-- lib/mcollective/pluginpackager/debpackage_packager.rb
-- lib/mcollective/pluginpackager/ospackage_packager.rb
-- lib/mcollective/pluginpackager/modulepackage_packager.rb
-- lib/mcollective/agent.rb
-- lib/mcollective/agents.rb
-- lib/mcollective/agent/discovery.rb
-- lib/mcollective/agent/rpcutil.rb
-- lib/mcollective/agent/rpcutil.ddl
-- lib/mcollective/ddl.rb
-- lib/mcollective/connector/activemq.rb
-- lib/mcollective/connector/rabbitmq.rb
-- lib/mcollective/connector/rabbitmq.ddl
-- lib/mcollective/connector/activemq.ddl
-- lib/mcollective/connector/base.rb
-- lib/mcollective/generators/agent_generator.rb
-- lib/mcollective/generators/templates/action_snippet.erb
-- lib/mcollective/generators/templates/ddl.erb
-- lib/mcollective/generators/templates/data_input_snippet.erb
-- lib/mcollective/generators/templates/plugin.erb
-- lib/mcollective/generators/data_generator.rb
-- lib/mcollective/generators/base.rb
-- lib/mcollective/vendor.rb
-- lib/mcollective/security/ssl.rb
+- lib/mcollective/registration.rb
+- lib/mcollective/registration/agentlist.rb
+- lib/mcollective/registration/base.rb
+- lib/mcollective/rpc.rb
+- lib/mcollective/rpc/actionrunner.rb
+- lib/mcollective/rpc/agent.rb
+- lib/mcollective/rpc/audit.rb
+- lib/mcollective/rpc/client.rb
+- lib/mcollective/rpc/helpers.rb
+- lib/mcollective/rpc/progress.rb
+- lib/mcollective/rpc/reply.rb
+- lib/mcollective/rpc/request.rb
+- lib/mcollective/rpc/result.rb
+- lib/mcollective/rpc/stats.rb
+- lib/mcollective/runnerstats.rb
+- lib/mcollective/security.rb
 - lib/mcollective/security/aes_security.rb
-- lib/mcollective/security/psk.rb
 - lib/mcollective/security/base.rb
-- lib/mcollective.rb
+- lib/mcollective/security/psk.rb
+- lib/mcollective/security/ssl.rb
+- lib/mcollective/shell.rb
+- lib/mcollective/ssl.rb
+- lib/mcollective/unix_daemon.rb
+- lib/mcollective/util.rb
+- lib/mcollective/validator.rb
+- lib/mcollective/validator/array_validator.ddl
+- lib/mcollective/validator/array_validator.rb
+- lib/mcollective/validator/ipv4address_validator.ddl
+- lib/mcollective/validator/ipv4address_validator.rb
+- lib/mcollective/validator/ipv6address_validator.ddl
+- lib/mcollective/validator/ipv6address_validator.rb
+- lib/mcollective/validator/length_validator.ddl
+- lib/mcollective/validator/length_validator.rb
+- lib/mcollective/validator/regex_validator.ddl
+- lib/mcollective/validator/regex_validator.rb
+- lib/mcollective/validator/shellsafe_validator.ddl
+- lib/mcollective/validator/shellsafe_validator.rb
+- lib/mcollective/validator/typecheck_validator.ddl
+- lib/mcollective/validator/typecheck_validator.rb
+- lib/mcollective/vendor.rb
+- lib/mcollective/vendor/require_vendored.rb
+- lib/mcollective/windows_daemon.rb
 - bin/mco
-- spec/fixtures/util/3.out
+- spec/Rakefile
+- spec/fixtures/application/test.rb
+- spec/fixtures/test-cert.pem
+- spec/fixtures/test-private.pem
+- spec/fixtures/test-public.pem
 - spec/fixtures/util/1.in
-- spec/fixtures/util/4.in
 - spec/fixtures/util/1.out
-- spec/fixtures/util/3.in
-- spec/fixtures/util/4.out
 - spec/fixtures/util/2.in
 - spec/fixtures/util/2.out
-- spec/fixtures/application/test.rb
-- spec/fixtures/test-cert.pem
-- spec/fixtures/test-public.pem
-- spec/fixtures/test-private.pem
+- spec/fixtures/util/3.in
+- spec/fixtures/util/3.out
+- spec/fixtures/util/4.in
+- spec/fixtures/util/4.out
 - spec/monkey_patches/instance_variable_defined.rb
 - spec/spec.opts
-- spec/Rakefile
-- spec/unit/mcollective/application_spec.rb
-- spec/unit/mcollective/runnerstats_spec.rb
-- spec/unit/mcollective/validator_spec.rb
-- spec/unit/mcollective/rpc/agent_spec.rb
-- spec/unit/mcollective/rpc/helpers_spec.rb
-- spec/unit/mcollective/rpc/stats_spec.rb
-- spec/unit/mcollective/rpc/actionrunner_spec.rb
-- spec/unit/mcollective/rpc/request_spec.rb
-- spec/unit/mcollective/rpc/result_spec.rb
-- spec/unit/mcollective/rpc/client_spec.rb
-- spec/unit/mcollective/rpc/reply_spec.rb
-- spec/unit/mcollective/facts/base_spec.rb
-- spec/unit/mcollective/facts/yaml_facts_spec.rb
-- spec/unit/mcollective/vendor_spec.rb
-- spec/unit/mcollective/ssl_spec.rb
-- spec/unit/mcollective/application/plugin_spec.rb
-- spec/unit/mcollective/validator/ipv6address_validator_spec.rb
-- spec/unit/mcollective/validator/ipv4address_validator_spec.rb
-- spec/unit/mcollective/validator/regex_validator_spec.rb
-- spec/unit/mcollective/validator/array_validator_spec.rb
-- spec/unit/mcollective/validator/length_validator_spec.rb
-- spec/unit/mcollective/validator/typecheck_validator_spec.rb
-- spec/unit/mcollective/validator/shellsafe_validator_spec.rb
-- spec/unit/mcollective/aggregate/base_spec.rb
+- spec/spec_helper.rb
+- spec/unit/mcollective/agent/rpcutil_spec.rb
+- spec/unit/mcollective/agents_spec.rb
 - spec/unit/mcollective/aggregate/average_spec.rb
+- spec/unit/mcollective/aggregate/base_spec.rb
 - spec/unit/mcollective/aggregate/result/base_spec.rb
 - spec/unit/mcollective/aggregate/result/collection_result_spec.rb
 - spec/unit/mcollective/aggregate/result/numeric_result_spec.rb
 - spec/unit/mcollective/aggregate/sum_spec.rb
 - spec/unit/mcollective/aggregate/summary_spec.rb
-- spec/unit/mcollective/matcher_spec.rb
-- spec/unit/mcollective/windows_daemon_spec.rb
-- spec/unit/mcollective/config_spec.rb
-- spec/unit/mcollective/applications_spec.rb
-- spec/unit/mcollective/cache_spec.rb
-- spec/unit/mcollective/matcher/scanner_spec.rb
-- spec/unit/mcollective/matcher/parser_spec.rb
-- spec/unit/mcollective/audit/logfile_spec.rb
-- spec/unit/mcollective/string_spec.rb
-- spec/unit/mcollective/ddl_spec.rb
-- spec/unit/mcollective/log_spec.rb
-- spec/unit/mcollective/pluginmanager_spec.rb
-- spec/unit/mcollective/registration/base_spec.rb
-- spec/unit/mcollective/discovery/flatfile_spec.rb
-- spec/unit/mcollective/discovery/stdin_spec.rb
-- spec/unit/mcollective/discovery/mc_spec.rb
-- spec/unit/mcollective/data/collective_data_spec.rb
-- spec/unit/mcollective/data/base_spec.rb
+- spec/unit/mcollective/aggregate_spec.rb
+- spec/unit/mcollective/application/plugin_spec.rb
+- spec/unit/mcollective/application_spec.rb
+- spec/unit/mcollective/applications_spec.rb
+- spec/unit/mcollective/array_spec.rb
+- spec/unit/mcollective/audit/logfile_spec.rb
+- spec/unit/mcollective/cache_spec.rb
+- spec/unit/mcollective/client_spec.rb
+- spec/unit/mcollective/config_spec.rb
+- spec/unit/mcollective/connector/activemq_spec.rb
+- spec/unit/mcollective/connector/base_spec.rb
+- spec/unit/mcollective/connector/rabbitmq_spec.rb
 - spec/unit/mcollective/data/agent_data_spec.rb
-- spec/unit/mcollective/data/result_spec.rb
-- spec/unit/mcollective/data/fstat_data_spec.rb
+- spec/unit/mcollective/data/base_spec.rb
+- spec/unit/mcollective/data/collective_data_spec.rb
 - spec/unit/mcollective/data/fact_data_spec.rb
+- spec/unit/mcollective/data/fstat_data_spec.rb
+- spec/unit/mcollective/data/result_spec.rb
+- spec/unit/mcollective/data_spec.rb
+- spec/unit/mcollective/ddl/agentddl_spec.rb
 - spec/unit/mcollective/ddl/base_spec.rb
 - spec/unit/mcollective/ddl/dataddl_spec.rb
 - spec/unit/mcollective/ddl/discoveryddl_spec.rb
-- spec/unit/mcollective/ddl/agentddl_spec.rb
+- spec/unit/mcollective/ddl_spec.rb
+- spec/unit/mcollective/discovery/flatfile_spec.rb
+- spec/unit/mcollective/discovery/mc_spec.rb
+- spec/unit/mcollective/discovery/stdin_spec.rb
 - spec/unit/mcollective/discovery_spec.rb
+- spec/unit/mcollective/facts/base_spec.rb
+- spec/unit/mcollective/facts/yaml_facts_spec.rb
+- spec/unit/mcollective/facts_spec.rb
+- spec/unit/mcollective/generators/agent_generator_spec.rb
+- spec/unit/mcollective/generators/base_spec.rb
+- spec/unit/mcollective/generators/data_generator_spec.rb
+- spec/unit/mcollective/generators/snippets/agent_ddl
+- spec/unit/mcollective/generators/snippets/data_ddl
+- spec/unit/mcollective/log_spec.rb
 - spec/unit/mcollective/logger/base_spec.rb
 - spec/unit/mcollective/logger/console_logger_spec.rb
 - spec/unit/mcollective/logger/file_logger_spec.rb
 - spec/unit/mcollective/logger/syslog_logger_spec.rb
-- spec/unit/mcollective/shell_spec.rb
-- spec/unit/mcollective/data_spec.rb
-- spec/unit/mcollective/packagers/modulepackage_packager_spec.rb
+- spec/unit/mcollective/matcher/parser_spec.rb
+- spec/unit/mcollective/matcher/scanner_spec.rb
+- spec/unit/mcollective/matcher_spec.rb
+- spec/unit/mcollective/message_spec.rb
+- spec/unit/mcollective/monkey_patches_spec.rb
+- spec/unit/mcollective/optionparser_spec.rb
 - spec/unit/mcollective/packagers/debpackage_packager_spec.rb
+- spec/unit/mcollective/packagers/modulepackage_packager_spec.rb
 - spec/unit/mcollective/packagers/ospackage_spec.rb
 - spec/unit/mcollective/packagers/rpmpackage_packager_spec.rb
-- spec/unit/mcollective/client_spec.rb
-- spec/unit/mcollective/pluginpackager/standard_definition_spec.rb
+- spec/unit/mcollective/pluginmanager_spec.rb
 - spec/unit/mcollective/pluginpackager/agent_definition_spec.rb
-- spec/unit/mcollective/agent/rpcutil_spec.rb
-- spec/unit/mcollective/aggregate_spec.rb
-- spec/unit/mcollective/array_spec.rb
-- spec/unit/mcollective/optionparser_spec.rb
-- spec/unit/mcollective/message_spec.rb
+- spec/unit/mcollective/pluginpackager/standard_definition_spec.rb
 - spec/unit/mcollective/pluginpackager_spec.rb
-- spec/unit/mcollective/connector/rabbitmq_spec.rb
-- spec/unit/mcollective/connector/base_spec.rb
-- spec/unit/mcollective/connector/activemq_spec.rb
-- spec/unit/mcollective/generators/snippets/data_ddl
-- spec/unit/mcollective/generators/snippets/agent_ddl
-- spec/unit/mcollective/generators/base_spec.rb
-- spec/unit/mcollective/generators/data_generator_spec.rb
-- spec/unit/mcollective/generators/agent_generator_spec.rb
-- spec/unit/mcollective/runner_spec.rb
-- spec/unit/mcollective/util_spec.rb
-- spec/unit/mcollective/agents_spec.rb
-- spec/unit/mcollective/monkey_patches_spec.rb
-- spec/unit/mcollective/unix_daemon_spec.rb
+- spec/unit/mcollective/registration/base_spec.rb
+- spec/unit/mcollective/rpc/actionrunner_spec.rb
+- spec/unit/mcollective/rpc/agent_spec.rb
+- spec/unit/mcollective/rpc/client_spec.rb
+- spec/unit/mcollective/rpc/helpers_spec.rb
+- spec/unit/mcollective/rpc/reply_spec.rb
+- spec/unit/mcollective/rpc/request_spec.rb
+- spec/unit/mcollective/rpc/result_spec.rb
+- spec/unit/mcollective/rpc/stats_spec.rb
 - spec/unit/mcollective/rpc_spec.rb
-- spec/unit/mcollective/facts_spec.rb
-- spec/unit/mcollective/symbol_spec.rb
+- spec/unit/mcollective/runner_spec.rb
+- spec/unit/mcollective/runnerstats_spec.rb
 - spec/unit/mcollective/security/aes_security_spec.rb
-- spec/unit/mcollective/security/ssl_spec.rb
 - spec/unit/mcollective/security/base_spec.rb
 - spec/unit/mcollective/security/psk_spec.rb
-- spec/spec_helper.rb
+- spec/unit/mcollective/security/ssl_spec.rb
+- spec/unit/mcollective/shell_spec.rb
+- spec/unit/mcollective/ssl_spec.rb
+- spec/unit/mcollective/string_spec.rb
+- spec/unit/mcollective/symbol_spec.rb
+- spec/unit/mcollective/unix_daemon_spec.rb
+- spec/unit/mcollective/util_spec.rb
+- spec/unit/mcollective/validator/array_validator_spec.rb
+- spec/unit/mcollective/validator/ipv4address_validator_spec.rb
+- spec/unit/mcollective/validator/ipv6address_validator_spec.rb
+- spec/unit/mcollective/validator/length_validator_spec.rb
+- spec/unit/mcollective/validator/regex_validator_spec.rb
+- spec/unit/mcollective/validator/shellsafe_validator_spec.rb
+- spec/unit/mcollective/validator/typecheck_validator_spec.rb
+- spec/unit/mcollective/validator_spec.rb
+- spec/unit/mcollective/vendor_spec.rb
+- spec/unit/mcollective/windows_daemon_spec.rb
 - spec/windows_spec.opts
 homepage: https://docs.puppetlabs.com/mcollective/
 licenses: []
@@ -365,116 +365,116 @@ signing_key:
 specification_version: 3
 summary: Client libraries for the Mcollective Application Server
 test_files:
-- spec/fixtures/util/3.out
+- spec/Rakefile
+- spec/fixtures/application/test.rb
+- spec/fixtures/test-cert.pem
+- spec/fixtures/test-private.pem
+- spec/fixtures/test-public.pem
 - spec/fixtures/util/1.in
-- spec/fixtures/util/4.in
 - spec/fixtures/util/1.out
-- spec/fixtures/util/3.in
-- spec/fixtures/util/4.out
 - spec/fixtures/util/2.in
 - spec/fixtures/util/2.out
-- spec/fixtures/application/test.rb
-- spec/fixtures/test-cert.pem
-- spec/fixtures/test-public.pem
-- spec/fixtures/test-private.pem
+- spec/fixtures/util/3.in
+- spec/fixtures/util/3.out
+- spec/fixtures/util/4.in
+- spec/fixtures/util/4.out
 - spec/monkey_patches/instance_variable_defined.rb
 - spec/spec.opts
-- spec/Rakefile
-- spec/unit/mcollective/application_spec.rb
-- spec/unit/mcollective/runnerstats_spec.rb
-- spec/unit/mcollective/validator_spec.rb
-- spec/unit/mcollective/rpc/agent_spec.rb
-- spec/unit/mcollective/rpc/helpers_spec.rb
-- spec/unit/mcollective/rpc/stats_spec.rb
-- spec/unit/mcollective/rpc/actionrunner_spec.rb
-- spec/unit/mcollective/rpc/request_spec.rb
-- spec/unit/mcollective/rpc/result_spec.rb
-- spec/unit/mcollective/rpc/client_spec.rb
-- spec/unit/mcollective/rpc/reply_spec.rb
-- spec/unit/mcollective/facts/base_spec.rb
-- spec/unit/mcollective/facts/yaml_facts_spec.rb
-- spec/unit/mcollective/vendor_spec.rb
-- spec/unit/mcollective/ssl_spec.rb
-- spec/unit/mcollective/application/plugin_spec.rb
-- spec/unit/mcollective/validator/ipv6address_validator_spec.rb
-- spec/unit/mcollective/validator/ipv4address_validator_spec.rb
-- spec/unit/mcollective/validator/regex_validator_spec.rb
-- spec/unit/mcollective/validator/array_validator_spec.rb
-- spec/unit/mcollective/validator/length_validator_spec.rb
-- spec/unit/mcollective/validator/typecheck_validator_spec.rb
-- spec/unit/mcollective/validator/shellsafe_validator_spec.rb
-- spec/unit/mcollective/aggregate/base_spec.rb
+- spec/spec_helper.rb
+- spec/unit/mcollective/agent/rpcutil_spec.rb
+- spec/unit/mcollective/agents_spec.rb
 - spec/unit/mcollective/aggregate/average_spec.rb
+- spec/unit/mcollective/aggregate/base_spec.rb
 - spec/unit/mcollective/aggregate/result/base_spec.rb
 - spec/unit/mcollective/aggregate/result/collection_result_spec.rb
 - spec/unit/mcollective/aggregate/result/numeric_result_spec.rb
 - spec/unit/mcollective/aggregate/sum_spec.rb
 - spec/unit/mcollective/aggregate/summary_spec.rb
-- spec/unit/mcollective/matcher_spec.rb
-- spec/unit/mcollective/windows_daemon_spec.rb
-- spec/unit/mcollective/config_spec.rb
+- spec/unit/mcollective/aggregate_spec.rb
+- spec/unit/mcollective/application/plugin_spec.rb
+- spec/unit/mcollective/application_spec.rb
 - spec/unit/mcollective/applications_spec.rb
-- spec/unit/mcollective/cache_spec.rb
-- spec/unit/mcollective/matcher/scanner_spec.rb
-- spec/unit/mcollective/matcher/parser_spec.rb
+- spec/unit/mcollective/array_spec.rb
 - spec/unit/mcollective/audit/logfile_spec.rb
-- spec/unit/mcollective/string_spec.rb
-- spec/unit/mcollective/ddl_spec.rb
-- spec/unit/mcollective/log_spec.rb
-- spec/unit/mcollective/pluginmanager_spec.rb
-- spec/unit/mcollective/registration/base_spec.rb
-- spec/unit/mcollective/discovery/flatfile_spec.rb
-- spec/unit/mcollective/discovery/stdin_spec.rb
-- spec/unit/mcollective/discovery/mc_spec.rb
-- spec/unit/mcollective/data/collective_data_spec.rb
-- spec/unit/mcollective/data/base_spec.rb
+- spec/unit/mcollective/cache_spec.rb
+- spec/unit/mcollective/client_spec.rb
+- spec/unit/mcollective/config_spec.rb
+- spec/unit/mcollective/connector/activemq_spec.rb
+- spec/unit/mcollective/connector/base_spec.rb
+- spec/unit/mcollective/connector/rabbitmq_spec.rb
 - spec/unit/mcollective/data/agent_data_spec.rb
-- spec/unit/mcollective/data/result_spec.rb
-- spec/unit/mcollective/data/fstat_data_spec.rb
+- spec/unit/mcollective/data/base_spec.rb
+- spec/unit/mcollective/data/collective_data_spec.rb
 - spec/unit/mcollective/data/fact_data_spec.rb
+- spec/unit/mcollective/data/fstat_data_spec.rb
+- spec/unit/mcollective/data/result_spec.rb
+- spec/unit/mcollective/data_spec.rb
+- spec/unit/mcollective/ddl/agentddl_spec.rb
 - spec/unit/mcollective/ddl/base_spec.rb
 - spec/unit/mcollective/ddl/dataddl_spec.rb
 - spec/unit/mcollective/ddl/discoveryddl_spec.rb
-- spec/unit/mcollective/ddl/agentddl_spec.rb
+- spec/unit/mcollective/ddl_spec.rb
+- spec/unit/mcollective/discovery/flatfile_spec.rb
+- spec/unit/mcollective/discovery/mc_spec.rb
+- spec/unit/mcollective/discovery/stdin_spec.rb
 - spec/unit/mcollective/discovery_spec.rb
+- spec/unit/mcollective/facts/base_spec.rb
+- spec/unit/mcollective/facts/yaml_facts_spec.rb
+- spec/unit/mcollective/facts_spec.rb
+- spec/unit/mcollective/generators/agent_generator_spec.rb
+- spec/unit/mcollective/generators/base_spec.rb
+- spec/unit/mcollective/generators/data_generator_spec.rb
+- spec/unit/mcollective/generators/snippets/agent_ddl
+- spec/unit/mcollective/generators/snippets/data_ddl
+- spec/unit/mcollective/log_spec.rb
 - spec/unit/mcollective/logger/base_spec.rb
 - spec/unit/mcollective/logger/console_logger_spec.rb
 - spec/unit/mcollective/logger/file_logger_spec.rb
 - spec/unit/mcollective/logger/syslog_logger_spec.rb
-- spec/unit/mcollective/shell_spec.rb
-- spec/unit/mcollective/data_spec.rb
-- spec/unit/mcollective/packagers/modulepackage_packager_spec.rb
+- spec/unit/mcollective/matcher/parser_spec.rb
+- spec/unit/mcollective/matcher/scanner_spec.rb
+- spec/unit/mcollective/matcher_spec.rb
+- spec/unit/mcollective/message_spec.rb
+- spec/unit/mcollective/monkey_patches_spec.rb
+- spec/unit/mcollective/optionparser_spec.rb
 - spec/unit/mcollective/packagers/debpackage_packager_spec.rb
+- spec/unit/mcollective/packagers/modulepackage_packager_spec.rb
 - spec/unit/mcollective/packagers/ospackage_spec.rb
 - spec/unit/mcollective/packagers/rpmpackage_packager_spec.rb
-- spec/unit/mcollective/client_spec.rb
-- spec/unit/mcollective/pluginpackager/standard_definition_spec.rb
+- spec/unit/mcollective/pluginmanager_spec.rb
 - spec/unit/mcollective/pluginpackager/agent_definition_spec.rb
-- spec/unit/mcollective/agent/rpcutil_spec.rb
-- spec/unit/mcollective/aggregate_spec.rb
-- spec/unit/mcollective/array_spec.rb
-- spec/unit/mcollective/optionparser_spec.rb
-- spec/unit/mcollective/message_spec.rb
+- spec/unit/mcollective/pluginpackager/standard_definition_spec.rb
 - spec/unit/mcollective/pluginpackager_spec.rb
-- spec/unit/mcollective/connector/rabbitmq_spec.rb
-- spec/unit/mcollective/connector/base_spec.rb
-- spec/unit/mcollective/connector/activemq_spec.rb
-- spec/unit/mcollective/generators/snippets/data_ddl
-- spec/unit/mcollective/generators/snippets/agent_ddl
-- spec/unit/mcollective/generators/base_spec.rb
-- spec/unit/mcollective/generators/data_generator_spec.rb
-- spec/unit/mcollective/generators/agent_generator_spec.rb
-- spec/unit/mcollective/runner_spec.rb
-- spec/unit/mcollective/util_spec.rb
-- spec/unit/mcollective/agents_spec.rb
-- spec/unit/mcollective/monkey_patches_spec.rb
-- spec/unit/mcollective/unix_daemon_spec.rb
+- spec/unit/mcollective/registration/base_spec.rb
+- spec/unit/mcollective/rpc/actionrunner_spec.rb
+- spec/unit/mcollective/rpc/agent_spec.rb
+- spec/unit/mcollective/rpc/client_spec.rb
+- spec/unit/mcollective/rpc/helpers_spec.rb
+- spec/unit/mcollective/rpc/reply_spec.rb
+- spec/unit/mcollective/rpc/request_spec.rb
+- spec/unit/mcollective/rpc/result_spec.rb
+- spec/unit/mcollective/rpc/stats_spec.rb
 - spec/unit/mcollective/rpc_spec.rb
-- spec/unit/mcollective/facts_spec.rb
-- spec/unit/mcollective/symbol_spec.rb
+- spec/unit/mcollective/runner_spec.rb
+- spec/unit/mcollective/runnerstats_spec.rb
 - spec/unit/mcollective/security/aes_security_spec.rb
-- spec/unit/mcollective/security/ssl_spec.rb
 - spec/unit/mcollective/security/base_spec.rb
 - spec/unit/mcollective/security/psk_spec.rb
-- spec/spec_helper.rb
+- spec/unit/mcollective/security/ssl_spec.rb
+- spec/unit/mcollective/shell_spec.rb
+- spec/unit/mcollective/ssl_spec.rb
+- spec/unit/mcollective/string_spec.rb
+- spec/unit/mcollective/symbol_spec.rb
+- spec/unit/mcollective/unix_daemon_spec.rb
+- spec/unit/mcollective/util_spec.rb
+- spec/unit/mcollective/validator/array_validator_spec.rb
+- spec/unit/mcollective/validator/ipv4address_validator_spec.rb
+- spec/unit/mcollective/validator/ipv6address_validator_spec.rb
+- spec/unit/mcollective/validator/length_validator_spec.rb
+- spec/unit/mcollective/validator/regex_validator_spec.rb
+- spec/unit/mcollective/validator/shellsafe_validator_spec.rb
+- spec/unit/mcollective/validator/typecheck_validator_spec.rb
+- spec/unit/mcollective/validator_spec.rb
+- spec/unit/mcollective/vendor_spec.rb
+- spec/unit/mcollective/windows_daemon_spec.rb
 - spec/windows_spec.opts