opswalrus 1.0.77 → 1.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c19f0877541baca3fa57340c300382e8819e56d9bfc2225ca1f4a888c0df9fb6
-  data.tar.gz: 279d36f24ff0861115ca06e4201d907c84082b764f308faceee9c9c4420a2ef2
+  metadata.gz: 13215ff324f0411cb258d2bb9228d4e6ab5a99bdab79d81fa13206063f3ab66c
+  data.tar.gz: 1ff2f044c230528bd3fa94ee3070380f6b5943bf1d8495bc608460f52128abbc
 SHA512:
-  metadata.gz: 54b958066621d691e460702e41388b76c34c3a9cc379f1fe431e52f70509c581a81f8d1a9d7c11ea15f5d5406c5862659534b5c7b18aa086494e0ac3a2b5c564
-  data.tar.gz: 0771e13131d4db57fdc9f730ed80a286aaaf80409b35cdbdfe2091c0e80b35d321ccba1fbad6c89a6ce28438207330bbd944833618aef762ab42fb6ab7b98641
+  metadata.gz: afcaa074c96bf612c7c51c75199ff18d0de8988bbb7037068736533f272f83b39fa18501278586037abfd6c64a49ff41f6c1d344028bc373b4381ab6239f1255
+  data.tar.gz: 2d87b71f172c144010f29e625a82d7c10628c11684cc75c9686accc8392b24ff8e4c81f05df8d2ce3ed02497171faacbb59c0821a588563902d5623d4d58ae69

data/Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in opswalrus.gemspec
 gemspec
 
+# gem "kleene", path: '../../kleene-rb'
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    opswalrus (1.0.77)
+    opswalrus (1.0.78)
       activesupport (~> 7.0)
       bcrypt_pbkdf (~> 1.1)
       binding_of_caller (~> 1.0)
@@ -9,6 +9,7 @@ PATH
       ed25519 (~> 1.3)
       git (~> 1.18)
       gli (~> 2.21)
+      kleene
       pastel (~> 0.8)
       rubyzip (~> 2.3)
       semantic_logger (~> 4.13)
@@ -32,9 +33,9 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     backport (1.2.0)
-    base64 (0.1.1)
+    base64 (0.2.0)
     bcrypt_pbkdf (1.1.0)
-    benchmark (0.2.1)
+    benchmark (0.3.0)
     bigdecimal (3.1.4)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
@@ -43,7 +44,7 @@ GEM
     connection_pool (2.4.1)
     debug_inspector (1.1.0)
     diff-lcs (1.5.0)
-    drb (2.1.1)
+    drb (2.2.0)
       ruby2_keywords
     e2mmap (0.1.0)
     ed25519 (1.3.0)
@@ -55,13 +56,16 @@ GEM
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.6)
     json (2.6.3)
+    kleene (0.8.0)
+      activesupport (~> 7.1)
+      regexp_parser (~> 2.8)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
     minitest (5.20.0)
-    mutex_m (0.1.2)
+    mutex_m (0.2.0)
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-ssh (7.2.0)
@@ -74,7 +78,7 @@ GEM
     pastel (0.8.0)
       tty-color (~> 0.5)
     public_suffix (5.0.3)
-    racc (1.7.2)
+    racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
     rbs (2.8.4)

data/cli2.rb

@@ -0,0 +1,88 @@
+require 'tty-option'
+
+class Command
+  include TTY::Option
+
+  usage do
+    program "dock"
+
+    command "run"
+
+    desc "Run a command in a new container"
+
+    example "Set working directory (-w)",
+            "  $ dock run -w /path/to/dir/ ubuntu pwd"
+
+    example <<~EOS
+    Mount volume
+      $ dock run -v `pwd`:`pwd` -w `pwd` ubuntu pwd
+    EOS
+  end
+
+  argument :image do
+    required
+    desc "The name of the image to use"
+  end
+
+  argument :command do
+    optional
+    desc "The command to run inside the image"
+  end
+
+  keyword :restart do
+    default "no"
+    permit %w[no on-failure always unless-stopped]
+    desc "Restart policy to apply when a container exits"
+  end
+
+  option :verbose do
+    arity "+"
+    short "-v"
+    desc "Verbose mode"
+  end
+
+  flag :detach do
+    short "-d"
+    long "--detach"
+    desc "Run container in background and print container ID"
+  end
+
+  flag :help do
+    short "-h"
+    long "--help"
+    desc "Print usage"
+  end
+
+  option :name do
+    required
+    long "--name string"
+    desc "Assign a name to the container"
+  end
+
+  option :port do
+    arity one_or_more
+    short "-p"
+    long "--publish list"
+    convert :list
+    desc "Publish a container's port(s) to the host"
+  end
+
+  def run
+    puts params[:verbose].inspect
+    if params[:help]
+      print help
+    elsif params.errors.any?
+      puts params.errors.summary
+    else
+      pp params.to_h
+    end
+  end
+end
+
+def main
+  cmd = Command.new
+  cmd.parse
+  puts cmd.run
+end
+
+main

