opswalrus 1.0.62 → 1.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ccee9336c9eeffa5c8bf4fd9c4f26353eb49fada6d7643ad236b81f5ad4061
-  data.tar.gz: b43f9ee85f5557c60506d74a9a21d7d31d21762a47449bed8fa6a145cc05f8eb
+  metadata.gz: d6e2b6b9ba0610010ba57293457a77331d9c9a93f7b692d47876df0646c5d68f
+  data.tar.gz: 10bcd65544195a67259995a95485bf55cc851710665810365d823bfa6ea473c5
 SHA512:
-  metadata.gz: 2f172ded5af3368a410705b17ea624da8ab0f994d84a2441a403066af0a4b56010345bee5437b9eac8d2cc883644d4febc479d666a4a5b4309efe6ce841d22f9
-  data.tar.gz: 4022b1f2bf0aadbd83067798639f6ac593228f9d54cc3f79e0df3dee5172069a59ce72421f569a140ee31b1f382724435482c7860bcf8eb02d783150ab37e78e
+  metadata.gz: 9e8856211f18735ad966a78d6078a361071a5e352e4184ffba04d9cfc05944040f2a2a059760d013c285dccc37ef9735fe6951cf6d175795076c1a60f6205da1
+  data.tar.gz: d011ec4eb7311e1a76c625e3156c36652cf23abfee071d5fb1b3dffffde7e8c92ec0d1442e229d804375390c99eaafe442e12f170b69161d75bddb0b272468a5

data/Gemfile.lock

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

data/lib/opswalrus/_run_remote.ops

@@ -6,6 +6,5 @@ ssh in: :sequence do
 # ssh_noprep do
   # puts params.stringify_keys!
   # desc "Running `#{params.ops_file.ops_file_path} #{params.operation_kv_args.join(' ')}` on #{to_s} (alias=#{self.alias})"
-  # run_ops(ops_command, ops_command_options = nil, command_arguments, in_bundle_root_dir: true, ops_prompt_for_sudo_password: false)
   _invoke_remote(params.ops_file, *params.operation_kv_args)
 end

data/lib/opswalrus/host.rb

@@ -322,21 +322,25 @@ module OpsWalrus
     end
 
     def parse_stdout_and_script_return_value(command_output)
-      output_sections = command_output.split(/^#{::OpsWalrus::App::SCRIPT_RESULT_HEADER}$/)
+      output_sections = command_output.split(/#{::OpsWalrus::App::SCRIPT_RESULT_HEADER}/)
       case output_sections.count
       when 1
         stdout, ops_script_retval = output_sections.first, nil
+        # puts "found it1!: #{output_sections.inspect}"
       when 2
         stdout, ops_script_retval = *output_sections
+        # puts "found it2!: #{ops_script_retval}"
       else
         # this is unexpected
         ops_script_retval = output_sections.pop
         stdout = output_sections.join(::OpsWalrus::App::SCRIPT_RESULT_HEADER)
+        # puts "found it3!: #{ops_script_retval}"
       end
       [stdout, ops_script_retval]
     end
 
     # runs the specified ops command with the specified command arguments
+    # returns [stdout, stderr, exit_status]
     def run_ops(ops_command, ops_command_options = nil, command_arguments, in_bundle_root_dir: true, ops_prompt_for_sudo_password: false)
       local_hostname_for_remote_host = if self.alias
         "#{host} (#{self.alias})"

data/lib/opswalrus/invocation.rb

@@ -125,13 +125,16 @@ module OpsWalrus
         ops_command_options = "--script"
         ops_command_options << " --pass" if @ops_prompt_for_sudo_password
         ops_command_options << " --params #{remote_json_kwargs_tempfile_basename}" if remote_json_kwargs_tempfile_basename
-        retval = if ops_command_options.empty?
+
+        output, stderr, exit_status = if ops_command_options.empty?
           @host_proxy.run_ops(:run, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
         else
           @host_proxy.run_ops(:run, ops_command_options, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
         end
 
-        retval
+        App.instance.debug("Remote invocation failed:\n  cmd: ops run #{ops_command_options.to_s} #{remote_run_command_args.to_s}\n  stdout: #{output}\n") unless exit_status == 0
+
+        JSON.parse(output)
       ensure
         if json_kwargs_tempfile
           json_kwargs_tempfile.close rescue nil
@@ -235,13 +238,16 @@ module OpsWalrus
         ops_command_options = "--script"
         ops_command_options << " --pass" if @ops_prompt_for_sudo_password
         ops_command_options << " --params #{remote_json_kwargs_tempfile_basename}" if remote_json_kwargs_tempfile_basename
-        retval = if ops_command_options.empty?
+
+        output, stderr, exit_status = if ops_command_options.empty?
           @host_proxy.run_ops(:run, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
         else
           @host_proxy.run_ops(:run, ops_command_options, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
         end
 
-        retval
+        App.instance.debug("Remote invocation failed:\n  cmd: ops run #{ops_command_options.to_s} #{remote_run_command_args.to_s}\n  stdout: #{output}\n") unless exit_status == 0
+
+        JSON.parse(output)
       ensure
         if json_kwargs_tempfile
           json_kwargs_tempfile.close rescue nil

data/lib/opswalrus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.62
+  version: 1.0.63
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport