mcollective-client 2.5.3 → 2.6.0

data/spec/unit/rpc/result_spec.rb

@@ -68,6 +68,27 @@ module MCollective
           JSON.load(result.to_json).should == {"agent" => "tester", "action" => "test", "statuscode" => 0, "statusmsg" => "OK", "sender" => "rspec", "data" => {"foo" => "bar", "bar" => "baz"}}
         end
       end
+
+      describe "#<=>" do
+        it "should implement the Combined Comparison operator based on sender name" do
+          result_a = Result.new("tester", 
+                                "test", 
+                                { :statuscode => 0, 
+                                  :statusmsg => "OK", 
+                                  :sender => "a_rspec",  
+                                  :data => {}})
+          result_b = Result.new("tester", 
+                                "test", 
+                                { :statuscode => 0, 
+                                  :statusmsg => "OK", 
+                                  :sender => "b_rspec",  
+                                  :data => {}})
+
+          (result_a <=> result_b).should == -1
+          (result_b <=> result_a).should == 1
+          (result_a <=> result_a).should == 0
+        end
+      end
     end
   end
 end

data/spec/unit/runner_spec.rb

@@ -9,7 +9,7 @@ module MCollective
       c.stubs(:loadconfig)
       c.stubs(:configured).returns(true)
       c.stubs(:mode=)
-      c.stubs(:direct_addressing).returns(true)
+      c.stubs(:direct_addressing).returns(false)
       c.stubs(:registerinterval).returns(1)
       c.stubs(:soft_shutdown).returns(false)
       c
@@ -50,6 +50,7 @@ module MCollective
         Util.stubs(:windows).returns(false)
         Signal.expects(:trap).with('USR1')
         Signal.expects(:trap).with('USR2')
+        Signal.expects(:trap).with('WINCH')
         Runner.new(nil)
       end
 
@@ -57,6 +58,7 @@ module MCollective
         Util.stubs(:windows?).returns(true)
         Signal.expects(:trap).with('USR1').never
         Signal.expects(:trap).with('USR2').never
+        Signal.expects(:trap).with('WINCH').never
 
         Util.expects(:setup_windows_sleeper)
         Runner.new(nil)
@@ -85,7 +87,6 @@ module MCollective
       let(:agent_thread) do
         at = mock
         at.stubs(:alive?).returns(true)
-        at.expects(:join)
         at
       end
 
@@ -105,19 +106,13 @@ module MCollective
           runner.main_loop
         end
 
-        it 'should not do a soft_shutdown on windows' do
-          config.stubs(:soft_shutdown).returns(true)
-          Util.stubs(:windows?).returns(true)
-          Log.expects(:warn).with("soft_shutdown specified. This feature is not available on Windows. Shutting down normally.")
-          runner.instance_variable_set(:@state, :stopping)
-          runner.main_loop
-        end
-
         it 'should do a soft_shutdown' do
           config.stubs(:soft_shutdown).returns(true)
           Util.stubs(:windows?).returns(false)
           runner.instance_variable_set(:@state, :stopping)
           runner.instance_variable_set(:@agent_threads, [agent_thread])
+          runner.expects(:soft_shutdown)
+          runner.expects(:stop_threads)
           runner.main_loop
         end
       end
@@ -206,8 +201,7 @@ module MCollective
         before :each do
           PluginManager.stubs(:[]).with("registration_plugin").returns(registration_agent)
           Data.stubs(:load_data_sources)
-          Util.expects(:subscribe).twice
-          Util.expects(:make_subscriptions).twice
+          Util.stubs(:subscribe_to_direct_addressing_queue)
         end
 
         it 'should receive a message and spawn an agent thread' do
@@ -217,20 +211,21 @@ module MCollective
           runner.send(:receiver_thread)
         end
 
-        it 'should load agents before data plugins' do
-          load_order = sequence('load_order')
-          Agents.expects(:new).in_sequence(load_order)
-          Data.expects(:load_data_sources).in_sequence(load_order)
+        it 'should subscribe to the direct addressing queue if direct_addressing is configured' do
           runner.expects(:receive).returns(request)
           runner.expects(:agentmsg).with(request)
+          config.stubs(:direct_addressing).returns(true)
+          Util.expects(:subscribe_to_direct_addressing_queue)
           runner.instance_variable_set(:@exit_receiver_thread, true)
           runner.send(:receiver_thread)
         end
 
-        it 'should discard controller messages with an error message' do
+        it 'should load agents before data plugins' do
+          load_order = sequence('load_order')
+          Agents.expects(:new).in_sequence(load_order)
+          Data.expects(:load_data_sources).in_sequence(load_order)
           runner.expects(:receive).returns(request)
-          request.stubs(:agent).returns("mcollective")
-          Log.expects(:error).with("Received a control message, possibly via 'mco controller' but this has been deprecated and removed")
+          runner.expects(:agentmsg).with(request)
           runner.instance_variable_set(:@exit_receiver_thread, true)
           runner.send(:receiver_thread)
         end
@@ -259,5 +254,88 @@ module MCollective
         end
       end
     end
+
+    context "soft_shutdown" do
+      let(:runner) do
+        Runner.new(nil)
+      end
+
+      before(:each) do
+        config.stubs(:soft_shutdown).returns(true)
+      end
+
+      describe "#soft_shutdown" do
+        it "should not shutdown if the timeout is set and <= 0" do
+          config.stubs(:soft_shutdown_timeout).returns(0)
+          Log.expects(:warn).twice
+          runner.expects(:windows_soft_shutdown).never
+          runner.expects(:posix_soft_shutdown).never
+          runner.send(:soft_shutdown)
+        end
+
+        it "should call the windows soft_shutdown on Windows" do
+          config.stubs(:soft_shutdown_timeout).returns(1)
+          Util.stubs(:windows?).returns(true)
+          runner.expects(:windows_soft_shutdown)
+          runner.expects(:posix_soft_shutdown).never
+          runner.send(:soft_shutdown)
+        end
+
+        it "should call the posix soft_shutdown when not on windows" do
+          config.stubs(:soft_shutdown_timeout).returns(1)
+          Util.stubs(:windows?).returns(false)
+          runner.expects(:windows_soft_shutdown).never
+          runner.expects(:posix_soft_shutdown)
+          runner.send(:soft_shutdown)
+        end
+      end
+
+      describe "#windows_soft_shutdown" do
+        it "should not shutdown if no timeout is set" do
+          runner.expects(:shutdown_with_timeout).never
+          Log.expects(:warn).times(3)
+          runner.send(:windows_soft_shutdown, nil)
+        end
+
+        it "should shutdown in a timeout" do
+          runner.expects(:shutdown_with_timeout)
+          runner.send(:windows_soft_shutdown, 1)
+        end
+      end
+
+      describe "#posix_soft_shutdown" do
+        it "should shutdown without a timeout" do
+          runner.expects(:stop_agent_threads)
+          runner.send(:posix_soft_shutdown, nil)
+        end
+
+        it "should shutdown with a timeout" do
+          runner.expects(:shutdown_with_timeout)
+          runner.send(:posix_soft_shutdown, 1)
+        end
+      end
+
+      describe "#shutdown_with_timeout" do
+        it "should timeout if it can't stop agent threads in time" do
+          Timeout.expects(:timeout).with(1)
+          runner.send(:shutdown_with_timeout, 1)
+        end
+      end
+
+      describe "#stop_agent_threads" do
+        let(:agent_thread) do
+          at = mock
+          at.stubs(:alive?).returns(true)
+          at
+        end
+
+        it "should stop all agent threads" do
+          runner.instance_variable_set(:@agent_threads, [agent_thread])
+          Log.stubs(:debug)
+          agent_thread.expects(:join)
+          runner.send(:stop_agent_threads)
+        end
+      end
+    end
   end
 end

data/spec/unit/shell_spec.rb

@@ -21,6 +21,11 @@ module MCollective
         s.environment.should == {"LC_ALL" => "TEST", "foo" => "bar"}
       end
 
+      it "should allow locale to be cleared" do
+        s = Shell.new("date", :environment => {"LC_ALL" => nil, "foo" => "bar"})
+        s.environment.should == {"foo" => "bar"}
+      end
+
       it "should set no environment when given nil" do
         s = Shell.new("date", :environment => nil)
         s.environment.should == {}

data/spec/unit/ssl_spec.rb

@@ -139,6 +139,11 @@ module MCollective
         @ssl.base64_decode("Zm9v").should == "foo"
         SSL.base64_decode("Zm9v").should == "foo"
       end
+
+      it 'should raise an error when decoding invalid base64' do
+        expect { @ssl.base64_decode('.') }.to raise_error ArgumentError
+        expect { SSL.base64_decode('.') }.to raise_error ArgumentError
+      end
     end
 
     describe "#aes_encrypt" do

data/spec/unit/util_spec.rb

@@ -2,10 +2,11 @@
 
 require 'spec_helper'
 
+class MCollective::Connector::Stomp<MCollective::Connector::Base; end
+
 module MCollective
   describe Util do
     before do
-      class MCollective::Connector::Stomp<MCollective::Connector::Base; end
 
       PluginManager.clear
       PluginManager << {:type => "connector_plugin", :class => MCollective::Connector::Stomp.new}
@@ -247,8 +248,135 @@ module MCollective
         Util.has_fact?("foo", "b", "!=").should == false
         Util.has_fact?("foo", "a", "!=").should == true
       end
