shells 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb503621ed53873d55b579bbe6f2c9ef8e031ce
-  data.tar.gz: 0da90d54124b3e02c55c2ac3df69f6b8db09d871
+  metadata.gz: c2a2c0a0dc3fae93cfcca240627c9b95c27fd0c5
+  data.tar.gz: a50b317403339b3e08ec82a1da7eb2514797d509
 SHA512:
-  metadata.gz: ea7e947ee7797532aeb53dcde2ba5b92fd84580f7178820a0cefbf7253a973ac0bfa7246116906196769312b28f3752ea4fcd391a51c956a3f798208de594811
-  data.tar.gz: cc983d7364478548eeee1d081526b5c734a431ab19511345dc5f02b558a711e36c101ef4c8876b3f0aed4a54ca2a3b496e28226423a3497929bffbfab2e93e7c
+  metadata.gz: add66dd57d2f813499b65b4ecfa417a814cf6e56d3b565d9ebfe2a2d6838c78eefb4e71ab6a3eafc297860dbff6fd9fb166c37825f8dba771151c3a747b23aed
+  data.tar.gz: 7eaefcc0d6e2cd7c7671762f2971ae0b4d9bff6b8bec64891b0e7835355eb543017991ee43113d24065aa8d14cf3c1aebb87f8682b8761e3dd9d797f03fd631f

data/lib/shells/shell_base.rb

@@ -803,17 +803,13 @@ module Shells
             combined_output
           end
 
-      possible_starts = [
-          command,
-          options[:prompt] + command,
-          options[:prompt] + ' ' + command
-      ]
-
+      command_regex = command_match(command)
+      
       # Go until we run out of data or we find one of the possible command starts.
       # Note that we EXPECT the command to the first line of the output from the command because we expect the
       # shell to echo it back to us.
       result_cmd,_,result_data = ret.partition("\n")
-      until result_data.to_s.strip == '' || possible_starts.include?(result_cmd)
+      until result_data.to_s.strip == '' || result_cmd.strip =~ command_regex
         result_cmd,_,result_data = result_data.partition("\n")
       end
 
@@ -842,7 +838,19 @@ module Shells
     def stdcomb_hist
       @stdcomb_hist ||= []
     end
-
+    
+    def command_match(command)
+      p = @options[:prompt]
+              .gsub('[', '\\[')
+              .gsub('(', '\\(')
+              .gsub('.', '\\.')
+              .gsub('*', '\\*')
+              .gsub('{', '\\{')
+              .gsub('?', '\\?')
+      
+      /\A(?:#{p}\s*)?#{command}\z/
+    end
+    
     def prompt_match
       # allow for trailing spaces or tabs, but no other whitespace.
       @prompt_match ||= /#{@options[:prompt]}[ \t]*$/

data/lib/shells/version.rb

@@ -1,3 +1,3 @@
 module Shells
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shells
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Beau Barker