mcollective-client 2.10.0 → 2.10.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWEwMDY2OTlmMTkwOWM4NGRjODVmYzQzMTk1ZGJmN2M4MDA0MTdlZg==
+    MTk1NWFkMGY2NTY0ODA4MTQ2ZDg2YTA1YjA4N2M5YTcwODJlZTUzZQ==
   data.tar.gz: !binary |-
-    MjAyNjQ5NDQxZTE1MmM1NzEwODcwMDU1MTQzNGVlNmNhYjdkZDcyMw==
+    ZmJhNGZlZmQxZDA1ZjI5ZTg3Y2Q2MDJiMDljNzRmZTEzNjNhOTE2NQ==
 SHA512:
   metadata.gz: !binary |-
-    NjNjZWZiZjIzMTk5ODE1ZTNkZDVmYThhMGNmNzFhNzY4ZGViMGJiNWU0OGU3
-    MDcyMTlhNjEyZDI3ZGZiMjE4YzVjNzk2OTVkOGY2ZDdlZjg5MTFjNTcwOWUx
-    N2YzZDU4YTg1MThhZWEwZTVhYjQ4NTk1ZDNlZWU2ZTc0ODRhOWQ=
+    NDdlMjdkN2U2NDZhNzU5ZDgyYzczMzE1NTg3NTUyNGU0NWEyZWVjMGQ4Y2Y2
+    MzhiNjcwYTFiNjVkM2JmMTZhMDUzNGRkMzMwOGIyNTBiYjcwMTA0MzhjOWYz
+    NjhjMjliNTVkZmRiNTI0NzlhNmZiZDBhNWNkODlkODJkNDgyODI=
   data.tar.gz: !binary |-
-    Mjc1NjBiNjJjNWMyYjljNDE0OWFiZmE3OWYwOGNmODEzZmE2ZmIxNWJhNDdk
-    NzA0MmQ5ZmI3Y2JjYmI5ODIwMGE4NzcwMjNmZTdkOWJhYmRkOGJjZWVjN2Vk
-    Njg2YzZiNGI2NThjYWQ2MjA4ZTA3NDUyNDA0M2FhOTgxYmI3MGE=
+    NDJkMmNkYjM2M2YwODAyNmIzYjcxODRkNDc2YmZjZjZkYmM4YTA4MWQ2NDM1
+    OTVjYmNhYzk3MmU5YjU4MDRiNzUxZWNkZTBlZWRmNWZlOWNkODI3MDc2ZTY3
+    YTYwNDNlMzc2YmVhN2NiMzc5NjZkNzgwYmRhNjAyMTNhMjk4ZWY=

data/lib/mcollective.rb

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

data/lib/mcollective/client.rb

@@ -284,6 +284,7 @@ module MCollective
       stat[:blocktime] = stat[:totaltime] - stat[:discoverytime]
       stat[:responses] = hosts_responded
       stat[:noresponsefrom] = []
+      stat[:unexpectedresponsefrom] = []
       stat[:requestid] = requestid
 
       @stats = stat
@@ -329,6 +330,17 @@ module MCollective
 
         puts
       end
+
+      if stats[:unexpectedresponsefrom].size > 0
+        puts("\nUnexpected response from:\n")
+
+        stats[:unexpectedresponsefrom].each do |c|
+          puts if c % 4 == 1
+          printf("%30s", c)
+        end
+
+        puts
+      end
     end
   end
 end

data/spec/unit/mcollective/client_spec.rb

@@ -422,7 +422,8 @@ module MCollective
           :totaltime     => 10.0,
           :responses     => 5,
           :requestid     => "erfs123",
-          :noresponsefrom  => [] }
+          :noresponsefrom  => [],
+          :unexpectedresponsefrom => [] }
       end
 
       it "should update stats and return the stats hash" do

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

@@ -774,6 +774,7 @@ module MCollective
           msg.expects(:create_reqid).returns("823a3419a0975c3facbde121f72ab61f")
           msg.expects(:requestid=).with("823a3419a0975c3facbde121f72ab61f").times(10)
 
+          # These stat keys must match the values returned by a generic Client, or `--batch` will break.
           stats = {:noresponsefrom => [], :unexpectedresponsefrom => [], :responses => 0, :blocktime => 0, :totaltime => 0, :discoverytime => 0, :requestid => "823a3419a0975c3facbde121f72ab61f"}
 
           Message.expects(:new).with('req', nil, {:type => :direct_request, :agent => 'foo', :filter => nil, :options => {}, :collective => 'mcollective'}).returns(msg).times(10)
@@ -802,6 +803,7 @@ module MCollective
           msg.expects(:create_reqid).returns("823a3419a0975c3facbde121f72ab61f")
           msg.expects(:requestid=).with("823a3419a0975c3facbde121f72ab61f").times(10)
 
+          # These stat keys must match the values returned by a generic Client, or `--batch` will break.
           stats = {:noresponsefrom => [], :unexpectedresponsefrom => [], :responses => 0, :blocktime => 0, :totaltime => 0, :discoverytime => 0, :requestid => "823a3419a0975c3facbde121f72ab61f"}
 
           Progress.expects(:new).never

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mcollective-client
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu