opswalrus 1.0.63 → 1.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e2b6b9ba0610010ba57293457a77331d9c9a93f7b692d47876df0646c5d68f
-  data.tar.gz: 10bcd65544195a67259995a95485bf55cc851710665810365d823bfa6ea473c5
+  metadata.gz: 63fc3b8a4e8f06f774016d99a2bce30efd96ea1b855eb3a0e9e4161497d7a04a
+  data.tar.gz: 5da3169682554eb3d37534d1c522e1479c9e76371fb61670a96c540786df334b
 SHA512:
-  metadata.gz: 9e8856211f18735ad966a78d6078a361071a5e352e4184ffba04d9cfc05944040f2a2a059760d013c285dccc37ef9735fe6951cf6d175795076c1a60f6205da1
-  data.tar.gz: d011ec4eb7311e1a76c625e3156c36652cf23abfee071d5fb1b3dffffde7e8c92ec0d1442e229d804375390c99eaafe442e12f170b69161d75bddb0b272468a5
+  metadata.gz: ba8d018fe2ba343298a1a22b3df163a014a784381b5a6dda7ac7e5c21ec332a7941aac300429456447f6f97a8238fa0a82c439fe85fbcad63b332b57bccaf419
+  data.tar.gz: 80709f6efa368371241a19e33c53623b20db978da43a832e3da09477aff5f97b34953549a8d76a7ce9b945e12ed5a520057182218a0d0c91732844f17fe77934

data/Gemfile.lock

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

data/build.ops

@@ -8,7 +8,7 @@ imports:
 
 # when you run this script, it should do something like:
 # ~/sync/projects/ops/opswalrus on  main via 💎 v3.2.2
-# ❯ ../ops.sh run build.ops version:1.0.7
+# ❯ ops run build.ops version:1.0.7
 # Write version.rb for version 1.0.7
 # [localhost] Build gem: gem build opswalrus.gemspec
 # [localhost] Check whether Bitwarden is locked or not: bw status
@@ -38,8 +38,10 @@ sh("Build gem") { 'gem build opswalrus.gemspec' }
 
 sh("Commit Gemfile.lock and version.rb and git push changes") { 'git commit -am "gem {{ version }}" && git push' }
 
-bw_status_output = sh("Check whether Bitwarden is locked or not") { 'bw status' }
-# the status command currently exhibits an error in which it emits 'mac failed.' some number of times, so we need to filter that out
+# bw_status_output = sh("Check whether Bitwarden is locked or not") { 'bw status' }
+is_unlocked = sh? "Check whether Bitwarden is locked or not",
+                  'rbw unlocked'
+# the `bw status`` command currently exhibits an error in which it emits 'mac failed.' some number of times, so we need to filter that out
 # see:
 # - https://community.bitwarden.com/t/what-does-mac-failed-mean-exactly/29208
 # - https://github.com/bitwarden/cli/issues/88
@@ -47,14 +49,17 @@ bw_status_output = sh("Check whether Bitwarden is locked or not") { 'bw status'
 # ❯ bw status
 # mac failed.
 # {"serverUrl":"...","lastSync":"2023-08-17T19:14:09.384Z","userEmail":"...","userId":"...","status":"locked"}
-bw_status_output = bw_status_output.gsub('mac failed.', '').strip
-bw_status_json = bw_status_output.parse_json
+# bw_status_output = bw_status_output.gsub('mac failed.', '').strip
+# bw_status_json = bw_status_output.parse_json
 
-if bw_status_json['status'] != 'unlocked'
-  exit 1, "Bitwarden is not unlocked. Please unlock bitwarden with: bw unlock"
-end
+# if bw_status_json['status'] != 'unlocked'
+#   exit 1, "Bitwarden is not unlocked. Please unlock bitwarden with: bw unlock"
+# end
+exit 1, "Bitwarden is not unlocked. Please unlock bitwarden with: bw unlock" unless is_unlocked
 
-totp = sh("Get Rubygems OTP") { 'bw get totp Rubygems' }
+# totp = sh("Get Rubygems OTP") { 'bw get totp Rubygems' }
+totp = sh "Get Rubygems OTP",
+          'rbw get -f totp Rubygems'
 sh("Push gem", input: {/You have enabled multi-factor authentication. Please enter OTP code./ => "#{totp}\n"}) { 'gem push opswalrus-{{ version }}.gem' }
 sh("Build docker image") { 'docker build -t ghcr.io/opswalrus/ops:latest -t ghcr.io/opswalrus/ops:{{ version }} -t opswalrus/ops:latest -t opswalrus/ops:{{ version }} .' }
 sh("Push docker image to ghcr.io/opswalrus/ops") { 'docker push ghcr.io/opswalrus/ops:latest' }

data/lib/opswalrus/app.rb

@@ -255,7 +255,7 @@ module OpsWalrus
 
       ops_file = load_entry_point_ops_file(ops_file_path, tmp_bundle_root_dir)
 
-      bundler.update if update_bundle
+      bundler.update(true) if update_bundle
 
       debug "Running: #{ops_file.ops_file_path}"
 
@@ -287,7 +287,7 @@ module OpsWalrus
 
       ops_file = load_entry_point_ops_file(ops_file_path, tmp_bundle_root_dir)
 
-      bundler.update if update_bundle
+      bundler.update(true) if update_bundle
 
       debug "Running: #{ops_file.ops_file_path}"
 

data/lib/opswalrus/invocation.rb

@@ -134,7 +134,7 @@ module OpsWalrus
 
         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
 
-        JSON.parse(output)
+        RemoteInvocation.parse_remote_script_invocation_result(output)
       ensure
         if json_kwargs_tempfile
           json_kwargs_tempfile.close rescue nil
@@ -201,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
@@ -247,7 +257,7 @@ module OpsWalrus
 
         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
 
-        JSON.parse(output)
+        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.63"
+  VERSION = "1.0.65"
 end

metadata

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