opswalrus 1.0.62 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ccee9336c9eeffa5c8bf4fd9c4f26353eb49fada6d7643ad236b81f5ad4061
-  data.tar.gz: b43f9ee85f5557c60506d74a9a21d7d31d21762a47449bed8fa6a145cc05f8eb
+  metadata.gz: '03538d35b647412c40af0d2df5aa214ea53ea1beda900abe6825096e1e102db0'
+  data.tar.gz: b32414001a3a66a94537ad5fefaa789f24cba8e42da20d47db4c47d9f7834b1b
 SHA512:
-  metadata.gz: 2f172ded5af3368a410705b17ea624da8ab0f994d84a2441a403066af0a4b56010345bee5437b9eac8d2cc883644d4febc479d666a4a5b4309efe6ce841d22f9
-  data.tar.gz: 4022b1f2bf0aadbd83067798639f6ac593228f9d54cc3f79e0df3dee5172069a59ce72421f569a140ee31b1f382724435482c7860bcf8eb02d783150ab37e78e
+  metadata.gz: ecdbb125b8d658bf841d9ef62ed5ed10ec145a62cf7d82d5182398955df9b0d2cf8a62f2fbd64ebcf52f6974032f9f0658e55236e6e963acf29c718df75a3197
+  data.tar.gz: c5387283ba8982f5fd6c9a3f29935ed49ea895667c3f4f2ea6db0c39f8fde5a9e2ccfdd873a55cfd2d9b8d680506da4c8f0228fe74fe1da627288f266bdeb13c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.62)
+    opswalrus (1.0.64)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)

data/lib/opswalrus/_run_remote.ops

@@ -6,6 +6,5 @@ ssh in: :sequence do
 # ssh_noprep do
   # puts params.stringify_keys!
   # desc "Running `#{params.ops_file.ops_file_path} #{params.operation_kv_args.join(' ')}` on #{to_s} (alias=#{self.alias})"
-  # run_ops(ops_command, ops_command_options = nil, command_arguments, in_bundle_root_dir: true, ops_prompt_for_sudo_password: false)
   _invoke_remote(params.ops_file, *params.operation_kv_args)
 end

data/lib/opswalrus/host.rb

@@ -322,21 +322,25 @@ module OpsWalrus
     end
 
     def parse_stdout_and_script_return_value(command_output)
-      output_sections = command_output.split(/^#{::OpsWalrus::App::SCRIPT_RESULT_HEADER}$/)
+      output_sections = command_output.split(/#{::OpsWalrus::App::SCRIPT_RESULT_HEADER}/)
       case output_sections.count
       when 1
         stdout, ops_script_retval = output_sections.first, nil
+        # puts "found it1!: #{output_sections.inspect}"
       when 2
         stdout, ops_script_retval = *output_sections
+        # puts "found it2!: #{ops_script_retval}"
       else
         # this is unexpected
         ops_script_retval = output_sections.pop
         stdout = output_sections.join(::OpsWalrus::App::SCRIPT_RESULT_HEADER)
+        # puts "found it3!: #{ops_script_retval}"
       end
       [stdout, ops_script_retval]
     end
 
     # runs the specified ops command with the specified command arguments
+    # returns [stdout, stderr, exit_status]
     def run_ops(ops_command, ops_command_options = nil, command_arguments, in_bundle_root_dir: true, ops_prompt_for_sudo_password: false)
       local_hostname_for_remote_host = if self.alias
         "#{host} (#{self.alias})"

data/lib/opswalrus/invocation.rb

@@ -125,13 +125,16 @@ module OpsWalrus
         ops_command_options = "--script"
         ops_command_options << " --pass" if @ops_prompt_for_sudo_password
         ops_command_options << " --params #{remote_json_kwargs_tempfile_basename}" if remote_json_kwargs_tempfile_basename
-        retval = if ops_command_options.empty?
+
+        output, stderr, exit_status = if ops_command_options.empty?
           @host_proxy.run_ops(:run, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
         else
           @host_proxy.run_ops(:run, ops_command_options, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
         end
 
-        retval
+        App.instance.debug("Remote invocation failed:\n  cmd: ops run #{ops_command_options.to_s} #{remote_run_command_args.to_s}\n  stdout: #{output}\n") unless exit_status == 0
+
+        RemoteInvocation.parse_remote_script_invocation_result(output)
       ensure
         if json_kwargs_tempfile
           json_kwargs_tempfile.close rescue nil
@@ -198,9 +201,19 @@ module OpsWalrus
 
 
 
-
-
   class RemoteInvocation
+    def self.parse_remote_script_invocation_result(json_string)
+      retval = JSON.parse(json_string)
+      case retval
+      when Hash
+        retval.with_indifferent_access.easynav
+      when Array
+        retval.easynav
+      else
+        retval
+      end
+    end
+
     def initialize(host_proxy, ops_file, ops_prompt_for_sudo_password: nil)
       @host_proxy = host_proxy
       @ops_file = ops_file
@@ -235,13 +248,16 @@ module OpsWalrus
         ops_command_options = "--script"
         ops_command_options << " --pass" if @ops_prompt_for_sudo_password
         ops_command_options << " --params #{remote_json_kwargs_tempfile_basename}" if remote_json_kwargs_tempfile_basename
-        retval = if ops_command_options.empty?
+
+        output, stderr, exit_status = if ops_command_options.empty?
           @host_proxy.run_ops(:run, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
         else
           @host_proxy.run_ops(:run, ops_command_options, remote_run_command_args, ops_prompt_for_sudo_password: @ops_prompt_for_sudo_password)
         end
 
-        retval
+        App.instance.debug("Remote invocation failed:\n  cmd: ops run #{ops_command_options.to_s} #{remote_run_command_args.to_s}\n  stdout: #{output}\n") unless exit_status == 0
+
+        RemoteInvocation.parse_remote_script_invocation_result(output)
       ensure
         if json_kwargs_tempfile
           json_kwargs_tempfile.close rescue nil

data/lib/opswalrus/ops_file_script.rb

@@ -5,82 +5,81 @@ require_relative 'ops_file_script_dsl'
 
 module OpsWalrus
 
-  class ArrayOrHashNavigationProxy
-    extend Forwardable
-
-    def initialize(array_or_hash)
-      @obj = array_or_hash
-    end
-
-    def_delegators :@obj, :to_s, :inspect, :hash, :===, :eql?, :kind_of?, :is_a?, :instance_of?, :respond_to?, :<=>
-
-    def [](index, *args, **kwargs, &block)
-      @obj.method(:[]).call(index, *args, **kwargs, &block)
-    end
-    def respond_to_missing?(method, *)
-      @obj.is_a?(Hash) && @obj.respond_to?(method)
-    end
-    def method_missing(name, *args, **kwargs, &block)
-      case @obj
-      when Array
-        @obj.method(name).call(*args, **kwargs, &block)
-      when Hash
-        if @obj.respond_to?(name)
-          @obj.method(name).call(*args, **kwargs, &block)
-        else
-          value = self[name.to_s]
-          case value
-          when Array, Hash
-            ArrayOrHashNavigationProxy.new(value)
-          else
-            value
-          end
-        end
-      end
-    end
-  end
-
-  class InvocationParams
-    # @params : Hash
-
-    # params : Hash | ArrayOrHashNavigationProxy
-    def initialize(hashlike_params)
-      # this doesn't seem to make any difference
-      @params = hashlike_params.to_h
-      # @params = hashlike_params
-    end
-
-    def [](key)
-      key = key.to_s if key.is_a? Symbol
-      @params[key]
-    end
-
-    def dig(*keys, default: nil)
-      # keys = keys.map {|key| key.is_a?(Integer) ? key : key.to_s }
-      @params.dig(*keys) || default
-    end
-
-    def method_missing(name, *args, **kwargs, &block)
-      if @params.respond_to?(name)
-        @params.method(name).call(*args, **kwargs, &block)
-      else
-        value = self[name]
-        case value
-        when Array, Hash
-          ArrayOrHashNavigationProxy.new(value)
-        else
-          value
-        end
-      end
-    end
-  end
-
-  class EnvParams < InvocationParams
-    # params : Hash | ArrayOrHashNavigationProxy
-    def initialize(hashlike_params = ENV)
-      super(hashlike_params)
-    end
-  end
+  # class ArrayOrHashNavigationProxy
+  #   extend Forwardable
+
+  #   def initialize(array_or_hash)
+  #     @obj = array_or_hash
+  #   end
+
+  #   def_delegators :@obj, :[], :to_s, :inspect, :hash, :===, :eql?, :kind_of?, :is_a?, :instance_of?, :respond_to?, :<=>
+
+  #   # def [](index, *args, **kwargs, &block)
+  #   #   @obj.method(:[]).call(index, *args, **kwargs, &block)
+  #   # end
+  #   def respond_to_missing?(method, *)
+  #     @obj.is_a?(Hash) && @obj.respond_to?(method)
+  #   end
+  #   def method_missing(name, *args, **kwargs, &block)
+  #     case @obj
+  #     when Array
+  #       @obj.method(name).call(*args, **kwargs, &block)
+  #     when Hash
+  #       if @obj.respond_to?(name)
+  #         @obj.method(name).call(*args, **kwargs, &block)
+  #       else
+  #         value = self[name.to_s]
+  #         case value
+  #         when Array, Hash
+  #           ArrayOrHashNavigationProxy.new(value)
+  #         else
+  #           value
+  #         end
+  #       end
+  #     end
+  #   end
+  # end
+
+  # class InvocationParams
+  #   # @params : Hash
+
+  #   # params : Hash | ArrayOrHashNavigationProxy
+  #   def initialize(hashlike_params)
+  #     # this doesn't seem to make any difference
+  #     @params = hashlike_params.to_h
+  #     # @params = hashlike_params
+  #   end
+
+  #   def [](key)
+  #     @params[key]
+  #   end
+
+  #   def dig(*keys, default: nil)
+  #     # keys = keys.map {|key| key.is_a?(Integer) ? key : key.to_s }
+  #     @params.dig(*keys) || default
+  #   end
+
+  #   def method_missing(name, *args, **kwargs, &block)
+  #     if @params.respond_to?(name)
+  #       @params.method(name).call(*args, **kwargs, &block)
+  #     else
+  #       value = self[name]
+  #       case value
+  #       when Array, Hash
+  #         ArrayOrHashNavigationProxy.new(value)
+  #       else
+  #         value
+  #       end
+  #     end
+  #   end
+  # end
+
+  # class EnvParams < InvocationParams
+  #   # params : Hash | ArrayOrHashNavigationProxy
+  #   def initialize(hashlike_params = ENV)
+  #     super(hashlike_params)
+  #   end
+  # end
 
   class OpsFileScript
 
@@ -135,16 +134,27 @@ module OpsWalrus
       # - #host_proxy_class
       # - #backend
       # - all the dynamically defined methods in the subclass of Invocation
+      #
+      # Return value is whatever the script returned with one exception:
+      # - if the script returns a Hash or an Array, the return value is an EasyNavProxy
       invoke_method_definition = <<~INVOKE_METHOD
         def _invoke(runtime_env, hashlike_params)
           @runtime_env = runtime_env
-          @params = InvocationParams.new(hashlike_params)
+          @params = hashlike_params.easynav
           @runtime_ops_file_path = __FILE__
-          #{ruby_script}
+          _retval = begin
+            #{ruby_script}
+          end
+          case _retval
+          when Hash, Array
+            _retval.easynav
+          else
+            _retval
+          end
         end
       INVOKE_METHOD
 
-      invoke_method_line_count_prior_to_ruby_script_from_ops_file = 4
+      invoke_method_line_count_prior_to_ruby_script_from_ops_file = 5
       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

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -366,7 +366,7 @@ module OpsWalrus
     end
 
     def parse_stdout_and_script_return_value(command_output)
-      output_sections = command_output.split(/^#{::OpsWalrus::App::SCRIPT_RESULT_HEADER}$/)
+      output_sections = command_output.split(/#{::OpsWalrus::App::SCRIPT_RESULT_HEADER}/)
       case output_sections.count
       when 1
         stdout, ops_script_retval = output_sections.first, nil

data/lib/opswalrus/patches.rb

@@ -1,7 +1,54 @@
-require 'json'
-require 'pathname'
 require 'active_support'
 require 'active_support/core_ext/hash'
+require 'json'
+require 'pathname'
+
+class EasyNavProxy
+  extend Forwardable
+
+  # indexable_obj must implement #respond_to? and #has_key?
+  def initialize(indexable_obj)
+    @obj = indexable_obj
+  end
+
+  def_delegators :@obj, :[], :to_s, :inspect, :hash, :===, :==, :eql?, :kind_of?, :is_a?, :instance_of?, :respond_to?, :<=>
+
+  def easynav
+    self
+  end
+
+  def respond_to_missing?(method, *)
+    @obj.respond_to?(method) || @obj.has_key?(method)
+  end
+  def method_missing(method, *args, **kwargs, &block)
+    if @obj.respond_to?(method)
+      @obj.method(method).call(*args, **kwargs, &block)
+    elsif @obj.has_key?(method)
+      value = self[method]
+      case value
+      when Array, Hash
+        EasyNavProxy.new(value)
+      else
+        value
+      end
+    end
+  end
+end
+
+class Hash
+  def easynav
+    EasyNavProxy.new(self.with_indifferent_access)
+  end
+end
+
+class Array
+  def has_key?(key)
+    key.is_a?(Integer) && key < size
+  end
+  def easynav
+    EasyNavProxy.new(self)
+  end
+end
 
 class String
   def escape_single_quotes
@@ -23,7 +70,6 @@ class Pathname
   end
 end
 
-
 class String
   def boolean!(default: false)
     boolean_str = strip.downcase

data/lib/opswalrus/runtime_environment.rb

@@ -1,3 +1,5 @@
+require 'active_support'
+require 'active_support/core_ext/hash'
 require 'json'
 require 'shellwords'
 require 'socket'
@@ -238,7 +240,8 @@ module OpsWalrus
 
     def initialize(app)
       @app = app
-      @env = EnvParams.new(ENV)
+      # @env = EnvParams.new(ENV)
+      @env = ENV.to_h.with_indifferent_access.easynav
       @bundle_load_path = LoadPath.new(self, @app.bundle_dir)
       @app_load_path = LoadPath.new(self, @app.pwd)
 

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.62"
+  VERSION = "1.0.64"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.62
+  version: 1.0.64
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport