choria-mcorpc-support 2.25.3 → 2.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea0c40e0fddf65e2507b695f3bfe70a21252ebc43747f03e549d2741c4eda04
-  data.tar.gz: 0305377ba6a38d5a213cc46ac7e5b09dc82829d6e32cab8e77f7f7da75225bb4
+  metadata.gz: d38a022de3a9f8e30351c3281d34011f84d792d09f13955b705ff2ff5502140b
+  data.tar.gz: a3a5ce9b97f9b479b7530b7af1645a20049a15d4dbc2f6159539c6731c441eee
 SHA512:
-  metadata.gz: 974f141cd420b640f96fa3aeac2c6fc4148ddb31dfd226f2f9c02c9f0ba3aa97f2094cac9dd1e87bf40eb169c9d3d4114e570f3485eac0a58f2faa54eb84b060
-  data.tar.gz: 073e8a67eaa6b53d8650128c550327b6b34b7003f74b7958d959515ab7ce6511f8870d5463d72b1474ffc80ece4ccb449d23b0f34da7ada182ac01ba5cb4d2fc
+  metadata.gz: 95d4ad08da80cccbb2f4904764bb4285ada306dc023cc922543cafe89aaf66eabf04ddda44e1b1290b9a212bb66a44430009e8d48c135382a7c830b9d89a3f7a
+  data.tar.gz: 99a3586fc1327ae2597a642c9105c3418622fc0c058977ec0b95ea6dbbbd75af215fb1fee66e023c97b61d72d7207c23a87cc41d6680aa5ef2c1520eb8a910e6

data/lib/mcollective/application/tasks.rb

@@ -213,7 +213,9 @@ Examples:
             Util.colorize(:bold, bolt_tasks.ddl.meta[:timeout])
           ])
 
-          request_and_report(:run_and_wait, request)
+          success = request_and_report(:run_and_wait, request)
+
+          exit(success ? 0 : 1)
         end
       ensure
         reset_client!
@@ -273,11 +275,15 @@ Examples:
         else
           say("Requesting task status for request %s, showing failures only pass --verbose for all output" % Util.colorize(:bold, taskid)) unless options[:verbose]
 
-          request_and_report(:task_status, {:task_id => taskid}, taskid)
+          success = request_and_report(:task_status, {:task_id => taskid}, taskid)
+
+          exit(success ? 0 : 1)
         end
       end
 
       def request_and_report(action, arguments, taskid=nil) # rubocop:disable Metrics/MethodLength
+        res = true
+
         task_not_known_nodes = 0
         wrapper_failure = 0
         completed_nodes = 0
@@ -302,16 +308,24 @@ Examples:
           status = reply[:data]
 
           if reply[:statuscode] == 3
+            res = false
             fail_nodes += 1
             task_not_known_nodes += 1
           elsif [-1, 0].include?(status[:exitcode])
             status[:completed] ? completed_nodes += 1 : running_nodes += 1
             runtime += status[:runtime]
-            reply[:statuscode] == 0 ? success_nodes += 1 : fail_nodes += 1
+            if reply[:statuscode] == 0
+              success_nodes += 1
+            else
+              res = false
+              fail_nodes += 1
+            end
           elsif reply[:statuscode] == 5
+            res = false
             wrapper_failure += 1
             fail_nodes += 1
           else
+            res = false
             fail_nodes += 1
           end
 
@@ -351,6 +365,8 @@ Examples:
           runtime,
           bolt_tasks.stats
         )
+
+        res
       ensure
         reset_client!
       end

data/lib/mcollective/util/bolt_support/task_result.rb

@@ -81,6 +81,13 @@ module MCollective
           @result["value"]
         end
 
+        # Access the value returned by a Bolt task
+        #
+        # @return [Object] The value returned by the bolt task
+        def bolt_task_result
+          @bolt_task_result ||= JSON.parse(@result["value"]["data"]["stdout"])
+        end
+
         def to_s
           if Object.const_defined?(:Puppet)
             Puppet::Pops::Types::StringConverter.convert(self, "%p")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: choria-mcorpc-support
 version: !ruby/object:Gem::Version
-  version: 2.25.3
+  version: 2.26.1
 platform: ruby
 authors:
 - R.I.Pienaar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-15 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Support libraries the Choria Server