mcollective-client 2.2.3 → 2.2.4

data/lib/mcollective/rpc/actionrunner.rb

@@ -91,7 +91,7 @@ module MCollective
       def load_json_results(file)
         return {} unless File.readable?(file)
 
-        JSON.load(File.read(file))
+        JSON.load(File.read(file)) || {}
       rescue JSON::ParserError
         {}
       end

data/lib/mcollective/util.rb

@@ -135,6 +135,12 @@ module MCollective
        "compound" => []}
     end
 
+    # Returns the PuppetLabs mcollective path for windows
+    def self.windows_prefix
+      require 'win32/dir'
+      prefix = File.join(Dir::COMMON_APPDATA, "PuppetLabs", "mcollective")
+    end
+
     # Picks a config file defaults to ~/.mcollective
     # else /etc/mcollective/client.cfg
     def self.config_file_for_user
@@ -145,10 +151,18 @@ module MCollective
         config = File.expand_path("~/.mcollective")
 
         unless File.readable?(config) && File.file?(config)
-          config = "/etc/mcollective/client.cfg"
+          if self.windows?
+            config = File.join(self.windows_prefix, "etc", "client.cfg")
+          else
+            config = "/etc/mcollective/client.cfg"
+          end
         end
       rescue Exception => e
-        config = "/etc/mcollective/client.cfg"
+        if self.windows?
+          config = File.join(self.windows_prefix, "etc", "client.cfg")
+        else
+          config = "/etc/mcollective/client.cfg"
+        end
       end
 
       return config
@@ -413,33 +427,34 @@ module MCollective
     # returns -1 if a < b
     # returns 1 if a > b
     #
-    # Code originally from Puppet but refactored to a more
-    # ruby style that fits in better with this code base
+    # Code originally from Puppet
     def self.versioncmp(version_a, version_b)
       vre = /[-.]|\d+|[^-.\d]+/
-      ax = version_a.scan(vre)
+        ax = version_a.scan(vre)
       bx = version_b.scan(vre)
 
-      until ax.empty? || bx.empty?
+      while (ax.length>0 && bx.length>0)
         a = ax.shift
         b = bx.shift
 
-        next      if a == b
-        next      if a == '-' && b == '-'
-        return -1 if a == '-'
-        return 1  if b == '-'
-        next      if a == '.' && b == '.'
-        return -1 if a == '.'
-        return 1  if b == '.'
-
-        if a =~ /^[^0]\d+$/ && b =~ /^[^0]\d+$/
-          return Integer(a) <=> Integer(b)
+        if( a == b )                 then next
+        elsif (a == '-' && b == '-') then next
+        elsif (a == '-')             then return -1
+        elsif (b == '-')             then return 1
+        elsif (a == '.' && b == '.') then next
+        elsif (a == '.' )            then return -1
+        elsif (b == '.' )            then return 1
+        elsif (a =~ /^\d+$/ && b =~ /^\d+$/) then
+          if( a =~ /^0/ or b =~ /^0/ ) then
+            return a.to_s.upcase <=> b.to_s.upcase
+          end
+          return a.to_i <=> b.to_i
         else
           return a.upcase <=> b.upcase
         end
       end
 
-      version_a <=> version_b
+      version_a <=> version_b;
     end
   end
 end

data/lib/mcollective.rb

@@ -7,6 +7,7 @@ require 'singleton'
 require 'socket'
 require 'erb'
 require 'shellwords'
+require 'stringio'
 require 'rbconfig'
 require 'tempfile'
 require 'tmpdir'

data/spec/unit/ddl/base_spec.rb

@@ -18,6 +18,7 @@ module MCollective
 
         it "should return correct new path for other ddls" do
           @ddl.instance_variable_set("@plugintype", :data)
+          File.expects(:exists?).with("/etc/mcollective/data-help.erb").returns(true)
           @ddl.template_for_plugintype.should == "data-help.erb"
         end
       end

data/spec/unit/plugins/mcollective/connector/rabbitmq_spec.rb

@@ -264,6 +264,7 @@ module MCollective
           msg.stubs(:agent).returns("agent")
           msg.stubs(:collective).returns("mcollective")
           msg.stubs(:type).returns(:direct_request)
+          msg.stubs(:reply_to).returns("/topic/mcollective")
           msg.expects(:discovered_hosts).returns(["one", "two"])
 
           @connection.expects(:publish).with('/exchange/mcollective_directed/one', 'msg', {'reply-to' => '/temp-queue/mcollective_reply_agent'})
@@ -345,8 +346,9 @@ module MCollective
           message.expects(:type).returns(:request).times(3)
           message.expects(:agent).returns("rspecagent")
           message.expects(:collective).returns("mcollective")
+          message.expects(:reply_to).returns("/topic/rspec")
 
-          @c.expects(:make_target).with("rspecagent", :request, "mcollective", nil)
+          @c.expects(:make_target).with("rspecagent", :request, "mcollective", "/topic/rspec", nil)
           @c.target_for(message)
         end
 
@@ -355,8 +357,9 @@ module MCollective
           message.expects(:type).returns(:direct_request).times(3)
           message.expects(:agent).returns("rspecagent")
           message.expects(:collective).returns("mcollective")
+          message.expects(:reply_to).returns("/topic/rspec")
 
-          @c.expects(:make_target).with("rspecagent", :direct_request, "mcollective", nil)
+          @c.expects(:make_target).with("rspecagent", :direct_request, "mcollective", "/topic/rspec", nil)
           @c.target_for(message)
         end
 
@@ -382,8 +385,9 @@ module MCollective
           @c.make_target("test", :reply, "mcollective").should == {:name => "/temp-queue/mcollective_reply_test", :headers => {}, :id => "mcollective_test_replies"}
           @c.make_target("test", :broadcast, "mcollective").should == {:name => "/exchange/mcollective_broadcast/test", :headers => {"reply-to"=>"/temp-queue/mcollective_reply_test"}, :id => "mcollective_broadcast_test"}
           @c.make_target("test", :request, "mcollective").should == {:name => "/exchange/mcollective_broadcast/test", :headers => {"reply-to"=>"/temp-queue/mcollective_reply_test"}, :id => "mcollective_broadcast_test"}
-          @c.make_target("test", :direct_request, "mcollective", "rspec").should == {:headers=>{"reply-to"=>"/temp-queue/mcollective_reply_test"}, :name=>"/exchange/mcollective_directed/rspec", :id => nil}
+          @c.make_target("test", :direct_request, "mcollective", nil, "rspec").should == {:headers=>{"reply-to"=>"/temp-queue/mcollective_reply_test"}, :name=>"/exchange/mcollective_directed/rspec", :id => nil}
           @c.make_target("test", :directed, "mcollective").should == {:name => "/exchange/mcollective_directed/rspec", :headers=>{}, :id => "rspec_directed_to_identity"}
+          @c.make_target("test", :request, "mcollective", "/topic/rspec", "rspec").should == {:headers=>{"reply-to"=>"/topic/rspec"}, :name=>"/exchange/mcollective_broadcast/test", :id => "mcollective_broadcast_test"}
         end
 
         it "should raise an error for unknown collectives" do

data/spec/unit/plugins/mcollective/packagers/debpackage_packager_spec.rb

@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/pluginpack
 
 module MCollective
   module PluginPackager
-    describe DebpackagePackager do
+    describe DebpackagePackager, :unless => MCollective::Util.windows? do
 
       let(:maketmpdir) do
         tmpdir = Dir.mktmpdir("mc-test")

data/spec/unit/plugins/mcollective/packagers/rpmpackage_packager_spec.rb

@@ -22,6 +22,8 @@ module MCollective
         @plugin.stubs(:iteration).returns("1")
         @plugin.stubs(:metadata).returns({:name => "test", :version => "1"})
         @plugin.stubs(:mcname).returns("mcollective")
+        RpmpackagePackager.any_instance.stubs(:rpmdir).returns('rpmdir')
+        RpmpackagePackager.any_instance.stubs(:srpmdir).returns('srpmdir')
       end
 
       after :all do

data/spec/unit/shell_spec.rb

@@ -71,6 +71,14 @@ module MCollective
     end
 
     describe "#runcommand" do
+      let(:nl) do
+        if MCollective::Util.windows? && STDOUT.tty? && STDERR.tty?
+          "\r\n"
+        else
+          "\n"
+        end
+      end
+
       it "should run the command" do
         Shell.any_instance.stubs("systemu").returns(true).once.with("date", "stdout" => '', "stderr" => '', "env" => {"LC_ALL" => "C"}, 'cwd' => Dir.tmpdir)
         s = Shell.new("date")
@@ -80,8 +88,8 @@ module MCollective
       it "should set stdin, stdout and status" do
         s = Shell.new('ruby -e "STDERR.puts \"stderr\"; STDOUT.puts \"stdout\""')
         s.runcommand
-        s.stdout.should == "stdout\n"
-        s.stderr.should == "stderr\n"
+        s.stdout.should == "stdout#{nl}"
+        s.stderr.should == "stderr#{nl}"
         s.status.exitstatus.should == 0
       end
 
@@ -92,10 +100,10 @@ module MCollective
         s.status.exitstatus.should == 1
       end
 
-      it "shold have correct environment" do
+      it "should have correct environment" do
         s = Shell.new('ruby -e "puts ENV[\'LC_ALL\'];puts ENV[\'foo\'];"', :environment => {"foo" => "bar"})
         s.runcommand
-        s.stdout.should == "C\nbar\n"
+        s.stdout.should == "C#{nl}bar#{nl}"
       end
 
       it "should save stdout in custom stdout variable" do
@@ -104,8 +112,8 @@ module MCollective
         s = Shell.new('echo foo', :stdout => out)
         s.runcommand
 
-        s.stdout.should == "STDOUTfoo\n"
-        out.should == "STDOUTfoo\n"
+        s.stdout.should == "STDOUTfoo#{nl}"
+        out.should == "STDOUTfoo#{nl}"
       end
 
       it "should save stderr in custom stderr variable" do
@@ -114,8 +122,8 @@ module MCollective
         s = Shell.new('ruby -e "STDERR.puts \"foo\""', :stderr => out)
         s.runcommand
 
-        s.stderr.should == "STDERRfoo\n"
-        out.should == "STDERRfoo\n"
+        s.stderr.should == "STDERRfoo#{nl}"
+        out.should == "STDERRfoo#{nl}"
       end
 
       it "should run in the correct cwd" do
@@ -123,21 +131,21 @@ module MCollective
 
         s.runcommand
 
-        s.stdout.should == "#{Dir.tmpdir}\n"
+        s.stdout.should == "#{Dir.tmpdir}#{nl}"
       end
 
       it "should send the stdin" do
         s = Shell.new('ruby -e "puts STDIN.gets"', :stdin => "hello world")
         s.runcommand
 
-        s.stdout.should == "hello world\n"
+        s.stdout.should == "hello world#{nl}"
       end
 
       it "should support multiple lines of stdin" do
         s = Shell.new('ruby -e "puts STDIN.gets;puts;puts STDIN.gets"', :stdin => "first line\n2nd line")
         s.runcommand
 
-        s.stdout.should == "first line\n\n2nd line\n"
+        s.stdout.should == "first line#{nl}#{nl}2nd line#{nl}"
       end
     end
   end

data/spec/unit/unix_daemon_spec.rb

@@ -11,7 +11,7 @@ module MCollective
         expect { UnixDaemon.daemonize_runner }.to raise_error("The Unix Daemonizer can not be used on the Windows Platform")
       end
 
-      it "should write the pid file if requested" do
+      it "should write the pid file if requested", :unless => MCollective::Util.windows? do
         f = mock
         f.expects(:write).with(Process.pid)
 
@@ -26,7 +26,7 @@ module MCollective
         UnixDaemon.daemonize_runner("/nonexisting")
       end
 
-      it "should not write a pid file unless requested" do
+      it "should not write a pid file unless requested", :unless => MCollective::Util.windows? do
         r = mock
         r.expects(:run)
 

data/spec/unit/util_spec.rb

@@ -398,6 +398,7 @@ module MCollective
 
         stdout = mock()
         stdout.expects(:tty?).returns(true)
+        Util.expects(:windows?).returns(false)
         environment = mock()
         environment.expects(:[]).with("COLUMNS").returns(5).twice
         environment.expects(:[]).with("LINES").returns(5).twice
