shells 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82862e0912920fa623b0766397114fbddd0f883c
-  data.tar.gz: 2d4e7708eb054fc3d43a839e0ec255a0c527719f
+  metadata.gz: b8ce1479a5f2cf6fb8e8c529c92e74eb01bfb060
+  data.tar.gz: 81d5db302e9090470be0f6372ab3e5b6d37a5cfc
 SHA512:
-  metadata.gz: 8984c76d9eda00e16cbb802168c503dd90613cdb99878de4b8be5645d5dc1a57d41628233b07f6b5bd20ac865accdbd3ea8363a0b8f8c508e3ceae3125f5b095
-  data.tar.gz: cc06b29917d6edb6316263cfacd2cc01e53c7c0c65e12c0852cba7d3b79ec1f2f0775f7ace663284e3a1dab784712e6764228e93808bf3373d21f632c4b6df9e
+  metadata.gz: 27e194bfd7653f47a0bf98fb4e3a9186947df74a5b85947fd3f8677480f81eb857f930a1e96cbd848a5ab2799fa87b6a78c53ac05cdfa92beecae19939a09914
+  data.tar.gz: 46fd5021248dfe908cdb4c411393c0a972d57bdb2800cdf0ba5663306c42606de7c608bc606e1ca89fd11124fe4315d9a75ee697bf55e454255088d4adae1709

data/lib/shells/bash_common.rb

@@ -80,7 +80,7 @@ module Shells
         debug 'Retrieving exit code from last command...'
         push_buffer
         send_data cmd + line_ending
-        wait_for_prompt nil, 1
+        wait_for_prompt 1, 2
         ret = command_output(cmd).strip.to_i
         pop_discard_buffer
         debug 'Exit code: ' + ret.to_s

data/lib/shells/ssh_session.rb

@@ -131,7 +131,7 @@ module Shells
 
           # open the channel
           debug 'Opening channel...'
-          ssh.open_channel do |ch|
+          @channel = ssh.open_channel do |ch|
             # request a PTY
             debug 'Requesting PTY...'
             ch.request_pty do |ch_pty, success_pty|
@@ -140,7 +140,6 @@ module Shells
               # pick a method to start the shell with.
               meth = (options[:shell] == :shell) ? :send_channel_request : :exec
 
-              @channel = ch_pty
               buffer_input
 
               # start the shell
@@ -161,17 +160,14 @@ module Shells
                   debug 'Closing connection...'
                   send_data options[:quit] + line_ending
                 end
-
-                @channel.wait
               end
-
             end
-
-            debug 'Waiting for channel to close...'
-            ch.wait
-            debug 'Channel has been closed.'
           end
 
+          debug 'Waiting for channel to close...'
+          @channel.wait
+          debug 'Channel has been closed.'
+
         end
       rescue IOError
         unless ignore_io_error

data/lib/shells/version.rb

@@ -1,3 +1,3 @@
 module Shells
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shells
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Beau Barker
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh