shells 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a2ba35d263f193785009154e37b502bcfdb16db
-  data.tar.gz: fc7c24f3388a2d992cf919fa8bbc930adcf4f473
+  metadata.gz: b47a6e5df048fa8ed1229c13015262da125d6cd2
+  data.tar.gz: 88b2df4f88cfe64c16193d217e9e8d53108407ea
 SHA512:
-  metadata.gz: 73072e5a54ae4fcc53db8ab731d9ee912183fa50489c787f1f5088e72f4a5be0dfdac08ec131223fd89fd30cb4491c832288510f4b8e69be032dc9a74a402198
-  data.tar.gz: 02f61d4eda6f334c68ccf94426083c304e7c88d935cc09a41f68e1f68b34b688c427c8ff4cb41d2efcb8c5073900529c4e22775b49e31b07cda31eadfeb8f710
+  metadata.gz: 2582f949e419ef6652ec454ff6e2be3c8c895f6c45f23fcb43d054812d227a11ee1a2b10059ff4a21c5b0f30cf68dd020180777027dee0234bea37850f894f1d
+  data.tar.gz: 8f132e4aaf642a5c6e2584ce2d0e3a80761458a189ef892f24a981ea2417750aa6b3fc08022bf6c57015824b5de531bd3d4843f389f2029d72d51c47827ac887

data/lib/shells/serial_session.rb

@@ -138,10 +138,10 @@ module Shells
       else
         # set the prompt, wait up to 2 seconds for a response, then try one more time.
         begin
-          exec cmd, command_timeout: 2, retrieve_exit_code: false
+          exec cmd, command_timeout: 2, retrieve_exit_code: false, command_is_echoed: false
         rescue Shells::CommandTimeout
           begin
-            exec cmd, command_timeout: 2, retrieve_exit_code: false
+            exec cmd, command_timeout: 2, retrieve_exit_code: false, command_is_echoed: false
           rescue Shells::CommandTimeout
             raise Shells::FailedToSetPrompt
           end

data/lib/shells/shell_base.rb

@@ -349,6 +349,7 @@ module Shells
       options[:on_non_zero_exit_code] = self.options[:on_non_zero_exit_code] unless [:raise, :ignore].include?(options[:on_non_zero_exit_code])
       options[:silence_timeout] = self.options[:silence_timeout] if options[:silence_timeout] == :default
       options[:command_timeout] = self.options[:command_timeout] if options[:command_timeout] == :default
+      options[:command_is_echoed] = true if options[:command_is_echoed].nil?
       ret = ''
 
       begin
@@ -365,7 +366,7 @@ module Shells
         if wait_for_prompt(options[:silence_timeout], options[:command_timeout], options[:timeout_error])
           # get the output of the command, minus the trailing prompt.
           debug 'Reading output of command...'
-          ret = command_output command
+          ret = command_output command, options[:command_is_echoed]
 
           if options[:retrieve_exit_code]
             self.last_exit_code = get_exit_code
@@ -794,7 +795,7 @@ module Shells
       data.gsub("\r\n", "\n").gsub(" \r", "").gsub("\r", "")
     end
 
-    def command_output(command)
+    def command_output(command, expect_command = true)
       # get everything except for the ending prompt.
       ret =
           if (prompt_pos = (combined_output =~ prompt_match))
@@ -803,21 +804,26 @@ module Shells
             combined_output
           end
 
-      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 == '' || result_cmd.strip =~ command_regex
-        result_cmd,_,result_data = result_data.partition("\n")
-      end
-      
-      if result_cmd.nil? || !(result_cmd =~ command_regex)
-        STDERR.puts "SHELL WARNING: Failed to match #{command_regex.inspect}."
+      if expect_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 == '' || result_cmd.strip =~ command_regex
+          result_cmd,_,result_data = result_data.partition("\n")
+        end
+        
+        if result_cmd.nil? || !(result_cmd =~ command_regex)
+          STDERR.puts "SHELL WARNING: Failed to match #{command_regex.inspect}."
+        end
+        
+        result_data
+      else
+        ret
       end
-      
-      result_data
     end
 
     def strip_ansi_escape(data)

data/lib/shells/ssh_session.rb

@@ -186,10 +186,10 @@ module Shells
       else
         # set the prompt, wait up to 2 seconds for a response, then try one more time.
         begin
-          exec cmd, command_timeout: 2, retrieve_exit_code: false
+          exec cmd, command_timeout: 2, retrieve_exit_code: false, command_is_echoed: false
         rescue Shells::CommandTimeout
           begin
-            exec cmd, command_timeout: 2, retrieve_exit_code: false
+            exec cmd, command_timeout: 2, retrieve_exit_code: false, command_is_echoed: false
           rescue Shells::CommandTimeout
             raise Shells::FailedToSetPrompt
           end

data/lib/shells/version.rb

@@ -1,3 +1,3 @@
 module Shells
-  VERSION = "0.1.20"
+  VERSION = "0.1.21"
 end

metadata

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