shells 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 740e75fa474c1a977a1ad064cf3cb7da8be71c7a
-  data.tar.gz: 6f420afb22bbc58711c7b81da0ee3c709645b2b6
+  metadata.gz: 79a5181a0a44f0f7f3f58fa2d8016e882e1a0a85
+  data.tar.gz: 93cac3a6699467509be0e4165fa21c91b727d77e
 SHA512:
-  metadata.gz: b4cafdbf8b707bb08cb2d96dd3aefde829509200bdbb0e1770598bd0fa6e88d70f828894dc1794fbbcbfe552d697fd99d1369c6052b30b6eb7e939b6adc03f11
-  data.tar.gz: dfaeb51d1e5afe10ab2ed30589c64f7319b09d065532a37d63e65b92db1480b041a400362438db10b4124b1eed577459fb3bf16b3e80ba2d757a5e9c857566a0
+  metadata.gz: fd579203b87620a7d14bf40a31dbbeb5e4d4c66f13ac8b0e93fdca5b19de39c67ac63c0054359a03ed26a740aede2e624604ed017ab5270a5fdc5859098cecc9
+  data.tar.gz: 40a853476c627024cb33386434f7b3d612078ada71fd81f80d7287f767812e1e9a32daf5bba58f1d92c4663a69c90fff87f71c76c69eef4eb50e69b17ba8af85

data/lib/shells/shell_base.rb

@@ -545,6 +545,8 @@ module Shells
           end
 
       loop do
+        Thread.pass
+
         last_input = @last_input
 
         # Do we need to nudge the shell?

data/lib/shells/ssh_session.rb

@@ -32,7 +32,9 @@ module Shells
   #     resulting prompt can very easily become something else entirely.  If they are provided, they will be
   #     replaced to protect the shell from getting stuck.
   # +shell+::
-  #     If set to :shell, then the default shell is executed.
+  #     If set to :shell, then the default shell is executed.  This is the default value.
+  #     If set to :none, then no shell is executed, but a PTY is still created.
+  #     If set to :no_pty, then no shell is executed and no PTY is created.
   #     If set to anything else, it is assumed to be the executable path to the shell you want to run.
   # +quit+::
   #     If set, this defines the command to execute when quitting the session.
@@ -132,33 +134,38 @@ module Shells
           # open the channel
           debug 'Opening channel...'
           @channel = ssh.open_channel do |ch|
-            # request a PTY
-            debug 'Requesting PTY...'
-            ch.request_pty do |ch_pty, success_pty|
-              raise FailedToRequestPty unless success_pty
-
-              # pick a method to start the shell with.
-              meth = (options[:shell] == :shell) ? :send_channel_request : :exec
-
-              buffer_input
-
-              # start the shell
-              debug 'Starting shell...'
-              ch_pty.send(meth, options[:shell].to_s) do |ch_sh, success_sh|
-                raise FailedToStartShell unless success_sh
-
-                # give the shell a chance to get ready.
-                sleep 0.25
-
-                begin
-                  # yield to the block
-                  block.call
-
-                ensure
-                  # send the exit command.
-                  ignore_io_error = true
-                  debug 'Closing connection...'
-                  send_data options[:quit] + line_ending
+            # start buffering the channel output.
+            buffer_input
+
+            if options[:shell] == :no_pty
+              debug 'Executing session without PTY...'
+
+              ssh_exec_session &block
+            else
+              # request a PTY
+              debug 'Requesting PTY...'
+              ch.request_pty do |ch_pty, success_pty|
+                raise FailedToRequestPty unless success_pty
+
+                if options[:shell] == :none
+                  debug 'Executing session without shell...'
+
+                  ssh_exec_session &block
+                else
+                  # pick a method to start the shell with.
+                  meth = (options[:shell] == :shell) ? :send_channel_request : :exec
+
+                  # start the shell
+                  debug 'Starting shell...'
+                  ch_pty.send(meth, options[:shell].to_s) do |ch_sh, success_sh|
+                    raise FailedToStartShell unless success_sh
+
+                    # give the shell a chance to get ready.
+                    sleep 0.25
+
+                    debug 'Executing session in shell...'
+                    ssh_exec_session &block
+                  end
                 end
               end
             end
@@ -225,5 +232,18 @@ module Shells
       end
     end
 
+    private
+
+    def ssh_exec_session(&block)
+      begin
+        block.call
+      ensure
+        # send the exit command.
+        ignore_io_error = true
+        debug 'Closing connection...'
+        send_data options[:quit] + line_ending
+      end
+    end
+
   end
 end

data/lib/shells/version.rb

@@ -1,3 +1,3 @@
 module Shells
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

metadata

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