opswalrus 1.0.76 → 1.0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c14f1f9d393c44f6daefbb576afb28a273569a7fc9e46f211324630745cbc2ff
-  data.tar.gz: c7e199f0fc237c11cab49f97c4872ff685bb34029678a62467735848741eb0d7
+  metadata.gz: c19f0877541baca3fa57340c300382e8819e56d9bfc2225ca1f4a888c0df9fb6
+  data.tar.gz: 279d36f24ff0861115ca06e4201d907c84082b764f308faceee9c9c4420a2ef2
 SHA512:
-  metadata.gz: 25c1f27303555141b952fa3450dd3c6b1821908c3d97b7df73a892af8808f7d10ad2fe49cfcb62808b503128e3ed623aaf8c93d3040316b7bf286834e48117b1
-  data.tar.gz: 165658a4614110321554f4461882d6cfb44ef9618f804354c65ce3c4f45d273bbb78ea84a9d9aab91d158c164a9ea8b1ab1b7ef216e8f0d8efdfc50a0739938f
+  metadata.gz: 54b958066621d691e460702e41388b76c34c3a9cc379f1fe431e52f70509c581a81f8d1a9d7c11ea15f5d5406c5862659534b5c7b18aa086494e0ac3a2b5c564
+  data.tar.gz: 0771e13131d4db57fdc9f730ed80a286aaaf80409b35cdbdfe2091c0e80b35d321ccba1fbad6c89a6ce28438207330bbd944833618aef762ab42fb6ab7b98641

data/Gemfile.lock

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

data/lib/opswalrus/interaction_handlers.rb

@@ -6,7 +6,7 @@ module OpsWalrus
     STANDARD_SUDO_PASSWORD_PROMPT = /\[sudo\] password for .*?:\s*/
     STANDARD_SSH_PASSWORD_PROMPT = /.*?@.*?'s password:\s*/
 
-    attr_accessor :input_mappings   # Hash[ String | Regex => String ]
+    attr_accessor :input_mappings   # Hash[ String | Regex => (String | Proc) ]
 
     def initialize(mapping)
       @input_mappings = mapping
@@ -39,7 +39,7 @@ module OpsWalrus
     # temporarily adds the specified input mapping to the interaction handler while the given block is being evaluated
     # when the given block returns, then the temporary mapping is removed from the interaction handler
     #
-    # mapping : Hash[ String | Regex => String ] | Nil
+    # mapping : Hash[ String | Regex => (String | Proc) ] | Nil
     def with_mapping(mapping = nil, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true)
       new_mapping = inherit_existing_mappings ? @input_mappings : {}
 
@@ -67,7 +67,7 @@ module OpsWalrus
 
     # adds the specified input mapping to the interaction handler
     #
-    # mapping : Hash[ String | Regex => String ]
+    # mapping : Hash[ String | Regex => (String | Proc) ]
     def add_mapping(mapping)
       @input_mappings.merge!(mapping)
     end
@@ -84,13 +84,20 @@ module OpsWalrus
     # This method returns the data that is emitted to the response channel as a result of having processed the output
     # from a command that the interaction handler was expecting.
     def on_data(_command, stream_name, data, response_channel)
-      response_data = begin
-        first_matching_key_value_pair = @input_mappings.find {|k, _v| k === data }
-        first_matching_key_value_pair&.last
+      response_data = @input_mappings.find_map do |pattern, mapped_output_value|
+        pattern = pattern.is_a?(String) ? Regexp.new(Regexp.escape(pattern)) : pattern
+        if pattern_match = data.match(pattern)   # pattern_match : MatchData | Nil
+          case mapped_output_value
+          when Proc, Method
+            mapped_output_value.call(pattern_match)
+          when String
+            mapped_output_value
+          end
+        end
       end
 
       if response_data.nil?
-        trace(Style.red("No interaction handler mapping for #{stream_name}: #{data} so no response was sent"))
+        trace(Style.red("No interaction handler mapping for #{stream_name}: `#{data}` so no response was sent"))
       else
         debug(Style.cyan("Handling #{stream_name} message #{data}"))
         debug(Style.cyan("Sending response #{response_data}"))

data/lib/opswalrus/patches.rb

@@ -42,6 +42,17 @@ class Hash
   end
 end
 
+module Enumerable
+  # calls the block with successive elements; returns the first truthy object returned by the block
+  def find_map(&block)
+    each do |element|
+      mapped_value = block.call(element)
+      return mapped_value if mapped_value
+    end
+    nil
+  end
+end
+
 class Array
   def has_key?(key)
     key.is_a?(Integer) && key < size

data/lib/opswalrus/version.rb

@@ -1,3 +1,3 @@
 module OpsWalrus
-  VERSION = "1.0.76"
+  VERSION = "1.0.77"
 end

metadata

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