+
+      context 'structured facts (array)' do
+        it "should handle regex in a backward compatible way" do
+          MCollective::Facts.expects("[]").with("foo").returns(["foo", "baz"]).times(6)
+          Util.has_fact?("foo", "foo", "=~").should == true
+          Util.has_fact?("foo", "/foo/", "=~").should == true
+          Util.has_fact?("foo", "foo", "=~").should == true
+          Util.has_fact?("foo", "bar", "=~").should == false
+          Util.has_fact?("foo", "/bar/", "=~").should == false
+          Util.has_fact?("foo", "bar", "=~").should == false
+        end
+
+        it "should evaluate equality" do
+          MCollective::Facts.expects("[]").with("foo").returns(["foo", "baz"]).twice
+          Util.has_fact?("foo", "foo", "==").should == true
+          Util.has_fact?("foo", "bar", "==").should == false
+        end
+
+        it "should handle numeric comparisons correctly" do
+          MCollective::Facts.expects("[]").with("foo").returns(["1"]).times(8)
+          Util.has_fact?("foo", "2", ">=").should == false
+          Util.has_fact?("foo", "1", ">=").should == true
+          Util.has_fact?("foo", "2", "<=").should == true
+          Util.has_fact?("foo", "1", "<=").should == true
+          Util.has_fact?("foo", "1", "<").should == false
+          Util.has_fact?("foo", "1", ">").should == false
+          Util.has_fact?("foo", "1", "!=").should == false
+          Util.has_fact?("foo", "2", "!=").should == true
+        end
+
+        it "should handle alphabetic comparisons correctly" do
+          MCollective::Facts.expects("[]").with("foo").returns(["b"]).times(8)
+          Util.has_fact?("foo", "c", ">=").should == false
+          Util.has_fact?("foo", "a", ">=").should == true
+          Util.has_fact?("foo", "a", "<=").should == false
+          Util.has_fact?("foo", "b", "<=").should == true
+          Util.has_fact?("foo", "b", "<").should == false
+          Util.has_fact?("foo", "b", ">").should == false
+          Util.has_fact?("foo", "b", "!=").should == false
+          Util.has_fact?("foo", "a", "!=").should == true
+        end
+      end
+
+      context 'structured facts (hash)' do
+        it "should handle regex in a backward compatible way" do
+          MCollective::Facts.expects("[]").with("foo").returns({"foo" => 1, "baz" => 2}).times(6)
+          Util.has_fact?("foo", "foo", "=~").should == true
+          Util.has_fact?("foo", "/foo/", "=~").should == true
+          Util.has_fact?("foo", "foo", "=~").should == true
+          Util.has_fact?("foo", "bar", "=~").should == false
+          Util.has_fact?("foo", "/bar/", "=~").should == false
+          Util.has_fact?("foo", "bar", "=~").should == false
+        end
+
+        it "should evaluate equality" do
+          MCollective::Facts.expects("[]").with("foo").returns({"foo" => 1, "baz" => 2}).twice
+          Util.has_fact?("foo", "foo", "==").should == true
+          Util.has_fact?("foo", "bar", "==").should == false
+        end
+
+        it "should handle numeric comparisons correctly" do
+          MCollective::Facts.expects("[]").with("foo").returns({"1" => "one"}).times(8)
+          Util.has_fact?("foo", "2", ">=").should == false
+          Util.has_fact?("foo", "1", ">=").should == true
+          Util.has_fact?("foo", "2", "<=").should == true
+          Util.has_fact?("foo", "1", "<=").should == true
+          Util.has_fact?("foo", "1", "<").should == false
+          Util.has_fact?("foo", "1", ">").should == false
+          Util.has_fact?("foo", "1", "!=").should == false
+          Util.has_fact?("foo", "2", "!=").should == true
+        end
+
+        it "should handle alphabetic comparisons correctly" do
+          MCollective::Facts.expects("[]").with("foo").returns({"b" => 2}).times(8)
+          Util.has_fact?("foo", "c", ">=").should == false
+          Util.has_fact?("foo", "a", ">=").should == true
+          Util.has_fact?("foo", "a", "<=").should == false
+          Util.has_fact?("foo", "b", "<=").should == true
+          Util.has_fact?("foo", "b", "<").should == false
+          Util.has_fact?("foo", "b", ">").should == false
+          Util.has_fact?("foo", "b", "!=").should == false
+          Util.has_fact?("foo", "a", "!=").should == true
+        end
+      end
+    end
+
+    describe 'test_fact_value' do
+      it "should handle regex in a backward compatible way" do
+        Util.send(:test_fact_value, "foo", "foo", "=~").should == true
+        Util.send(:test_fact_value, "foo", "/foo/", "=~").should == true
+        Util.send(:test_fact_value, "foo", "foo", "=~").should == true
+        Util.send(:test_fact_value, "foo", "bar", "=~").should == false
+        Util.send(:test_fact_value, "foo", "/bar/", "=~").should == false
+        Util.send(:test_fact_value, "foo", "bar", "=~").should == false
+      end
+
+      it "should evaluate equality" do
+        Util.send(:test_fact_value, "foo", "foo", "==").should == true
+        Util.send(:test_fact_value, "foo", "bar", "==").should == false
+      end
+
+      it "should handle numeric comparisons correctly" do
+        Util.send(:test_fact_value, "1", "2", ">=").should == false
+        Util.send(:test_fact_value, "1", "1", ">=").should == true
+        Util.send(:test_fact_value, "1", "2", "<=").should == true
+        Util.send(:test_fact_value, "1", "1", "<=").should == true
+        Util.send(:test_fact_value, "1", "1", "<").should == false
+        Util.send(:test_fact_value, "1", "1", ">").should == false
+        Util.send(:test_fact_value, "1", "1", "!=").should == false
+        Util.send(:test_fact_value, "1", "2", "!=").should == true
+        Util.send(:test_fact_value, "100", "2", ">").should == true
+        Util.send(:test_fact_value, "100", "2", ">=").should == true
+        Util.send(:test_fact_value, "100", "2", "<").should == false
+        Util.send(:test_fact_value, "100", "2", "<=").should == false
+      end
+
+      it "should handle alphabetic comparisons correctly" do
+        Util.send(:test_fact_value, "b", "c", ">=").should == false
+        Util.send(:test_fact_value, "b", "a", ">=").should == true
+        Util.send(:test_fact_value, "b", "a", "<=").should == false
+        Util.send(:test_fact_value, "b", "b", "<=").should == true
+        Util.send(:test_fact_value, "b", "b", "<").should == false
+        Util.send(:test_fact_value, "b", "b", ">").should == false
+        Util.send(:test_fact_value, "b", "b", "!=").should == false
+        Util.send(:test_fact_value, "b", "a", "!=").should == true
+      end
     end
 
+
     describe "#parse_fact_string" do
       it "should parse old style regex fact matches" do
         Util.parse_fact_string("foo=/bar/").should == {:fact => "foo", :value => "/bar/", :operator => "=~"}
@@ -529,5 +657,39 @@ module MCollective
 
       end
     end
+
+    describe "#field_size" do
+      context "when elements are smaller than min_size" do
+        it "should return min_size" do
+          Util.field_size(['abc', 'def']).should == 40
+        end
+      end
+
+      context "when elements are bigger than min_size" do
+        it "should return the size of the biggest element" do
+          Util.field_size(['abc', 'def'], 2).should == 3
+        end
+      end
+    end
+
+    describe "#field_number" do
+      context "when field size is smaller than max_size" do
+        it "should return field number" do
+          Util.field_number(30).should == 3
+        end
+      end
+
+      context "when field size is smaller than max_size" do
+        it "should return 1" do
+          Util.field_number(100).should == 1
+        end
+      end
+
+      context "when specifying max_size" do
+        it "should adapt to max_size" do
+          Util.field_number(30, 70).should == 2
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcollective-client
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -66,190 +66,193 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/mcollective.rb
-- lib/mcollective/agent.rb
-- lib/mcollective/agents.rb
-- lib/mcollective/aggregate.rb
-- lib/mcollective/aggregate/base.rb
-- lib/mcollective/aggregate/result.rb
-- lib/mcollective/aggregate/result/base.rb
+- 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/base.rb
+- lib/mcollective/security.rb
+- lib/mcollective/log.rb
+- lib/mcollective/matcher.rb
+- lib/mcollective/unix_daemon.rb
+- lib/mcollective/windows_daemon.rb
 - lib/mcollective/aggregate/result/collection_result.rb
 - lib/mcollective/aggregate/result/numeric_result.rb
+- lib/mcollective/aggregate/result/base.rb
+- lib/mcollective/aggregate/result.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/config.rb
+- lib/mcollective/message.rb
 - lib/mcollective/application.rb
-- lib/mcollective/applications.rb
+- lib/mcollective/pluginpackager.rb
+- lib/mcollective/facts.rb
+- lib/mcollective/aggregate.rb
 - lib/mcollective/cache.rb
-- lib/mcollective/client.rb
-- lib/mcollective/config.rb
-- lib/mcollective/connector.rb
-- lib/mcollective/connector/base.rb
-- lib/mcollective/data.rb
-- lib/mcollective/data/base.rb
+- lib/mcollective/exceptions.rb
+- lib/mcollective/registration/base.rb
+- lib/mcollective/applications.rb
+- lib/mcollective/generators.rb
 - lib/mcollective/data/result.rb
