mcollective-client 2.2.0 → 2.2.1

data/lib/mcollective/aggregate.rb

@@ -3,12 +3,13 @@ module MCollective
     autoload :Result, 'mcollective/aggregate/result'
     autoload :Base, 'mcollective/aggregate/base'
 
-    attr_accessor :ddl, :functions, :action
+    attr_accessor :ddl, :functions, :action, :failed
 
     def initialize(ddl)
       @functions = []
       @ddl = ddl
       @action = ddl[:action]
+      @failed = []
 
       create_functions
     end
@@ -17,35 +18,58 @@ module MCollective
     # All aggregate call and summarize method calls operate on these function as a batch.
     def create_functions
       @ddl[:aggregate].each_with_index do |agg, i|
-        contains_output?(agg[:args][0])
-
         output = agg[:args][0]
-        arguments = agg[:args][1..(agg[:args].size)]
 
-        @functions << load_function(agg[:function]).new(output, arguments, agg[:format], @action)
+        if contains_output?(output)
+          arguments = agg[:args][1]
+          format = (arguments.delete(:format) if arguments) || nil
+          begin
+            @functions << load_function(agg[:function]).new(output, arguments, format, @action)
+          rescue Exception => e
+            Log.error("Cannot create aggregate function '#{output}'. #{e.to_s}")
+            @failed << {:name => output, :type => :startup}
+          end
+        else
+          Log.error("Cannot create aggregate function '#{output}'. '#{output}' has not been specified as a valid ddl output.")
+          @failed << {:name => output, :type => :create}
+        end
       end
     end
 
     # Check if the function param is defined as an output for the action in the ddl
     def contains_output?(output)
-      raise "'#{@ddl[:action]}' action does not contain output '#{output}'" unless @ddl[:output].keys.include?(output)
+      @ddl[:output].keys.include?(output)
     end
 
     # Call all the appropriate functions with the reply data received from RPC::Client
     def call_functions(reply)
       @functions.each do |function|
         Log.debug("Calling aggregate function #{function} for result")
-        function.process_result(reply[:data][function.output_name], reply)
+        begin
+          function.process_result(reply[:data][function.output_name], reply)
+        rescue Exception => e
+          Log.error("Could not process aggregate function for '#{function.output_name}'. #{e.to_s}")
+          @failed << {:name => function.output_name, :type => :process_result}
+          @functions.delete(function)
+        end
       end
     end
 
     # Finalizes the function returning a result object
     def summarize
       summary = @functions.map do |function|
-        function.summarize
+        begin
+          function.summarize
+        rescue Exception => e
+          Log.error("Could not summarize aggregate result for '#{function.output_name}'. #{e.to_s}")
+          @failed << {:name => function.output_name, :type => :summarize}
+          nil
+        end
       end
 
-      summary.sort{|x,y| x.result[:output] <=> y.result[:output]}
+      summary.reject{|x| x.nil?}.sort do |x,y|
+        x.result[:output] <=> y.result[:output]
+      end
     end
 
     # Loads function from disk for use

data/lib/mcollective/aggregate/result/collection_result.rb

@@ -8,7 +8,7 @@ module MCollective
           result = StringIO.new
 
           @result[:value].sort{|x,y| x[1] <=> y[1]}.reverse.each do |value|
-            result.puts "    " + @aggregate_format % [value[0], value[1]]
+            result.puts @aggregate_format % [value[0], value[1]]
           end
 
           result.string.chomp

data/lib/mcollective/client.rb

@@ -127,10 +127,12 @@ module MCollective
     def req(body, agent=nil, options=false, waitfor=0)
       if body.is_a?(Message)
         agent = body.agent
-        options = body.options
         waitfor = body.discovered_hosts.size || 0
+        @options = body.options
       end
 
+      @options = options if options
+
       stat = {:starttime => Time.now.to_f, :discoverytime => 0, :blocktime => 0, :totaltime => 0}
 
       timeout = @discoverer.discovery_timeout(@options[:timeout], @options[:filter])
@@ -141,6 +143,8 @@ module MCollective
       reqid = nil
 
       begin
+        Log.debug("Publishing request to agent %s with timeout %d" % [agent, timeout])
+
         Timeout.timeout(timeout) do
           reqid = sendreq(body, agent, @options[:filter])
 

data/lib/mcollective/data.rb

@@ -44,15 +44,19 @@ module MCollective
 
       raise DDLValidationError, "No dataquery has been defined in the DDL for data plugin #{name}" unless query
 
-      input = query[:input]
-      output = query[:output]
+      input = query.fetch(:input, {})
+      output = query.fetch(:output, {})
 
-      raise DDLValidationError, "No :query input has been defined in the DDL for data plugin #{name}" unless input[:query]
       raise DDLValidationError, "No output has been defined in the DDL for data plugin #{name}" if output.keys.empty?
 
-      return true if argument.nil? && input[:query][:optional]
+      if input[:query]
+        return true if argument.nil? && input[:query][:optional]
 
-      ddl.validate_input_argument(input, :query, argument)
+        ddl.validate_input_argument(input, :query, argument)
+      else
+        raise("No data plugin argument was declared in the %s DDL but an input was supplied" % name) if argument
+        return true
+      end
     end
 
     def self.ddl_has_output?(ddl, output)

data/lib/mcollective/data/result.rb

@@ -19,7 +19,7 @@ module MCollective
       end
 
       def []=(key, val)
-        raise "Can only store String, Integer, Float or Boolean data but got #{val.class} for key #{key}" unless [String, Fixnum, Float, TrueClass, FalseClass].include?(val.class)
+        raise "Can only store String, Integer, Float or Boolean data but got #{val.class} for key #{key}" unless [String, Fixnum, Bignum, Float, TrueClass, FalseClass].include?(val.class)
 
         @data[key.to_sym] = val
       end

data/lib/mcollective/ddl/base.rb

@@ -141,7 +141,7 @@ module MCollective
 
         return true
       rescue => e
-        raise DDLValidationError, "Cannot validate input: %s" % e.to_s
+        raise DDLValidationError, "Cannot validate input %s: %s" % [key, e.to_s]
       end
 
      # Registers an input argument for a given action

data/lib/mcollective/rpc/client.rb

@@ -753,6 +753,7 @@ module MCollective
           end
 
           @stats.aggregate_summary = aggregate.summarize if aggregate
+          @stats.aggregate_failures = aggregate.failed if aggregate
         else
           @stderr.print("\nNo request sent, we did not discover any nodes.")
         end
@@ -833,6 +834,7 @@ module MCollective
           end
 
           @stats.aggregate_summary = aggregate.summarize if aggregate
+          @stats.aggregate_failures = aggregate.failed if aggregate
           @stats.client_stats = @client.stats
         else
           @stderr.print("\nNo request sent, we did not discover any nodes.")

data/lib/mcollective/rpc/stats.rb

@@ -4,7 +4,7 @@ module MCollective
     class Stats
       attr_accessor :noresponsefrom, :starttime, :discoverytime, :blocktime, :responses, :totaltime
       attr_accessor :discovered, :discovered_nodes, :okcount, :failcount, :noresponsefrom, :responsesfrom
-      attr_accessor :requestid, :aggregate_summary, :ddl
+      attr_accessor :requestid, :aggregate_summary, :ddl, :aggregate_failures
 
       def initialize
         reset
@@ -26,6 +26,7 @@ module MCollective
         @noresponsefrom = []
         @requestid = nil
         @aggregate_summary = []
+        @aggregate_failures = []
       end
 
       # returns a hash of our stats
@@ -42,7 +43,8 @@ module MCollective
          :okcount           => @okcount,
          :requestid         => @requestid,
          :failcount         => @failcount,
-         :aggregate_summary => @aggregate_summary}
+         :aggregate_summary => @aggregate_summary,
+         :aggregate_failures => @aggregate_failures}
       end
 
       # Fake hash access to keep things backward compatible
@@ -143,18 +145,40 @@ module MCollective
             display_as = output_item
           end
 
-          aggregate_report = aggregate.to_s
+          if aggregate.is_a?(Aggregate::Result::Base)
+            aggregate_report = aggregate.to_s
+          else
+            next
+          end
 
           result.puts Util.colorize(:bold, "Summary of %s:" % display_as)
           result.puts
           unless aggregate_report == ""
-            result.puts aggregate.to_s
+            result.puts aggregate.to_s.split("\n").map{|x| "   " + x}.join("\n")
           else
             result.puts Util.colorize(:yellow, "     No aggregate summary could be computed")
           end
           result.puts
         end
 
+        @aggregate_failures.each do |failed|
+          case(failed[:type])
+          when :startup
+            message = "exception raised while processing startup hook"
+          when :create
+            message = "unspecified output '#{failed[:name]}' for the action"
+          when :process_result
+            message = "exception raised while processing result data"
+          when :summarize
+            message = "exception raised while summarizing"
+          end
+
+          result.puts Util.colorize(:bold, "Summary of %s:" % failed[:name])
+          result.puts
+          result.puts Util.colorize(:yellow, "     Could not compute summary - %s" % message)
+          result.puts
+        end
+
         result.string
       end
 
@@ -190,7 +214,7 @@ module MCollective
           if @discovered
             @responses < @discovered ? color = :red : color = :green
 
-            if @aggregate_summary.size > 0 && summarize
+            if @aggregate_summary.size + @aggregate_failures.size > 0 && summarize
               result_text << text_for_aggregates
             else
               result_text << ""

data/spec/unit/aggregate/result/collection_result_spec.rb

@@ -9,7 +9,7 @@ module MCollective
         describe "#to_s" do
          it "should return the correctly formatted string" do
            result = CollectionResult.new({:output => [:test], :value => {"foo" => 3, "bar" => 2}}, "%s:%s", :action).to_s
-           result.should == "    foo:3\n    bar:2"
+           result.should == "foo:3\nbar:2"
          end
         end
       end

data/spec/unit/aggregate_spec.rb

@@ -6,30 +6,57 @@ module MCollective
   describe Aggregate do
     let(:ddl) do
       {
-        :aggregate => [{:function => :func, :args=>[:value], :format => "%s"}],
+        :aggregate => [{:function => :func, :args=>[:foo, {:format => "%s"}]}],
         :action => "test_action",
         :output => {:foo => nil, :bar => nil}
       }
     end
 
     describe '#create_functions' do
-      before :each do
-        Aggregate.any_instance.stubs(:contains_output?)
-      end
+      let(:function){mock}
 
       it "should load all the functions with a format if defined" do
-        function = mock
-        function.expects(:new).with(:value, [], "%s", 'test_action')
+        function.expects(:new).with(:foo, {}, "%s", 'test_action')
+        Aggregate.any_instance.expects(:contains_output?).returns(true)
         Aggregate.any_instance.expects(:load_function).once.returns(function)
-        @aggregate = Aggregate.new(ddl)
+        Aggregate.new(ddl)
       end
 
       it "should load all the functions without a format if it isn't defined" do
-        function = mock
-        function.expects(:new).with(:value, [], nil, 'test_action')
+        function.expects(:new).with(:foo, {}, nil, 'test_action')
         Aggregate.any_instance.expects(:load_function).once.returns(function)
-        ddl[:aggregate].first[:format] = nil
-        @aggregate = Aggregate.new(ddl)
+        ddl[:aggregate].first[:args][1][:format] = nil
+        Aggregate.new(ddl)
+      end
+
+      it "should not summarize functions where the output is not specified in the ddl" do
+        invalid_ddl = { :aggregate => [{:function => :func, :args=>[:foo], :format => "%s"}, {:function => :func, :args=>[:fail], :format => "%s"}],
+                        :action => "test_action",
+                        :output => {:foo => nil, :bar => nil}}
+
+        function.stubs(:new).returns("function")
+        Aggregate.any_instance.stubs(:load_function).returns(function)
+
+        Log.expects(:error)
+        aggregate = Aggregate.new(invalid_ddl)
+        aggregate.functions.should == ["function"]
+        aggregate.failed.should == [{:type=>:create, :name=>:fail}]
+      end
+
+      it "should pass additional arguments if specified in the ddl" do
+        function.expects(:new).with(:foo, {:extra => "extra"}, "%s", 'test_action')
+        Aggregate.any_instance.expects(:load_function).once.returns(function)
+        ddl[:aggregate].first[:args][1][:extra] = "extra"
+        Aggregate.new(ddl)
+      end
+
+      it "should not summarize functions if the startup hook raises an exception" do
+        function.stubs(:new).raises("rspec")
+        Aggregate.any_instance.expects(:load_function).returns(function)
+
+        Log.expects(:error)
+        aggregate = Aggregate.new(ddl)
+        aggregate.failed.should == [{:type=>:startup, :name =>:foo }]
       end
     end
 
@@ -39,31 +66,51 @@ module MCollective
         @aggregate = Aggregate.new(ddl)
       end
 
-      it "should raise an exception if the ddl output does not include the function's input" do
-        expect{
-          @aggregate.contains_output?(:baz)
-        }.to raise_error("'test_action' action does not contain output 'baz'")
+      it "should return false if the ddl output does not include the function's input" do
+        result = @aggregate.contains_output?(:baz)
+        result.should == false
       end
 
-      it "should not raise an exception if the ddl output includes the function's input" do
-        @aggregate.contains_output?(:foo)
+      it "should return true if the ddl output includes the function's input" do
+        result = @aggregate.contains_output?(:foo)
+        result.should == true
       end
     end
 
     describe '#call_functions' do
-      it "should call all of the functions" do
-        Aggregate.any_instance.stubs(:create_functions)
-        aggregate = Aggregate.new(ddl)
+      let(:aggregate){ Aggregate.new(ddl)}
+      let(:result){ RPC::Result.new("rspec", "rspec", :sender => "rspec", :statuscode => 0, :statusmsg => "rspec", :data => {:test => :result})}
+      let(:function) {mock}
 
-        result = RPC::Result.new("rspec", "rspec", :sender => "rspec", :statuscode => 0, :statusmsg => "rspec", :data => {:test => :result})
+      before :each do
+        Aggregate.any_instance.stubs(:create_functions)
+      end
 
-        function = mock
+      it "should call all of the functions" do
         function.expects(:process_result).with(:result, result).once
         function.expects(:output_name).returns(:test)
+        aggregate.functions = [function]
 
+        aggregate.call_functions(result)
+      end
+
+      it "should not fail if 'process_result' method raises an exception" do
         aggregate.functions = [function]
+        function.stubs(:output_name).returns(:test)
+        function.stubs(:process_result).raises("Failed")
 
+        Log.expects(:error)
         aggregate.call_functions(result)
+        aggregate.failed.should == [:name => :test, :type => :process_result]
+      end
+
+      it "should not fail if 'summarize' method raises en exception" do
+        function.stubs(:summarize).raises("Failed")
+        function.stubs(:output_name).returns("rspec")
+        aggregate.functions = [function]
+
+        Log.expects(:error)
+        result = aggregate.summarize
       end
     end
 
@@ -85,6 +132,19 @@ module MCollective
         result = aggregate.summarize
         result.should == [func2, func1]
       end
+
+      it "should not summarise data that raises an exception" do
+        Aggregate.any_instance.stubs(:create_functions)
+        aggregate = Aggregate.new(ddl)
+        func = mock
+        func.stubs(:summarize).raises("rspec")
+        func.stubs(:output_name).returns("rspec")
+        aggregate.functions = [func]
+        Log.expects(:error)
+
+        aggregate.summarize
+        aggregate.failed.should == [{:name => "rspec", :type => :summarize}]
+      end
     end
 
     describe '#load_function' do

data/spec/unit/client_spec.rb

@@ -58,7 +58,7 @@ module MCollective
         @client.expects(:sendreq).returns("823a3419a0975c3facbde121f72ab61f")
         @client.expects(:receive).returns(reply)
 
-        @discoverer.stubs(:discovery_timeout).returns(0)
+        @discoverer.expects(:discovery_timeout).with(message.options[:timeout], message.options[:filter]).returns(0)
 
         Time.stubs(:now).returns(Time.at(1340621250), Time.at(1340621251))
 

data/spec/unit/data/result_spec.rb

@@ -23,6 +23,10 @@ module MCollective
           @result["rspec"] = "rspec value"
           @result.instance_variable_get("@data").should == {:rspec => "rspec value"}
         end
+
+        it "should only allow valid data types" do
+          expect { @result["rspec"] = Time.now }.to raise_error(/Can only store .+ data but got Time for key rspec/)
+        end
       end
 
       describe "#include" do

data/spec/unit/data_spec.rb

@@ -132,9 +132,14 @@ module MCollective
         expect { Data.ddl_validate(@ddl, "rspec") }.to raise_error("No dataquery has been defined in the DDL for data plugin rspec test")
       end
 
-      it "should ensure the ddl has an input" do
-        @ddl.expects(:entities).returns({:data => {:input => {}, :output => {}}})
-        expect { Data.ddl_validate(@ddl, "rspec") }.to raise_error("No :query input has been defined in the DDL for data plugin rspec test")
+      it "should allow ddls without any input defined" do
+        @ddl.expects(:entities).returns({:data => {:input => {}, :output => {:x => {}}}})
+        Data.ddl_validate(@ddl, nil)
+      end
+
+      it "should not allow input arguments when no query were defined" do
+        @ddl.expects(:entities).returns({:data => {:input => {}, :output => {:x => {}}}})
+        expect { Data.ddl_validate(@ddl, "rspec") }.to raise_error("No data plugin argument was declared in the rspec test DDL but an input was supplied")
       end
 
       it "should ensure the ddl has output" do

data/spec/unit/ddl/base_spec.rb

@@ -65,7 +65,7 @@ module MCollective
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:string][:input], :string, 1)
-          }.to raise_error("Cannot validate input: value should be a string")
+          }.to raise_error("Cannot validate input string: value should be a string")
 
           @ddl.validate_input_argument(@ddl.entities[:string][:input], :string, "1")
         end
@@ -79,7 +79,7 @@ module MCollective
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:string][:input], :string, "too long")
-          }.to raise_error("Cannot validate input: Input string is longer than 1 character(s)")
+          }.to raise_error("Cannot validate input string: Input string is longer than 1 character(s)")
 
           @ddl.validate_input_argument(@ddl.entities[:string][:input], :string, "1")
         end
@@ -93,7 +93,7 @@ module MCollective
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:string][:input], :string, "doesnt validate")
-          }.to raise_error("Cannot validate input: value should match ^regex$")
+          }.to raise_error("Cannot validate input string: value should match ^regex$")
 
           @ddl.validate_input_argument(@ddl.entities[:string][:input], :string, "regex")
         end
@@ -106,7 +106,7 @@ module MCollective
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:list][:input], :list, 3)
-          }.to raise_error("Cannot validate input: value should be one of 1, 2")
+          }.to raise_error("Cannot validate input list: value should be one of 1, 2")
 
           @ddl.validate_input_argument(@ddl.entities[:list][:input], :list, 1)
         end
@@ -119,7 +119,7 @@ module MCollective
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:bool][:input], :bool, 3)
-          }.to raise_error("Cannot validate input: value should be a boolean")
+          }.to raise_error("Cannot validate input bool: value should be a boolean")
 
           @ddl.validate_input_argument(@ddl.entities[:bool][:input], :bool, true)
           @ddl.validate_input_argument(@ddl.entities[:bool][:input], :bool, false)
@@ -133,11 +133,11 @@ module MCollective
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:test][:input], :int, "1")
-          }.to raise_error("Cannot validate input: value should be a integer")
+          }.to raise_error("Cannot validate input int: value should be a integer")
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:test][:input], :int, 1.1)
-          }.to raise_error("Cannot validate input: value should be a integer")
+          }.to raise_error("Cannot validate input int: value should be a integer")
 
           @ddl.validate_input_argument(@ddl.entities[:test][:input], :int, 1)
         end
@@ -150,11 +150,11 @@ module MCollective
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:test][:input], :float, "1")
-          }.to raise_error("Cannot validate input: value should be a float")
+          }.to raise_error("Cannot validate input float: value should be a float")
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:test][:input], :float, 1)
-          }.to raise_error("Cannot validate input: value should be a float")
+          }.to raise_error("Cannot validate input float: value should be a float")
 
           @ddl.validate_input_argument(@ddl.entities[:test][:input], :float, 1.1)
         end
@@ -167,7 +167,7 @@ module MCollective
 
           expect {
             @ddl.validate_input_argument(@ddl.entities[:test][:input], :number, "1")
-          }.to raise_error("Cannot validate input: value should be a number")
+          }.to raise_error("Cannot validate input number: value should be a number")
 
           @ddl.validate_input_argument(@ddl.entities[:test][:input], :number, 1)
           @ddl.validate_input_argument(@ddl.entities[:test][:input], :number, 1.1)

data/spec/unit/plugins/mcollective/aggregate/summary_spec.rb

@@ -39,6 +39,16 @@ module MCollective
           sum.result[:value] = {"shrt" => 1, "long key" => 1}
           sum.summarize.aggregate_format.should == "%8s = %s"
         end
+
+        it "should calculate an attractive format when result type is not a string" do
+          sum1 = Summary.new(:test, [], nil, :test_action)
+          sum1.result[:value] = {true => 4, false => 5}
+          sum1.summarize.aggregate_format.should == "%5s = %s"
+
+          sum2 = Summary.new(:test, [], nil, :test_action)
+          sum2.result[:value] = {1 => 1, 10 => 2}
+          sum2.summarize.aggregate_format.should == "%2s = %s"
+        end
       end
     end
   end

data/spec/unit/rpc/stats_spec.rb

@@ -17,6 +17,7 @@ module MCollective
                      :starttime => 1300031826.0,
                      :requestid => nil,
                      :aggregate_summary => [],
+                     :aggregate_failures => [],
                      :discovered_nodes => []}
 
         @stats = Stats.new
@@ -283,6 +284,41 @@ module MCollective
           @stats.no_response_report.should match(Regexp.new(/No response from.+bar\s+foo/m))
         end
       end
+
+      describe "#text_for_aggregates" do
+        let(:aggregate){mock()}
+
+        before :each do
+          aggregate.stubs(:result).returns({:output => "success"})
+          aggregate.stubs(:action).returns("action")
+        end
+
+        it "should create the correct output text for aggregate functions" do
+          @stats.aggregate_summary = [aggregate]
+          aggregate.stubs(:is_a?).returns(true)
+          @stats.text_for_aggregates.should =~ /Summary of.*/
+        end
+
+        it "should display an error message for a failed statup hook" do
+          @stats.aggregate_failures = [{:name => "rspec", :type => :startup}]
+          @stats.text_for_aggregates.should =~  /exception raised while processing startup hook/
+        end
+
+        it "should display an error message for an unspecified output" do
+          @stats.aggregate_failures = [{:name => "rspec", :type => :create}]
+          @stats.text_for_aggregates.should =~  /unspecified output 'rspec' for the action/
+        end
+
+        it "should display an error message for a failed process_result" do
+          @stats.aggregate_failures = [{:name => "rspec", :type => :process_result}]
+          @stats.text_for_aggregates.should =~  /exception raised while processing result data/
+        end
+
+        it "should display an error message for a failed summarize" do
+          @stats.aggregate_failures = [{:name => "rspec", :type => :summarize}]
+          @stats.text_for_aggregates.should =~  /exception raised while summarizing/
+        end
+      end
     end
   end
 end

data/spec/unit/validator_spec.rb

@@ -41,7 +41,7 @@ module MCollective
 
       it "should call super if a validator method is called and the plugin does not exist" do
         expect{
-          Validator.test(1,2,3)
+          Validator.rspec(1,2,3)
         }.to raise_error(ValidatorError)
       end
     end

metadata

@@ -1,384 +1,373 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mcollective-client
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 2.2.1
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 0
-  version: 2.2.0
 platform: ruby
-authors: 
+authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: systemu
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: stomp
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: stomp
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client libraries for the mcollective Application Server
 email: rip@puppetlabs.com
-executables: 
+executables:
 - mco
 extensions: []
-
 extra_rdoc_files: []
-
-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/agent.rb
+- lib/mcollective/agents.rb
 - lib/mcollective/aggregate/base.rb
-- lib/mcollective/aggregate/result/numeric_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.rb
-- lib/mcollective/agent.rb
-- lib/mcollective/facts/base.rb
+- lib/mcollective/aggregate.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/base.rb
+- lib/mcollective/connector.rb
+- lib/mcollective/data/base.rb
+- lib/mcollective/data/result.rb
+- lib/mcollective/data.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/ddl.rb
+- lib/mcollective/discovery.rb
+- lib/mcollective/facts/base.rb
+- lib/mcollective/facts.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/generators.rb
+- lib/mcollective/log.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/logger.rb
+- lib/mcollective/matcher/parser.rb
+- lib/mcollective/matcher/scanner.rb
+- lib/mcollective/matcher.rb
+- lib/mcollective/message.rb
+- lib/mcollective/monkey_patches.rb
+- lib/mcollective/optionparser.rb
+- lib/mcollective/pluginmanager.rb
+- lib/mcollective/pluginpackager/agent_definition.rb
+- lib/mcollective/pluginpackager/standard_definition.rb
+- lib/mcollective/pluginpackager.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/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/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/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/runnerstats.rb
+- lib/mcollective/security/base.rb
 - lib/mcollective/security.rb
+- lib/mcollective/shell.rb
+- lib/mcollective/ssl.rb
+- lib/mcollective/unix_daemon.rb
 - lib/mcollective/util.rb
+- lib/mcollective/validator.rb
+- lib/mcollective/vendor/require_vendored.rb
+- lib/mcollective/vendor.rb
+- lib/mcollective/windows_daemon.rb
 - lib/mcollective.rb
-- spec/spec.opts
-- spec/fixtures/test-public.pem
 - 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/Rakefile
+- 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/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/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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client libraries for The Marionette Collective
-test_files: 
-- spec/spec.opts
-- spec/fixtures/test-public.pem
+test_files:
 - 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/Rakefile
+- 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/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/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