opswalrus 1.0.87 → 1.0.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e024a2720e67646c573e1f6aeb395ab77aab434fb21d9f89dfcb294fe6e9c2cf
-  data.tar.gz: e4582d19d926b4d2c1f4f70464894261a76c778224323e533759ad473803f18c
+  metadata.gz: ea3eb2c025307f4caf46517d31cc699e129f11a1f5af9ab031a17813f54478cb
+  data.tar.gz: 22d758a1ac797784030ef99dea7f16cb042060d90a20d826b3d999a0276030fa
 SHA512:
-  metadata.gz: 4a17dae780d16aee9604bf2e82a37443a6a880eea65d70fd498df81669017b3e891228ef589749ef68d740ecd78e41db0e9065e196e172074cc8883f60f7da4e
-  data.tar.gz: 320ba2dc98f63ce60bb75518e368e7cbe4c1cff66dd783493524bea7750d50ac8f9dc7f1868d899af2b51c1b1908091c8e4de843624af7207c79e54276be15ec
+  metadata.gz: 335f860e454819af1e4741a06d936a8b2e8b1ab66faf3504b1b064801b3ecd267a1f8034d56ed2a5188b2a560174fcf266c30c510ed5dee20000fa4b230ee337
+  data.tar.gz: 82d39a23be2b270400b7f5207570d73d7b8952c1305e214ce38dd5dec3f2084817a96cced59d0d017cdd0334f8748b9c06a0dd359098725238779f4038cafd5a

data/Gemfile.lock

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

data/lib/opswalrus/app.rb

@@ -316,10 +316,19 @@ module OpsWalrus
         SemanticLogger.flush
         output = StringIO.open do |io|
           io.puts SCRIPT_RESULT_HEADER
-          io.puts JSON.pretty_generate(result.value)
+          obj = case result
+          when Invocation::Success
+            result.value
+          when Invocation::Error
+            {
+              error_type: result.value.class,
+              error: result.value,
+            }
+          end
+          io.puts JSON.pretty_generate(obj)
           io.string
         end
-        puts "print_script_result - #{Time.now}"
+        # puts "print_script_result - #{Time.now.strftime('%s%L')}"
         puts output
       end
     end

data/lib/opswalrus/host.rb

@@ -578,6 +578,7 @@ module OpsWalrus
       end
     end
 
+    # Returns a SSHKit::Command
     def execute_cmd(*args, input_mapping: nil, ops_prompt_for_sudo_password: false)
       # we only want one of the sudo password interaction handlers:
       # if we're running an ops script on the remote host and we've passed the --pass flag in our invocation of the ops command on the remote host,

data/lib/opswalrus/operation_runner.rb

@@ -87,14 +87,15 @@ module OpsWalrus
         end
       rescue SSHKit::Command::Failed => e
         App.instance.error "[!] Command failed: #{e.message}"
+        Invocation::Error.new(e)
       rescue Error => e
-        puts "OperationRunner#run - #{Time.now}"
+        # puts "OperationRunner#run - #{Time.now.strftime('%s%L')}"
         App.instance.error "Error: Ops script crashed."
         App.instance.error e.message
         App.instance.error e.backtrace.take(10).join("\n")
         Invocation::Error.new(e)
       rescue => e
-        puts "OperationRunner#run - #{Time.now}"
+        # puts "OperationRunner#run - #{Time.now.strftime('%s%L')}"
         App.instance.error "Unhandled Error: Ops script crashed."
         App.instance.error e.class
         App.instance.error e.message

data/lib/opswalrus/sshkit_ext.rb

@@ -14,11 +14,13 @@ module SSHKit
 
   module Backend
     class Abstract
+      # Returns a SSHKit::Command
       # def execute(*args)
       #   options = { verbosity: :debug, raise_on_non_zero_exit: false }.merge(args.extract_options!)
       #   create_command_and_execute(args, options).success?
       # end
 
+      # Returns a SSHKit::Command
       def execute_cmd(*args)
         options = { verbosity: :info, strip: true, raise_on_non_zero_exit: false }.merge(args.extract_options!)
         create_command_and_execute(args, options)

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.87"
+  VERSION = "1.0.89"
 end

metadata

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