opswalrus 1.0.45 → 1.0.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0f69f8661c6d29f48d0ad70f4046b6d53a3dbe167958668e09005b2086f175
-  data.tar.gz: 5159cfc4bb7cb0ed366b9f3197d3926c77bd22a6482f2a376c9f6baf4fb36238
+  metadata.gz: 9d9a70d6f9200acd372ab13f63628a04cffd1cd4509e3ac24af448b179a6f192
+  data.tar.gz: 750f7704aa249784a9261b2910a1c8b3786ba03b32e52fe16d07c8de82cced06
 SHA512:
-  metadata.gz: 445960c704e60c61b49a54eb3ea9950fda2f8b0c124bb7d7876849a5d9985fc3eeba80d907d6fb0a90305eff6139bfde886756bdf5dc2d43b04685191dd872ad
-  data.tar.gz: c78e9d383c7f9351d47b67b92664d5e407344ed305fc78bc15fb74829a68033c7d0f754c8f1e5d26ab06d61325a6ba9a09d7f9324d5676ec08008dd9b6d497d2
+  metadata.gz: 4774c0ec9370ecb0e7251131bcc8e6a192c6009e7d7200fbd93dacdddbcec68cf3b2042b086cb8be1f7310721a2303b9f3fd04e40a52c3aecc557ff711b060b6
+  data.tar.gz: 8a7c15b5c16182b806efc85e8e307d9d98f29715aa2e84b4067413b90484c9f19fc94b7e9c294845f48623c2cd776bc8d284ee2bde6e74d76af1d6f38d925345

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.45)
+    opswalrus (1.0.47)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)
       citrus (~> 3.0)

data/lib/opswalrus/app.rb

@@ -219,9 +219,7 @@ module OpsWalrus
       set_pwd(__FILE__.to_pathname.dirname)
       bootstrap_ops_file = OpsFile.new(self, __FILE__.to_pathname.dirname.join("bootstrap.ops"))
       op = OperationRunner.new(self, bootstrap_ops_file)
-      result = op.run([], params_json_hash: @params)
-      info "Bootstrap results:"
-      info result
+      op.run([], params_json_hash: @params)
     end
 
     # args is of the form ["github.com/davidkellis/my-package/sub-package1", "operation1", "arg1:val1", "arg2:val2", "arg3:val3"]

data/lib/opswalrus/bootstrap.ops

@@ -1,5 +1,15 @@
 # ssh_noprep in: :sequence do
 ssh_noprep do
   puts "Bootstrapping #{to_s} (alias=#{self.alias})"
-  _bootstrap_host()
+  stdout, stderr, exit_status = _bootstrap_host()
+  if exit_status == 0
+    puts "Success - #{to_s} (alias=#{self.alias})"
+  else
+    stdout_report = stdout.lines.last(3).map {|line| "        #{line}" }.join()
+    stderr_report = stderr.lines.last(3).map {|line| "        #{line}" }.join()
+    report = "Failure - #{to_s} (alias=#{self.alias})"
+    report << "\n    stdout:\n#{stdout_report}" unless stdout_report.empty?
+    report << "\n    stderr:\n#{stderr_report}" unless stderr_report.empty?
+    puts report
+  end
 end

data/lib/opswalrus/host.rb

@@ -81,6 +81,7 @@ module OpsWalrus
       @_host.to_s
     end
 
+    # returns [stdout, stderr, exit_status]
     def _bootstrap_host
       # copy over bootstrap shell script
       # io = StringIO.new(bootstrap_shell_script)
@@ -89,8 +90,10 @@ module OpsWalrus
       io.close
       raise Error, "Unable to upload bootstrap shell script to remote host #{to_s} (alias=#{self.alias})" unless upload_success
       @_host.execute(:chmod, "755", "tmpopsbootstrap.sh")
-      @_host.execute(:sh, "tmpopsbootstrap.sh")
-      @_host.execute(:rm, "-f", "tmpopsbootstrap.sh")
+      sshkit_cmd = @_host.execute_cmd(:sh, "tmpopsbootstrap.sh")
+      [sshkit_cmd.full_stdout, sshkit_cmd.full_stderr, sshkit_cmd.exit_status]
+    ensure
+      @_host.execute(:rm, "-f", "tmpopsbootstrap.sh") rescue nil
     end
 
     def _zip_copy_and_run_ops_bundle(local_host, block)

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.45"
+  VERSION = "1.0.47"
 end

metadata

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