opswalrus 1.0.88 → 1.0.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 703da1a1b022f991a69ecfa188f4496d74c82e96a27887f551b139d585791998
-  data.tar.gz: 1fa08b197ea37718895f13aca963ef57103cf82f8c750a2ff0827bc9252db3bd
+  metadata.gz: ea3eb2c025307f4caf46517d31cc699e129f11a1f5af9ab031a17813f54478cb
+  data.tar.gz: 22d758a1ac797784030ef99dea7f16cb042060d90a20d826b3d999a0276030fa
 SHA512:
-  metadata.gz: 637781b6f336c4a7535887e7a81ffbd015f60d91c21a21256129b3b7868b0de9ede0e7d716508ec5c73cad08aa63fc247485e454d2cf05f56ebf9c98992f4a9f
-  data.tar.gz: 0102ea0a4902ae0841f2e119981a7fec5994208383824b07d36b0bd9089fd4c3ba844aebec46950b239d2bd10acb536d74ea7ce76fa03b56128e923062f91020
+  metadata.gz: 335f860e454819af1e4741a06d936a8b2e8b1ab66faf3504b1b064801b3ecd267a1f8034d56ed2a5188b2a560174fcf266c30c510ed5dee20000fa4b230ee337
+  data.tar.gz: 82d39a23be2b270400b7f5207570d73d7b8952c1305e214ce38dd5dec3f2084817a96cced59d0d017cdd0334f8748b9c06a0dd359098725238779f4038cafd5a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.88)
+    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.strftime('%s%L')}"
+        # 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.strftime('%s%L')}"
+        # 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.strftime('%s%L')}"
+        # 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.88"
+  VERSION = "1.0.89"
 end

metadata

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