data/lib/opswalrus/host.rb

@@ -255,7 +255,7 @@ module OpsWalrus
         if App.instance.info?   # this is true if log_level is trace, debug, info
           io.print Style.blue(host)
           io.print " (#{Style.blue(self.alias)})" if self.alias
-          io.print " | #{Style.magenta(description)}" if description
+          io.print " | #{Style.green(description)}" if description
           io.puts
           io.print Style.yellow(cmd_id)
           io.print Style.green.bold(" > ")
@@ -263,7 +263,7 @@ module OpsWalrus
         elsif App.instance.warn? && description
           io.print Style.blue(host)
           io.print " (#{Style.blue(self.alias)})" if self.alias
-          io.print " | #{Style.magenta(description)}" if description
+          io.print " | #{Style.green(description)}" if description
           io.puts
         end
         io.string

data/lib/opswalrus/interaction_handlers.rb

@@ -1,3 +1,4 @@
+require 'kleene'
 require 'sshkit'
 
 module OpsWalrus
@@ -8,8 +9,9 @@ module OpsWalrus
 
     attr_accessor :input_mappings   # Hash[ String | Regex => (String | Proc) ]
 
-    def initialize(mapping)
-      @input_mappings = mapping
+    def initialize(mappings, lookback_window_chars = 200)
+      @input_mappings = mappings
+      @online_matcher = Kleene::NaiveOnlineRegex.new(mappings.keys, lookback_window_chars)
     end
 
     # sudo_password : String | Nil
@@ -40,8 +42,8 @@ module OpsWalrus
     # when the given block returns, then the temporary mapping is removed from the interaction handler
     #
     # 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 : {}
+    def with_mapping(mapping = nil, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, lookback_window_chars: 200)
+      new_mapping = inherit_existing_mappings ? @input_mappings.clone : {}
 
       if mapping
         raise ArgumentError.new("mapping must be a Hash") unless mapping.is_a?(Hash)
@@ -58,19 +60,26 @@ module OpsWalrus
       end
       new_mapping.merge!(password_mappings) if password_mappings
 
+      # trace(Style.green("mapping: #{mapping}"))
+      # trace(Style.green("new_mapping: #{new_mapping}"))
+      # trace(Style.green("new_mapping.empty?: #{new_mapping.empty?}"))
+      # trace(Style.green("new_mapping == @input_mappings: #{new_mapping == @input_mappings}"))
       if new_mapping.empty? || new_mapping == @input_mappings
+        trace(Style.red("with_mapping -> reset"))
+        @online_matcher.reset
         yield self
       else
-        yield ScopedMappingInteractionHandler.new(new_mapping)
+        trace(Style.red("with_mapping -> new mapping"))
+        yield ScopedMappingInteractionHandler.new(new_mapping, lookback_window_chars)
       end
     end
 
     # adds the specified input mapping to the interaction handler
     #
     # mapping : Hash[ String | Regex => (String | Proc) ]
-    def add_mapping(mapping)
-      @input_mappings.merge!(mapping)
-    end
+    # def add_mapping(mapping)
+    #   @input_mappings.merge!(mapping)
+    # end
 
     # cmd, :stdout, data, stdin
     # the return value from on_data is returned to Command#call_interaction_handler which is then returned verbatim
@@ -84,17 +93,33 @@ 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 = @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
+      # trace(Style.yellow("regexen=#{@online_matcher.instance_exec { @regexen } }"))
+      # trace(Style.yellow("data=`#{data}`"))
+      # trace(Style.yellow("buffer=#{@online_matcher.instance_exec { @buffer } }"))
+      new_matches = @online_matcher.ingest(data)
+      # trace(Style.yellow("new_matches=`#{new_matches}`"))
+      response_data = new_matches.find_map do |online_match|
+        mapped_output_value = @input_mappings[online_match.regex]
+        case mapped_output_value
+        when Proc, Method
+          mapped_output_value.call(online_match.match)
+        when String
+          mapped_output_value
         end
       end
+      # trace(Style.yellow("response_data=`#{response_data.inspect}`"))
+
+      # 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"))

data/lib/opswalrus/ops_file_script_dsl.rb

@@ -294,7 +294,7 @@ module OpsWalrus
         if App.instance.dry_run?
           ["", "", 0]
         else
-          sshkit_cmd = @runtime_env.handle_input(input, inherit_existing_mappings: true) do |interaction_handler|
+          sshkit_cmd = @runtime_env.handle_input(input, inherit_existing_mappings: true, lookback_window_chars: 200) 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})")
@@ -311,14 +311,14 @@ module OpsWalrus
       output_block = StringIO.open do |io|
         if App.instance.info?   # this is true if log_level is trace, debug, info
           io.print Style.blue(hostname)
-          io.print " | #{Style.magenta(description)}" if description
+          io.print " | #{Style.green(description)}" if description
           io.puts
           io.print Style.yellow(cmd_id)
           io.print Style.green.bold(" > ")
           io.puts Style.yellow(cmd)
         elsif App.instance.warn? && description
           io.print Style.blue(hostname)
-          io.print " | #{Style.magenta(description)}" if description
+          io.print " | #{Style.green(description)}" if description
           io.puts
         end
         io.string

data/lib/opswalrus/runtime_environment.rb

@@ -267,12 +267,13 @@ module OpsWalrus
 
     # input_mapping : Hash[ String | Regex => String ]
     # sudo_password : String
-    def handle_input(input_mapping, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, &block)
+    def handle_input(input_mapping, sudo_password: nil, ops_sudo_password: nil, inherit_existing_mappings: true, lookback_window_chars: 200, &block)
       @interaction_handler.with_mapping(
         input_mapping,
         sudo_password: sudo_password,
         ops_sudo_password: ops_sudo_password,
         inherit_existing_mappings: inherit_existing_mappings,
+        lookback_window_chars: lookback_window_chars,
         &block
       )
     end

data/lib/opswalrus/version.rb

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

data/opswalrus.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bcrypt_pbkdf", "~> 1.1"
   spec.add_dependency "ed25519", "~> 1.3"
+  spec.add_dependency "kleene", ">= 0"
   spec.add_dependency "sshkit", "~> 1.21"       # sshkit uses net-ssh, which depends on bcrypt_pbkdf and ed25519 to dynamically add support for ed25519 if those two gems are present
 
   # For more information and examples about making a new gem, check out our

data/test.ops

@@ -0,0 +1,10 @@
+params:
+  version: string
+
+imports:
+  core: "https://github.com/opswalrus/core.git"
+
+...
+
+totp = rand(10000)
+sh("Push gem", input: {/You have enabled multi-factor authentication. Please enter OTP code./ => "#{totp}\n"}) { 'ruby test.rb' }

data/test.rb

@@ -1,88 +1,3 @@
-require 'tty-option'
-
-class Command
-  include TTY::Option
-
-  usage do
-    program "dock"
-
-    command "run"
-
-    desc "Run a command in a new container"
-
-    example "Set working directory (-w)",
-            "  $ dock run -w /path/to/dir/ ubuntu pwd"
-
-    example <<~EOS
-    Mount volume
-      $ dock run -v `pwd`:`pwd` -w `pwd` ubuntu pwd
-    EOS
-  end
-
-  argument :image do
-    required
-    desc "The name of the image to use"
-  end
-
-  argument :command do
-    optional
-    desc "The command to run inside the image"
-  end
-
-  keyword :restart do
-    default "no"
-    permit %w[no on-failure always unless-stopped]
-    desc "Restart policy to apply when a container exits"
-  end
-
-  option :verbose do
-    arity "+"
-    short "-v"
-    desc "Verbose mode"
-  end
-
-  flag :detach do
-    short "-d"
-    long "--detach"
-    desc "Run container in background and print container ID"
-  end
-
-  flag :help do
-    short "-h"
-    long "--help"
-    desc "Print usage"
-  end
-
-  option :name do
-    required
-    long "--name string"
-    desc "Assign a name to the container"
-  end
-
-  option :port do
-    arity one_or_more
-    short "-p"
-    long "--publish list"
-    convert :list
-    desc "Publish a container's port(s) to the host"
-  end
-
-  def run
-    puts params[:verbose].inspect
-    if params[:help]
-      print help
-    elsif params.errors.any?
-      puts params.errors.summary
-    else
-      pp params.to_h
-    end
-  end
-end
-
-def main
-  cmd = Command.new
-  cmd.parse
-  puts cmd.run
-end
-
-main
+puts "You have enabled multi-factor authentication. Please enter OTP code."
+input = gets
+puts "You typed: #{input}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opswalrus
 version: !ruby/object:Gem::Version
-  version: 1.0.77
+  version: 1.0.78
 platform: ruby
 authors:
 - David Ellis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2023-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: kleene
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sshkit
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +210,7 @@ files:
 - README.md
 - Rakefile
 - build.ops
+- cli2.rb
 - exe/ops
 - lib/opswalrus.rb
 - lib/opswalrus/_bootstrap.ops
@@ -229,6 +244,7 @@ files:
 - lib/opswalrus/zip.rb
 - opswalrus.gemspec
 - sig/opswalrus.rbs
+- test.ops
 - test.rb
 - vms/arch/Vagrantfile
 - vms/debian/Vagrantfile