opswalrus 1.0.61 → 1.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f769d32a2757cb6bc9e23d27e4baa456b6df7b4b5509babc4b9aecc47309d60
-  data.tar.gz: 2141371e0a1085ac11ff99d9e4f9ba834d30819b5c2985fc6cb0df8773537ae6
+  metadata.gz: 23ccee9336c9eeffa5c8bf4fd9c4f26353eb49fada6d7643ad236b81f5ad4061
+  data.tar.gz: b43f9ee85f5557c60506d74a9a21d7d31d21762a47449bed8fa6a145cc05f8eb
 SHA512:
-  metadata.gz: 3294b14a48c18633e61e201ff181e9c4bbf827d6ab54d59e9ca464d23b200dfb84fa42b33e3fd67ccae41497e48f9a5cdca7b48cf06c4d52b0f723edf9dac925
-  data.tar.gz: 232e0c5fb989cbc38d7e0a2c22c1efb69c6de58025326a58f59a140e5cc8400bbad77e069262c296508349992b341319d684c0d0b6b8585991896383f596b33c
+  metadata.gz: 2f172ded5af3368a410705b17ea624da8ab0f994d84a2441a403066af0a4b56010345bee5437b9eac8d2cc883644d4febc479d666a4a5b4309efe6ce841d22f9
+  data.tar.gz: 4022b1f2bf0aadbd83067798639f6ac593228f9d54cc3f79e0df3dee5172069a59ce72421f569a140ee31b1f382724435482c7860bcf8eb02d783150ab37e78e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.61)
+    opswalrus (1.0.62)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/host.rb

@@ -273,7 +273,7 @@ module OpsWalrus
       return unless cmd && !cmd.strip.empty?
 
       t1 = Time.now
-      out, err, exit_status = if App.instance.dry_run?
+      output, stderr, exit_status = if App.instance.dry_run?
         ["", "", 0]
       else
         sshkit_cmd = execute_cmd(cmd, input_mapping: input, ops_prompt_for_sudo_password: ops_prompt_for_sudo_password)
@@ -282,17 +282,19 @@ module OpsWalrus
       t2 = Time.now
       seconds = t2 - t1
 
+      stdout, remote_ops_script_retval = parse_stdout_and_script_return_value(output)
+
       output_block = StringIO.open do |io|
         if App.instance.info?   # this is true if log_level is trace, debug, info
           if App.instance.trace?
-            io.puts Style.cyan(out)
-            io.puts Style.red(err)
+            io.puts Style.cyan(stdout)
+            io.puts Style.red(stderr)
           elsif App.instance.debug?
-            io.puts Style.cyan(out)
-            io.puts Style.red(err)
+            io.puts Style.cyan(stdout)
+            io.puts Style.red(stderr)
           elsif App.instance.info?
-            io.puts Style.cyan(out)
-            io.puts Style.red(err)
+            io.puts Style.cyan(stdout)
+            io.puts Style.red(stderr)
           end
           io.print Style.yellow(cmd_id)
           io.print Style.blue(" | Finished in #{seconds} seconds with exit status ")
@@ -315,7 +317,23 @@ module OpsWalrus
       end
       puts output_block unless output_block.empty?
 
-      [out, err, exit_status]
+      out = remote_ops_script_retval || stdout
+      [out, stderr, exit_status]
+    end
+
+    def parse_stdout_and_script_return_value(command_output)
+      output_sections = command_output.split(/^#{::OpsWalrus::App::SCRIPT_RESULT_HEADER}$/)
+      case output_sections.count
+      when 1
+        stdout, ops_script_retval = output_sections.first, nil
+      when 2
+        stdout, ops_script_retval = *output_sections
+      else
+        # this is unexpected
+        ops_script_retval = output_sections.pop
+        stdout = output_sections.join(::OpsWalrus::App::SCRIPT_RESULT_HEADER)
+      end
+      [stdout, ops_script_retval]
     end
 
     # runs the specified ops command with the specified command arguments

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.61"
+  VERSION = "1.0.62"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.61
+  version: 1.0.62
 platform: ruby
 authors:
 - David Ellis