@@ -408,6 +409,7 @@ module MCollective
       it "should return the correct dimensions if ENV term is set and tput is present" do
         stdout = mock()
         stdout.expects(:tty?).returns(true)
+        Util.expects(:windows?).returns(false)
         environment = mock()
         environment.expects(:[]).with("COLUMNS").returns(false)
         environment.expects(:[]).with("TERM").returns(true)
@@ -422,6 +424,7 @@ module MCollective
       it "should return the correct dimensions if stty is present" do
         stdout = mock()
         stdout.expects(:tty?).returns(true)
+        Util.expects(:windows?).returns(false)
 
         environment = mock()
         environment.expects(:[]).with("COLUMNS").returns(false)
@@ -451,11 +454,11 @@ module MCollective
 
     describe "#versioncmp" do
       it "should be able to sort a long set of various unordered versions" do
-        ary = %w{ 1.1.6 2.3 1.1a 3.0 1.5 1 2.4 1.1-4 2.3.1 1.2 2.3.0 1.1-3 2.4b 2.4 2.40.2 2.3a.1 3.1 0002 1.1-5 1.1.a 1.06}
+        ary = %w{ 1.1.6 2.3 1.1a 3.0 1.5 1 2.4 1.1-4 2.3.1 1.2 2.3.0 1.1-3 2.4b 2.4 2.40.2 2.3a.1 3.1 0002 1.1-5 1.1.a 1.06 1.2.10 1.2.8}
 
         newary = ary.sort {|a, b| Util.versioncmp(a,b) }
 
-        newary.should == ["0002", "1", "1.06", "1.1-3", "1.1-4", "1.1-5", "1.1.6", "1.1.a", "1.1a", "1.2", "1.5", "2.3", "2.3.0", "2.3.1", "2.3a.1", "2.4", "2.4", "2.4b", "2.40.2", "3.0", "3.1"]
+        newary.should == ["0002", "1", "1.06", "1.1-3", "1.1-4", "1.1-5", "1.1.6", "1.1.a", "1.1a", "1.2", "1.2.8", "1.2.10", "1.5", "2.3", "2.3.0", "2.3.1", "2.3a.1", "2.4", "2.4", "2.4b", "2.40.2", "3.0", "3.1"]
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mcollective-client
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 2
-  - 3
-  version: 2.2.3
+  - 4
+  version: 2.2.4
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-14 00:00:00 Z
+date: 2013-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: systemu
@@ -70,184 +70,184 @@ extra_rdoc_files: []
 files: 
 - bin/mc-call-agent
 - bin/mco
-- lib/mcollective/data.rb
-- lib/mcollective/connector/base.rb
-- lib/mcollective/windows_daemon.rb
-- lib/mcollective/vendor/require_vendored.rb
-- lib/mcollective/shell.rb
-- lib/mcollective/ssl.rb
+- lib/mcollective.rb
+- lib/mcollective/agent.rb
+- lib/mcollective/agents.rb
+- lib/mcollective/aggregate.rb
 - lib/mcollective/aggregate/base.rb
-- lib/mcollective/aggregate/result/numeric_result.rb
+- lib/mcollective/aggregate/result.rb
 - lib/mcollective/aggregate/result/base.rb
 - lib/mcollective/aggregate/result/collection_result.rb
-- lib/mcollective/aggregate/result.rb
-- lib/mcollective/agent.rb
-- lib/mcollective/facts/base.rb
+- lib/mcollective/aggregate/result/numeric_result.rb
 - lib/mcollective/application.rb
-- lib/mcollective/message.rb
-- lib/mcollective/monkey_patches.rb
-- lib/mcollective/agents.rb
-- lib/mcollective/rpc/agent.rb
-- lib/mcollective/rpc/request.rb
-- lib/mcollective/rpc/reply.rb
-- lib/mcollective/rpc/progress.rb
-- lib/mcollective/rpc/result.rb
-- lib/mcollective/rpc/helpers.rb
-- lib/mcollective/rpc/actionrunner.rb
-- lib/mcollective/rpc/audit.rb
-- lib/mcollective/rpc/client.rb
-- lib/mcollective/rpc/stats.rb
-- lib/mcollective/log.rb
-- lib/mcollective/pluginmanager.rb
-- lib/mcollective/runnerstats.rb
-- lib/mcollective/pluginpackager/agent_definition.rb
-- lib/mcollective/pluginpackager/standard_definition.rb
-- lib/mcollective/discovery.rb
-- lib/mcollective/vendor.rb
-- lib/mcollective/facts.rb
-- lib/mcollective/logger.rb
-- lib/mcollective/generators.rb
-- lib/mcollective/ddl/base.rb
+- lib/mcollective/applications.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/data/result.rb
+- lib/mcollective/ddl.rb
 - lib/mcollective/ddl/agentddl.rb
-- lib/mcollective/ddl/discoveryddl.rb
+- lib/mcollective/ddl/base.rb
 - lib/mcollective/ddl/dataddl.rb
+- lib/mcollective/ddl/discoveryddl.rb
 - lib/mcollective/ddl/validatorddl.rb
-- lib/mcollective/logger/file_logger.rb
-- lib/mcollective/logger/console_logger.rb
-- lib/mcollective/logger/base.rb
-- lib/mcollective/logger/syslog_logger.rb
+- lib/mcollective/discovery.rb
+- lib/mcollective/facts.rb
+- lib/mcollective/facts/base.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/action_snippet.erb
 - lib/mcollective/generators/templates/plugin.erb
-- lib/mcollective/generators/data_generator.rb
-- lib/mcollective/generators/agent_generator.rb
-- lib/mcollective/config.rb
-- lib/mcollective/ddl.rb
-- lib/mcollective/connector.rb
-- lib/mcollective/registration/base.rb
-- lib/mcollective/registration.rb
-- lib/mcollective/applications.rb
-- lib/mcollective/pluginpackager.rb
-- lib/mcollective/security/base.rb
+- 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/unix_daemon.rb
-- lib/mcollective/data/base.rb
-- lib/mcollective/data/result.rb
-- lib/mcollective/validator.rb
-- lib/mcollective/aggregate.rb
-- lib/mcollective/rpc.rb
-- lib/mcollective/optionparser.rb
-- lib/mcollective/cache.rb
 - lib/mcollective/matcher/parser.rb
 - lib/mcollective/matcher/scanner.rb
-- lib/mcollective/client.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.rb
-- spec/spec.opts
-- spec/fixtures/test-public.pem
+- lib/mcollective/validator.rb
+- lib/mcollective/vendor.rb
+- lib/mcollective/vendor/require_vendored.rb
+- lib/mcollective/windows_daemon.rb
+- spec/Rakefile
 - spec/fixtures/application/test.rb
-- spec/fixtures/test-private.pem
 - 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/2.in
 - spec/fixtures/util/2.out
-- spec/fixtures/util/4.out
+- spec/fixtures/util/3.in
 - spec/fixtures/util/3.out
-- spec/unit/data_spec.rb
-- spec/unit/application_spec.rb
-- spec/unit/ddl_spec.rb
+- spec/fixtures/util/4.in
+- spec/fixtures/util/4.out
+- spec/monkey_patches/instance_variable_defined.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/unit/agents_spec.rb
 - spec/unit/aggregate/base_spec.rb
 - spec/unit/aggregate/result/base_spec.rb
-- spec/unit/aggregate/result/numeric_result_spec.rb
 - spec/unit/aggregate/result/collection_result_spec.rb
-- spec/unit/client_spec.rb
-- spec/unit/unix_daemon_spec.rb
-- spec/unit/facts/base_spec.rb
+- spec/unit/aggregate/result/numeric_result_spec.rb
+- spec/unit/aggregate_spec.rb
+- spec/unit/application_spec.rb
+- spec/unit/applications_spec.rb
 - spec/unit/array_spec.rb
-- spec/unit/rpc/reply_spec.rb
-- spec/unit/rpc/client_spec.rb
-- spec/unit/rpc/helpers_spec.rb
-- spec/unit/rpc/request_spec.rb
-- spec/unit/rpc/agent_spec.rb
-- spec/unit/rpc/result_spec.rb
-- spec/unit/rpc/actionrunner_spec.rb
-- spec/unit/rpc/stats_spec.rb
-- spec/unit/windows_daemon_spec.rb
 - spec/unit/cache_spec.rb
-- spec/unit/optionparser_spec.rb
-- spec/unit/string_spec.rb
-- spec/unit/pluginpackager/agent_definition_spec.rb
-- spec/unit/pluginpackager/standard_definition_spec.rb
-- spec/unit/ssl_spec.rb
+- spec/unit/client_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/applications_spec.rb
-- spec/unit/validator_spec.rb
-- spec/unit/runnerstats_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/agentddl_spec.rb
 - spec/unit/ddl/discoveryddl_spec.rb
-- spec/unit/logger/console_logger_spec.rb
-- spec/unit/logger/base_spec.rb
-- spec/unit/logger/syslog_logger_spec.rb
+- spec/unit/ddl_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/snippets/agent_ddl
-- spec/unit/generators/snippets/data_ddl
 - spec/unit/generators/base_spec.rb
 - spec/unit/generators/data_generator_spec.rb
-- spec/unit/plugins/mcollective/connector/rabbitmq_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/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/aggregate/average_spec.rb
+- spec/unit/plugins/mcollective/aggregate/sum_spec.rb
+- spec/unit/plugins/mcollective/aggregate/summary_spec.rb
 - spec/unit/plugins/mcollective/connector/activemq_spec.rb
+- spec/unit/plugins/mcollective/connector/rabbitmq_spec.rb
 - spec/unit/plugins/mcollective/connector/stomp/eventlogger_spec.rb
 - spec/unit/plugins/mcollective/connector/stomp_spec.rb
-- spec/unit/plugins/mcollective/aggregate/sum_spec.rb
-- spec/unit/plugins/mcollective/aggregate/average_spec.rb
-- spec/unit/plugins/mcollective/aggregate/summary_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/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/security/psk_spec.rb
-- spec/unit/plugins/mcollective/data/fstat_data_spec.rb
-- spec/unit/plugins/mcollective/data/agent_data_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/any_validator_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/typecheck_validator_spec.rb
 - spec/unit/plugins/mcollective/validator/ipv6address_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/array_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/any_validator_spec.rb
 - spec/unit/plugins/mcollective/validator/length_validator_spec.rb
-- spec/unit/pluginpackager_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/agents_spec.rb
-- spec/unit/security/base_spec.rb
-- spec/unit/vendor_spec.rb
-- spec/unit/message_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/data/base_spec.rb
-- spec/unit/data/result_spec.rb
-- spec/unit/matcher_spec.rb
-- spec/unit/log_spec.rb
-- spec/unit/aggregate_spec.rb
-- spec/unit/facts_spec.rb
+- spec/unit/runnerstats_spec.rb
+- spec/unit/security/base_spec.rb
 - spec/unit/shell_spec.rb
-- spec/unit/pluginmanager_spec.rb
-- spec/unit/discovery_spec.rb
-- spec/unit/matcher/parser_spec.rb
-- spec/unit/matcher/scanner_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/windows_spec.opts
-- spec/spec_helper.rb
-- spec/monkey_patches/instance_variable_defined.rb
-- spec/Rakefile
 homepage: https://docs.puppetlabs.com/mcollective/
 licenses: []
 
@@ -282,105 +282,105 @@ signing_key:
 specification_version: 3
 summary: Client libraries for The Marionette Collective
 test_files: 
-- spec/spec.opts
-- spec/fixtures/test-public.pem
+- spec/Rakefile
 - spec/fixtures/application/test.rb
-- spec/fixtures/test-private.pem
 - 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/2.in
 - spec/fixtures/util/2.out
-- spec/fixtures/util/4.out
+- spec/fixtures/util/3.in
 - spec/fixtures/util/3.out
-- spec/unit/data_spec.rb
-- spec/unit/application_spec.rb
-- spec/unit/ddl_spec.rb
+- spec/fixtures/util/4.in
+- spec/fixtures/util/4.out
+- spec/monkey_patches/instance_variable_defined.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/unit/agents_spec.rb
 - spec/unit/aggregate/base_spec.rb
 - spec/unit/aggregate/result/base_spec.rb
-- spec/unit/aggregate/result/numeric_result_spec.rb
 - spec/unit/aggregate/result/collection_result_spec.rb
-- spec/unit/client_spec.rb
-- spec/unit/unix_daemon_spec.rb
-- spec/unit/facts/base_spec.rb
+- spec/unit/aggregate/result/numeric_result_spec.rb
+- spec/unit/aggregate_spec.rb
+- spec/unit/application_spec.rb
+- spec/unit/applications_spec.rb
 - spec/unit/array_spec.rb
-- spec/unit/rpc/reply_spec.rb
-- spec/unit/rpc/client_spec.rb
-- spec/unit/rpc/helpers_spec.rb
-- spec/unit/rpc/request_spec.rb
-- spec/unit/rpc/agent_spec.rb
-- spec/unit/rpc/result_spec.rb
-- spec/unit/rpc/actionrunner_spec.rb
-- spec/unit/rpc/stats_spec.rb
-- spec/unit/windows_daemon_spec.rb
 - spec/unit/cache_spec.rb
-- spec/unit/optionparser_spec.rb
-- spec/unit/string_spec.rb
-- spec/unit/pluginpackager/agent_definition_spec.rb
-- spec/unit/pluginpackager/standard_definition_spec.rb
-- spec/unit/ssl_spec.rb
+- spec/unit/client_spec.rb
 - spec/unit/config_spec.rb
-- spec/unit/applications_spec.rb
-- spec/unit/validator_spec.rb
-- spec/unit/runnerstats_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/agentddl_spec.rb
 - spec/unit/ddl/discoveryddl_spec.rb
-- spec/unit/logger/console_logger_spec.rb
-- spec/unit/logger/base_spec.rb
-- spec/unit/logger/syslog_logger_spec.rb
+- spec/unit/ddl_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/snippets/agent_ddl
-- spec/unit/generators/snippets/data_ddl
 - spec/unit/generators/base_spec.rb
 - spec/unit/generators/data_generator_spec.rb
-- spec/unit/plugins/mcollective/connector/rabbitmq_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/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/aggregate/average_spec.rb
+- spec/unit/plugins/mcollective/aggregate/sum_spec.rb
+- spec/unit/plugins/mcollective/aggregate/summary_spec.rb
 - spec/unit/plugins/mcollective/connector/activemq_spec.rb
+- spec/unit/plugins/mcollective/connector/rabbitmq_spec.rb
 - spec/unit/plugins/mcollective/connector/stomp/eventlogger_spec.rb
 - spec/unit/plugins/mcollective/connector/stomp_spec.rb
-- spec/unit/plugins/mcollective/aggregate/sum_spec.rb
-- spec/unit/plugins/mcollective/aggregate/average_spec.rb
-- spec/unit/plugins/mcollective/aggregate/summary_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/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/security/psk_spec.rb
-- spec/unit/plugins/mcollective/data/fstat_data_spec.rb
-- spec/unit/plugins/mcollective/data/agent_data_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/any_validator_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/typecheck_validator_spec.rb
 - spec/unit/plugins/mcollective/validator/ipv6address_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/array_validator_spec.rb
-- spec/unit/plugins/mcollective/validator/any_validator_spec.rb
 - spec/unit/plugins/mcollective/validator/length_validator_spec.rb
-- spec/unit/pluginpackager_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/agents_spec.rb
-- spec/unit/security/base_spec.rb
-- spec/unit/vendor_spec.rb
-- spec/unit/message_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/data/base_spec.rb
-- spec/unit/data/result_spec.rb
-- spec/unit/matcher_spec.rb
-- spec/unit/log_spec.rb
-- spec/unit/aggregate_spec.rb
-- spec/unit/facts_spec.rb
+- spec/unit/runnerstats_spec.rb
+- spec/unit/security/base_spec.rb
 - spec/unit/shell_spec.rb
-- spec/unit/pluginmanager_spec.rb
-- spec/unit/discovery_spec.rb
-- spec/unit/matcher/parser_spec.rb
-- spec/unit/matcher/scanner_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/windows_spec.opts
-- spec/spec_helper.rb
-- spec/monkey_patches/instance_variable_defined.rb
-- spec/Rakefile