opswalrus 1.0.47 → 1.0.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9a70d6f9200acd372ab13f63628a04cffd1cd4509e3ac24af448b179a6f192
-  data.tar.gz: 750f7704aa249784a9261b2910a1c8b3786ba03b32e52fe16d07c8de82cced06
+  metadata.gz: 90e3b3e2c7e0255ef069e30d31e2125c5bf6fd9c22a15e4aa2057f5265aa6873
+  data.tar.gz: 58346bbbcfe19a98add4a83b8936f75c911155f872cf35ecaf56ce32679c1123
 SHA512:
-  metadata.gz: 4774c0ec9370ecb0e7251131bcc8e6a192c6009e7d7200fbd93dacdddbcec68cf3b2042b086cb8be1f7310721a2303b9f3fd04e40a52c3aecc557ff711b060b6
-  data.tar.gz: 8a7c15b5c16182b806efc85e8e307d9d98f29715aa2e84b4067413b90484c9f19fc94b7e9c294845f48623c2cd776bc8d284ee2bde6e74d76af1d6f38d925345
+  metadata.gz: bde3099dff40f9f00add304bac22a5cf62521a68ed3c9481d7de9ae28f3d520c4457097c3be60fbb569e6c32de4fdc101e620fd5a2ad832d335b638245dcd93e
+  data.tar.gz: a1b4a440fd1d9512efe0cdef6110f3849afab3ad3253140dfa253bb30d7fac606a0de6b814f3611e0c063366a9478a2b4fc3ae5e3c962b02d6c76f2dd815dbb2

data/Gemfile.lock

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

data/build.ops

@@ -30,7 +30,9 @@ end
 TEMPLATE
 
 puts "Write version.rb for version #{version}"
-core.template.write(path: "./lib/opswalrus/version.rb", template: template, variables: {version: version})
+core.template.write template: template,
+                    variables: {version: version},
+                    to: "./lib/opswalrus/version.rb"
 
 sh("Build gem") { 'gem build opswalrus.gemspec' }
 

data/lib/opswalrus/app.rb

@@ -249,6 +249,9 @@ module OpsWalrus
       puts JSON.pretty_generate(result.value)
 
       exit_status
+    rescue Error => e
+      puts "Error: #{e.message}"
+      1
     ensure
       FileUtils.remove_entry(tmp_bundle_root_dir) if tmp_bundle_root_dir
     end

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
@@ -264,6 +280,14 @@ module OpsWalrus
       puts Style.green(msg.mustache(2))    # we use two here, because one stack frame accounts for the call from the ops script into HostProxy#desc
     end
 
+    def warn(msg)
+      puts Style.yellow(msg.mustache(2))    # we use two here, because one stack frame accounts for the call from the ops script into HostProxy#desc
+    end
+
+    def debug(msg)
+      puts msg.mustache(2) if App.instance.debug? || App.instance.trace?    # we use two here, because one stack frame accounts for the call from the ops script into HostProxy#desc
+    end
+
     def env(*args, **kwargs)
       @ops_file_script.env(*args, **kwargs)
     end
@@ -419,7 +443,7 @@ module OpsWalrus
 
     def clear_ssh_session
       @runtime_env = nil
-      ops_file_script = nil
+      @ops_file_script = nil
       @sshkit_backend = nil
       @tmp_bundle_root_dir = nil
       @tmp_ssh_key_files.each {|tmpfile| tmpfile.close() rescue nil; File.unlink(tmpfile) rescue nil }

data/lib/opswalrus/operation_runner.rb

@@ -99,14 +99,14 @@ module OpsWalrus
         App.instance.error "[!] Command failed: #{e.message}"
       rescue Error => e
         App.instance.error "Error: Ops script crashed."
-        App.instance.error e
-        # App.instance.error e.backtrace.take(5).join("\n")
+        App.instance.error e.message
+        App.instance.error e.backtrace.take(10).join("\n")
         Invocation::Error.new(e)
       rescue => e
         App.instance.error "Unhandled Error: Ops script crashed."
         App.instance.error e.class
-        App.instance.error e
-        # App.instance.error e.backtrace.take(10).join("\n")
+        App.instance.error e.message
+        App.instance.error e.backtrace.take(10).join("\n")
         Invocation::Error.new(e)
       end
 

data/lib/opswalrus/ops_file_script.rb

@@ -139,11 +139,12 @@ module OpsWalrus
         def _invoke(runtime_env, hashlike_params)
           @runtime_env = runtime_env
           @params = InvocationParams.new(hashlike_params)
+          @runtime_ops_file_path = __FILE__
           #{ruby_script}
         end
       INVOKE_METHOD
 
-      invoke_method_line_count_prior_to_ruby_script_from_ops_file = 3
+      invoke_method_line_count_prior_to_ruby_script_from_ops_file = 4
       klass.module_eval(invoke_method_definition, ops_file.ops_file_path.to_s, ops_file.script_line_offset - invoke_method_line_count_prior_to_ruby_script_from_ops_file)
 
       klass
@@ -157,8 +158,9 @@ module OpsWalrus
     def initialize(ops_file, ruby_script)
       @ops_file = ops_file
       @script = ruby_script
-      @runtime_env = nil    # this is set at the very first line of #_invoke
-      @params = nil         # this is set at the very first line of #_invoke
+      @runtime_env = nil              # this is set at the very first line of #_invoke
+      @params = nil                   # this is set at the very first line of #_invoke
+      @runtime_ops_file_path = nil    # this is set at the very first line of #_invoke
     end
 
     def backend
@@ -183,6 +185,10 @@ module OpsWalrus
       end
     end
 
+    def inspect
+      "OpsFileScript[#{ops_file.ops_file_path}]"
+    end
+
     def to_s
       @script
     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
@@ -153,6 +157,10 @@ module OpsWalrus
       end
     end
 
+    def current_dir
+      File.dirname(File.realpath(@runtime_ops_file_path)).to_pathname
+    end
+
     def inventory(*args, **kwargs)
       tags = args.map(&:to_s)
 
@@ -194,6 +202,14 @@ module OpsWalrus
       puts Style.green(msg.mustache(1))
     end
 
+    def warn(msg)
+      puts Style.yellow(msg.mustache(1))
+    end
+
+    def debug(msg)
+      puts msg.mustache(1) if App.instance.debug? || App.instance.trace?
+    end
+
     def env(*keys)
       keys = keys.map(&:to_s)
       if keys.empty?
@@ -245,10 +261,26 @@ module OpsWalrus
       end
       #cmd = Shellwords.escape(cmd)
 
+      report_on(@runtime_env.local_hostname, description, cmd, log_level: log_level) do
+        if App.instance.dry_run?
+          ["", "", 0]
+        else
+          sshkit_cmd = @runtime_env.handle_input(input, inherit_existing_mappings: true) do |interaction_handler|
+            # puts "self=#{self.class.superclass}"
+            # self is an instance of one of the dynamically defined subclasses of OpsFileScript
+            App.instance.debug("OpsFileScriptDSL#shell! cmd=#{cmd} with input mappings #{interaction_handler.input_mappings.inspect} given input: #{input.inspect})")
+            backend.execute_cmd(cmd, interaction_handler: interaction_handler)
+          end
+          [sshkit_cmd.full_stdout, sshkit_cmd.full_stderr, sshkit_cmd.exit_status]
+        end
+      end
+    end
+
+    def report_on(hostname, description = nil, cmd, log_level: nil)
       cmd_id = Random.uuid.split('-').first
 
       output_block = StringIO.open do |io|
-        io.print Style.blue(@runtime_env.local_hostname)
+        io.print Style.blue(hostname)
         io.print " | #{Style.magenta(description)}" if description
         io.puts
         io.print Style.yellow(cmd_id)
@@ -258,20 +290,8 @@ module OpsWalrus
       end
       puts output_block
 
-      return unless cmd && !cmd.strip.empty?
-
       t1 = Time.now
-      out, err, exit_status = if App.instance.dry_run?
-        ["", "", 0]
-      else
-        sshkit_cmd = @runtime_env.handle_input(input, inherit_existing_mappings: true) do |interaction_handler|
-          # self is a Module instance that is serving as the evaluation context in an instance of a subclass of an Invocation; see Invocation#evaluate
-          # backend.execute_cmd(cmd, interaction_handler: interaction_handler, verbosity: SSHKit.config.output_verbosity)
-          App.instance.debug("OpsFileScriptDSL#shell! cmd=#{cmd} with input mappings #{interaction_handler.input_mappings.inspect} given input: #{input.inspect})")
-          backend.execute_cmd(cmd, interaction_handler: interaction_handler)
-        end
-        [sshkit_cmd.full_stdout, sshkit_cmd.full_stderr, sshkit_cmd.exit_status]
-      end
+      out, err, exit_status = yield
       t2 = Time.now
       seconds = t2 - t1
 

data/lib/opswalrus/patches.rb

@@ -20,3 +20,72 @@ class Pathname
     self
   end
 end
+
+
+class String
+  def boolean!(default: false)
+    boolean_str = strip.downcase
+    case boolean_str
+    when "true"
+      true
+    when "false"
+      false
+    else
+      default
+    end
+  end
+
+  def string!(default: "")
+    self
+  end
+end
+
+class Integer
+  def boolean!(default: false)
+    true
+  end
+
+  def string!(default: "")
+    to_s
+  end
+end
+
+class Float
+  def boolean!(default: false)
+    true
+  end
+
+  def string!(default: "")
+    to_s
+  end
+end
+
+class NilClass
+  def boolean!(default: false)
+    default
+  end
+
+  def string!(default: "")
+    default
+  end
+end
+
+class TrueClass
+  def boolean!(default: false)
+    self
+  end
+
+  def string!(default: "")
+    to_s
+  end
+end
+
+class FalseClass
+  def boolean!(default: false)
+    self
+  end
+
+  def string!(default: "")
+    to_s
+  end
+end

data/lib/opswalrus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.47
+  version: 1.0.49
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: binding_of_caller