opswalrus 1.0.46 → 1.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e4b15ff511cbac36450224deb5d3da970aa979be30d468ce9ac07c8b827907
-  data.tar.gz: 531443cdca36130479513f755ef609b017cc109f339d24379f82d7b243da4891
+  metadata.gz: 2ccef020c9a8dbe02e313e2cea8d632bde41b4adf7d4632af26d6b86d5e52606
+  data.tar.gz: 5f2a6342ca5631a4e4284ebfb9a6546106dff4fbce2aa6bafad42d7e897b98e5
 SHA512:
-  metadata.gz: c728e62baf815b1599413d2b80c6d045b4c5be510c374be1b3a6b7465c7316bc2952ab4bab91031df23bc7b56289cb8c36b320e5cf84a0a523a12a410ff538b8
-  data.tar.gz: 8d804dd1f1b90347e7eddeb43bde790841130d1edd25b1ed632223e7a0ace968b8c80e834829e277d148f245d5bf8b964d92120849f01f8c1f0f8976bb3897c8
+  metadata.gz: 1100b1342196951cdaac37d5dac00a40400d5556c6d4a4fc0a9293fac65a5862639d176e18e1e9cea1230957a110a50853a561bd48f965b42aebf7734b3d0590
+  data.tar.gz: 9e467f0d02e86bf19fd4385ab62cb7ce739dca3096a159e648909e1d95fdd53c5519cfb98eac37748f5e4cbcb371d59f0247ea2bd51ecf92453d85852564fa3d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.46)
+    opswalrus (1.0.48)
       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

@@ -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"]
@@ -251,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/host.rb

@@ -264,6 +264,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 +427,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

@@ -153,6 +153,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 +198,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 +257,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 +286,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.46"
+  VERSION = "1.0.48"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.46
+  version: 1.0.48
 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