opswalrus 1.0.48 → 1.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ccef020c9a8dbe02e313e2cea8d632bde41b4adf7d4632af26d6b86d5e52606
-  data.tar.gz: 5f2a6342ca5631a4e4284ebfb9a6546106dff4fbce2aa6bafad42d7e897b98e5
+  metadata.gz: 90e3b3e2c7e0255ef069e30d31e2125c5bf6fd9c22a15e4aa2057f5265aa6873
+  data.tar.gz: 58346bbbcfe19a98add4a83b8936f75c911155f872cf35ecaf56ce32679c1123
 SHA512:
-  metadata.gz: 1100b1342196951cdaac37d5dac00a40400d5556c6d4a4fc0a9293fac65a5862639d176e18e1e9cea1230957a110a50853a561bd48f965b42aebf7734b3d0590
-  data.tar.gz: 9e467f0d02e86bf19fd4385ab62cb7ce739dca3096a159e648909e1d95fdd53c5519cfb98eac37748f5e4cbcb371d59f0247ea2bd51ecf92453d85852564fa3d
+  metadata.gz: bde3099dff40f9f00add304bac22a5cf62521a68ed3c9481d7de9ae28f3d520c4457097c3be60fbb569e6c32de4fdc101e620fd5a2ad832d335b638245dcd93e
+  data.tar.gz: a1b4a440fd1d9512efe0cdef6110f3849afab3ad3253140dfa253bb30d7fac606a0de6b814f3611e0c063366a9478a2b4fc3ae5e3c962b02d6c76f2dd815dbb2

data/Gemfile.lock

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

data/lib/opswalrus/bootstrap.ops

@@ -1,15 +1,5 @@
 # ssh_noprep in: :sequence do
 ssh_noprep do
   puts "Bootstrapping #{to_s} (alias=#{self.alias})"
-  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
+  _bootstrap_host(true)
 end

data/lib/opswalrus/host.rb

@@ -82,7 +82,7 @@ module OpsWalrus
     end
 
     # returns [stdout, stderr, exit_status]
-    def _bootstrap_host
+    def _bootstrap_host(print_report = true)
       # copy over bootstrap shell script
       # io = StringIO.new(bootstrap_shell_script)
       io = File.open(__FILE__.to_pathname.dirname.join("bootstrap.sh"))
@@ -91,7 +91,23 @@ module OpsWalrus
       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")
       sshkit_cmd = @_host.execute_cmd(:sh, "tmpopsbootstrap.sh")
-      [sshkit_cmd.full_stdout, sshkit_cmd.full_stderr, sshkit_cmd.exit_status]
+
+      stdout, stderr, exit_status = [sshkit_cmd.full_stdout, sshkit_cmd.full_stderr, sshkit_cmd.exit_status]
+
+      if print_report
+        if exit_status == 0
+          puts "Bootstrap 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 = "Bootstrap 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
+
+      [stdout, stderr, exit_status]
     ensure
       @_host.execute(:rm, "-f", "tmpopsbootstrap.sh") rescue nil
     end

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -120,8 +120,12 @@ module OpsWalrus
           host.set_ops_file_script(ops_file_script)
           host.set_ssh_session_connection(self)  # self is an instance of one of the subclasses of SSHKit::Backend::Abstract, e.g. SSHKit::Backend::Netssh
 
-          host._bootstrap_host
-          retval = host._zip_copy_and_run_ops_bundle(local_host, block)
+          stdout, stderr, exit_status = host._bootstrap_host(false)
+          retval = if exit_status == 0
+            host._zip_copy_and_run_ops_bundle(local_host, block)
+          else
+            puts "Failed to bootstrap #{host}. Unable to run operation."
+          end
 
           retval
         rescue SSHKit::Command::Failed => e

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.48"
+  VERSION = "1.0.49"
 end

metadata

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