-- lib/mcollective/ddl.rb
-- lib/mcollective/ddl/agentddl.rb
-- lib/mcollective/ddl/base.rb
+- lib/mcollective/data/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/exceptions.rb
-- lib/mcollective/facts.rb
-- lib/mcollective/facts/base.rb
-- lib/mcollective/generators.rb
+- lib/mcollective/util.rb
+- lib/mcollective/logger.rb
+- lib/mcollective/pluginpackager/agent_definition.rb
+- lib/mcollective/pluginpackager/standard_definition.rb
+- lib/mcollective/agent.rb
+- lib/mcollective/agents.rb
+- lib/mcollective/ddl.rb
+- lib/mcollective/connector/base.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/data_input_snippet.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/standard_definition.rb
-- lib/mcollective/registration.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/base.rb
-- lib/mcollective/shell.rb
-- lib/mcollective/ssl.rb
-- lib/mcollective/unix_daemon.rb
-- lib/mcollective/util.rb
-- lib/mcollective/validator.rb
+- lib/mcollective/generators/data_generator.rb
+- lib/mcollective/generators/base.rb
 - lib/mcollective/vendor.rb
-- lib/mcollective/vendor/require_vendored.rb
-- lib/mcollective/windows_daemon.rb
+- lib/mcollective/security/base.rb
+- lib/mcollective.rb
 - bin/mco
-- 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/3.out
 - spec/fixtures/util/1.in
+- spec/fixtures/util/4.in
 - spec/fixtures/util/1.out
-- spec/fixtures/util/2.in
-- spec/fixtures/util/2.out
 - spec/fixtures/util/3.in
-- spec/fixtures/util/3.out
-- spec/fixtures/util/4.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/monkey_patches/instance_variable_defined.rb
 - spec/spec.opts
-- spec/spec_helper.rb
-- spec/unit/agents_spec.rb
+- spec/Rakefile
+- spec/unit/application_spec.rb
+- spec/unit/runnerstats_spec.rb
+- spec/unit/validator_spec.rb
+- spec/unit/rpc/agent_spec.rb
+- spec/unit/rpc/helpers_spec.rb
+- spec/unit/rpc/stats_spec.rb
+- spec/unit/rpc/actionrunner_spec.rb
+- spec/unit/rpc/request_spec.rb
+- spec/unit/rpc/result_spec.rb
+- spec/unit/rpc/client_spec.rb
+- spec/unit/rpc/reply_spec.rb
+- spec/unit/facts/base_spec.rb
+- spec/unit/vendor_spec.rb
+- spec/unit/ssl_spec.rb
 - spec/unit/aggregate/base_spec.rb
 - spec/unit/aggregate/result/base_spec.rb
 - spec/unit/aggregate/result/collection_result_spec.rb
 - spec/unit/aggregate/result/numeric_result_spec.rb
-- spec/unit/aggregate_spec.rb
-- spec/unit/application_spec.rb
+- spec/unit/matcher_spec.rb
+- spec/unit/windows_daemon_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/applications_spec.rb
-- spec/unit/array_spec.rb
 - spec/unit/cache_spec.rb
-- spec/unit/client_spec.rb
-- spec/unit/config_spec.rb
+- spec/unit/matcher/scanner_spec.rb
+- spec/unit/matcher/parser_spec.rb
+- spec/unit/string_spec.rb
+- spec/unit/ddl_spec.rb
+- spec/unit/log_spec.rb
+- spec/unit/pluginmanager_spec.rb
+- spec/unit/registration/base_spec.rb
 - spec/unit/data/base_spec.rb
 - spec/unit/data/result_spec.rb
-- spec/unit/data_spec.rb
-- spec/unit/ddl/agentddl_spec.rb
 - spec/unit/ddl/base_spec.rb
 - spec/unit/ddl/dataddl_spec.rb
 - spec/unit/ddl/discoveryddl_spec.rb
-- spec/unit/ddl_spec.rb
+- spec/unit/ddl/agentddl_spec.rb
 - spec/unit/discovery_spec.rb
-- spec/unit/facts/base_spec.rb
-- spec/unit/facts_spec.rb
-- spec/unit/generators/agent_generator_spec.rb
-- spec/unit/generators/base_spec.rb
-- spec/unit/generators/data_generator_spec.rb
-- spec/unit/generators/snippets/agent_ddl
-- spec/unit/generators/snippets/data_ddl
-- spec/unit/log_spec.rb
 - spec/unit/logger/base_spec.rb
 - spec/unit/logger/console_logger_spec.rb
+- spec/unit/logger/file_logger_spec.rb
 - spec/unit/logger/syslog_logger_spec.rb
-- spec/unit/matcher/parser_spec.rb
-- spec/unit/matcher/scanner_spec.rb
-- spec/unit/matcher_spec.rb
-- spec/unit/message_spec.rb
-- spec/unit/optionparser_spec.rb
-- spec/unit/pluginmanager_spec.rb
-- spec/unit/pluginpackager/agent_definition_spec.rb
-- spec/unit/pluginpackager/standard_definition_spec.rb
-- spec/unit/pluginpackager_spec.rb
-- spec/unit/plugins/mcollective/agent/rpcutil_spec.rb
+- spec/unit/shell_spec.rb
+- spec/unit/data_spec.rb
+- spec/unit/plugins/mcollective/facts/yaml_facts_spec.rb
+- spec/unit/plugins/mcollective/application/plugin_spec.rb
+- spec/unit/plugins/mcollective/validator/ipv6address_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/ipv4address_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/regex_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/array_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/length_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/typecheck_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/shellsafe_validator_spec.rb
 - spec/unit/plugins/mcollective/aggregate/average_spec.rb
 - spec/unit/plugins/mcollective/aggregate/sum_spec.rb
 - spec/unit/plugins/mcollective/aggregate/summary_spec.rb
-- spec/unit/plugins/mcollective/application/plugin_spec.rb
 - spec/unit/plugins/mcollective/audit/logfile_spec.rb
-- spec/unit/plugins/mcollective/connector/activemq_spec.rb
-- spec/unit/plugins/mcollective/connector/rabbitmq_spec.rb
-- spec/unit/plugins/mcollective/data/agent_data_spec.rb
-- spec/unit/plugins/mcollective/data/fstat_data_spec.rb
 - spec/unit/plugins/mcollective/discovery/flatfile_spec.rb
-- spec/unit/plugins/mcollective/discovery/mc_spec.rb
 - spec/unit/plugins/mcollective/discovery/stdin_spec.rb
-- spec/unit/plugins/mcollective/facts/yaml_facts_spec.rb
-- spec/unit/plugins/mcollective/packagers/debpackage_packager_spec.rb
+- spec/unit/plugins/mcollective/discovery/mc_spec.rb
+- spec/unit/plugins/mcollective/data/agent_data_spec.rb
+- spec/unit/plugins/mcollective/data/fstat_data_spec.rb
+- spec/unit/plugins/mcollective/data/fact_data_spec.rb
 - spec/unit/plugins/mcollective/packagers/modulepackage_packager_spec.rb
+- spec/unit/plugins/mcollective/packagers/debpackage_packager_spec.rb
 - spec/unit/plugins/mcollective/packagers/ospackage_spec.rb
 - spec/unit/plugins/mcollective/packagers/rpmpackage_packager_spec.rb
+- spec/unit/plugins/mcollective/agent/rpcutil_spec.rb
+- spec/unit/plugins/mcollective/connector/rabbitmq_spec.rb
+- spec/unit/plugins/mcollective/connector/activemq_spec.rb
 - spec/unit/plugins/mcollective/security/aes_security_spec.rb
 - spec/unit/plugins/mcollective/security/psk_spec.rb
-- spec/unit/plugins/mcollective/validator/array_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/ipv4address_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/ipv6address_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/length_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/regex_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/shellsafe_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/typecheck_validator_spec.rb
-- spec/unit/registration/base_spec.rb
-- spec/unit/rpc/actionrunner_spec.rb
-- spec/unit/rpc/agent_spec.rb
-- spec/unit/rpc/client_spec.rb
-- spec/unit/rpc/helpers_spec.rb
-- spec/unit/rpc/reply_spec.rb
-- spec/unit/rpc/request_spec.rb
-- spec/unit/rpc/result_spec.rb
-- spec/unit/rpc/stats_spec.rb
-- spec/unit/rpc_spec.rb
+- spec/unit/client_spec.rb
+- spec/unit/pluginpackager/standard_definition_spec.rb
+- spec/unit/pluginpackager/agent_definition_spec.rb
+- spec/unit/aggregate_spec.rb
+- spec/unit/array_spec.rb
+- spec/unit/optionparser_spec.rb
+- spec/unit/message_spec.rb
+- spec/unit/pluginpackager_spec.rb
+- spec/unit/connector/base_spec.rb
+- spec/unit/generators/snippets/data_ddl
+- spec/unit/generators/snippets/agent_ddl
+- spec/unit/generators/base_spec.rb
+- spec/unit/generators/data_generator_spec.rb
+- spec/unit/generators/agent_generator_spec.rb
 - spec/unit/runner_spec.rb
-- spec/unit/runnerstats_spec.rb
-- spec/unit/security/base_spec.rb
-- spec/unit/shell_spec.rb
-- spec/unit/ssl_spec.rb
-- spec/unit/string_spec.rb
-- spec/unit/symbol_spec.rb
-- spec/unit/unix_daemon_spec.rb
 - spec/unit/util_spec.rb
-- spec/unit/validator_spec.rb
-- spec/unit/vendor_spec.rb
-- spec/unit/windows_daemon_spec.rb
+- spec/unit/agents_spec.rb
+- spec/unit/unix_daemon_spec.rb
+- spec/unit/rpc_spec.rb
+- spec/unit/facts_spec.rb
+- spec/unit/symbol_spec.rb
+- spec/unit/security/base_spec.rb
+- spec/spec_helper.rb
 - spec/windows_spec.opts
 homepage: https://docs.puppetlabs.com/mcollective/
 licenses: []
@@ -289,110 +292,113 @@ signing_key:
 specification_version: 3
 summary: Client libraries for the Mcollective Application Server
 test_files:
-- 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/3.out
 - spec/fixtures/util/1.in
+- spec/fixtures/util/4.in
 - spec/fixtures/util/1.out
-- spec/fixtures/util/2.in
-- spec/fixtures/util/2.out
 - spec/fixtures/util/3.in
-- spec/fixtures/util/3.out
-- spec/fixtures/util/4.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/monkey_patches/instance_variable_defined.rb
 - spec/spec.opts
-- spec/spec_helper.rb
-- spec/unit/agents_spec.rb
+- spec/Rakefile
+- spec/unit/application_spec.rb
+- spec/unit/runnerstats_spec.rb
+- spec/unit/validator_spec.rb
+- spec/unit/rpc/agent_spec.rb
+- spec/unit/rpc/helpers_spec.rb
+- spec/unit/rpc/stats_spec.rb
+- spec/unit/rpc/actionrunner_spec.rb
+- spec/unit/rpc/request_spec.rb
+- spec/unit/rpc/result_spec.rb
+- spec/unit/rpc/client_spec.rb
+- spec/unit/rpc/reply_spec.rb
+- spec/unit/facts/base_spec.rb
+- spec/unit/vendor_spec.rb
+- spec/unit/ssl_spec.rb
 - spec/unit/aggregate/base_spec.rb
 - spec/unit/aggregate/result/base_spec.rb
 - spec/unit/aggregate/result/collection_result_spec.rb
 - spec/unit/aggregate/result/numeric_result_spec.rb
-- spec/unit/aggregate_spec.rb
-- spec/unit/application_spec.rb
+- spec/unit/matcher_spec.rb
+- spec/unit/windows_daemon_spec.rb
+- spec/unit/config_spec.rb
 - spec/unit/applications_spec.rb
-- spec/unit/array_spec.rb
 - spec/unit/cache_spec.rb
-- spec/unit/client_spec.rb
-- spec/unit/config_spec.rb
+- spec/unit/matcher/scanner_spec.rb
+- spec/unit/matcher/parser_spec.rb
+- spec/unit/string_spec.rb
+- spec/unit/ddl_spec.rb
+- spec/unit/log_spec.rb
+- spec/unit/pluginmanager_spec.rb
+- spec/unit/registration/base_spec.rb
 - spec/unit/data/base_spec.rb
 - spec/unit/data/result_spec.rb
-- spec/unit/data_spec.rb
-- spec/unit/ddl/agentddl_spec.rb
 - spec/unit/ddl/base_spec.rb
 - spec/unit/ddl/dataddl_spec.rb
 - spec/unit/ddl/discoveryddl_spec.rb
-- spec/unit/ddl_spec.rb
+- spec/unit/ddl/agentddl_spec.rb
 - spec/unit/discovery_spec.rb
-- spec/unit/facts/base_spec.rb
-- spec/unit/facts_spec.rb
-- spec/unit/generators/agent_generator_spec.rb
-- spec/unit/generators/base_spec.rb
-- spec/unit/generators/data_generator_spec.rb
-- spec/unit/generators/snippets/agent_ddl
-- spec/unit/generators/snippets/data_ddl
-- spec/unit/log_spec.rb
 - spec/unit/logger/base_spec.rb
 - spec/unit/logger/console_logger_spec.rb
+- spec/unit/logger/file_logger_spec.rb
 - spec/unit/logger/syslog_logger_spec.rb
-- spec/unit/matcher/parser_spec.rb
-- spec/unit/matcher/scanner_spec.rb
-- spec/unit/matcher_spec.rb
-- spec/unit/message_spec.rb
-- spec/unit/optionparser_spec.rb
-- spec/unit/pluginmanager_spec.rb
-- spec/unit/pluginpackager/agent_definition_spec.rb
-- spec/unit/pluginpackager/standard_definition_spec.rb
-- spec/unit/pluginpackager_spec.rb
-- spec/unit/plugins/mcollective/agent/rpcutil_spec.rb
+- spec/unit/shell_spec.rb
+- spec/unit/data_spec.rb
+- spec/unit/plugins/mcollective/facts/yaml_facts_spec.rb
+- spec/unit/plugins/mcollective/application/plugin_spec.rb
+- spec/unit/plugins/mcollective/validator/ipv6address_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/ipv4address_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/regex_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/array_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/length_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/typecheck_validator_spec.rb
+- spec/unit/plugins/mcollective/validator/shellsafe_validator_spec.rb
 - spec/unit/plugins/mcollective/aggregate/average_spec.rb
 - spec/unit/plugins/mcollective/aggregate/sum_spec.rb
 - spec/unit/plugins/mcollective/aggregate/summary_spec.rb
-- spec/unit/plugins/mcollective/application/plugin_spec.rb
 - spec/unit/plugins/mcollective/audit/logfile_spec.rb
-- spec/unit/plugins/mcollective/connector/activemq_spec.rb
-- spec/unit/plugins/mcollective/connector/rabbitmq_spec.rb
-- spec/unit/plugins/mcollective/data/agent_data_spec.rb
-- spec/unit/plugins/mcollective/data/fstat_data_spec.rb
 - spec/unit/plugins/mcollective/discovery/flatfile_spec.rb
-- spec/unit/plugins/mcollective/discovery/mc_spec.rb
 - spec/unit/plugins/mcollective/discovery/stdin_spec.rb
-- spec/unit/plugins/mcollective/facts/yaml_facts_spec.rb
-- spec/unit/plugins/mcollective/packagers/debpackage_packager_spec.rb
+- spec/unit/plugins/mcollective/discovery/mc_spec.rb
+- spec/unit/plugins/mcollective/data/agent_data_spec.rb
+- spec/unit/plugins/mcollective/data/fstat_data_spec.rb
+- spec/unit/plugins/mcollective/data/fact_data_spec.rb
 - spec/unit/plugins/mcollective/packagers/modulepackage_packager_spec.rb
+- spec/unit/plugins/mcollective/packagers/debpackage_packager_spec.rb
 - spec/unit/plugins/mcollective/packagers/ospackage_spec.rb
 - spec/unit/plugins/mcollective/packagers/rpmpackage_packager_spec.rb
+- spec/unit/plugins/mcollective/agent/rpcutil_spec.rb
+- spec/unit/plugins/mcollective/connector/rabbitmq_spec.rb
+- spec/unit/plugins/mcollective/connector/activemq_spec.rb
 - spec/unit/plugins/mcollective/security/aes_security_spec.rb
 - spec/unit/plugins/mcollective/security/psk_spec.rb
-- spec/unit/plugins/mcollective/validator/array_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/ipv4address_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/ipv6address_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/length_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/regex_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/shellsafe_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/typecheck_validator_spec.rb
-- spec/unit/registration/base_spec.rb
-- spec/unit/rpc/actionrunner_spec.rb
-- spec/unit/rpc/agent_spec.rb
-- spec/unit/rpc/client_spec.rb
-- spec/unit/rpc/helpers_spec.rb
-- spec/unit/rpc/reply_spec.rb
-- spec/unit/rpc/request_spec.rb
-- spec/unit/rpc/result_spec.rb
-- spec/unit/rpc/stats_spec.rb
-- spec/unit/rpc_spec.rb
+- spec/unit/client_spec.rb
+- spec/unit/pluginpackager/standard_definition_spec.rb
+- spec/unit/pluginpackager/agent_definition_spec.rb
+- spec/unit/aggregate_spec.rb
+- spec/unit/array_spec.rb
+- spec/unit/optionparser_spec.rb
+- spec/unit/message_spec.rb
+- spec/unit/pluginpackager_spec.rb
+- spec/unit/connector/base_spec.rb
+- spec/unit/generators/snippets/data_ddl
+- spec/unit/generators/snippets/agent_ddl
+- spec/unit/generators/base_spec.rb
+- spec/unit/generators/data_generator_spec.rb
+- spec/unit/generators/agent_generator_spec.rb
 - spec/unit/runner_spec.rb
-- spec/unit/runnerstats_spec.rb
-- spec/unit/security/base_spec.rb
-- spec/unit/shell_spec.rb
-- spec/unit/ssl_spec.rb
-- spec/unit/string_spec.rb
-- spec/unit/symbol_spec.rb
-- spec/unit/unix_daemon_spec.rb
 - spec/unit/util_spec.rb
-- spec/unit/validator_spec.rb
-- spec/unit/vendor_spec.rb
-- spec/unit/windows_daemon_spec.rb
+- spec/unit/agents_spec.rb
+- spec/unit/unix_daemon_spec.rb
+- spec/unit/rpc_spec.rb
+- spec/unit/facts_spec.rb
+- spec/unit/symbol_spec.rb
+- spec/unit/security/base_spec.rb
+- spec/spec_helper.rb
 - spec/windows_spec.opts