Added returning stdin in output. Added flag to turn off use of pty

Author: Dan

pssh/pssh_client.py

@@ -516,22 +516,22 @@ def get_output(self, cmd, output):
         0
         """
         try:
-            (channel, host, stdout, stderr) = cmd.get()
+            (channel, host, stdout, stderr, stdin) = cmd.get()
         except Exception, ex:
             try:
                 host = ex.args[1]
             except IndexError:
                 logger.error("Got exception with no host argument - "
                              "cannot update output data with %s", ex)
                 raise ex
-            self._update_host_output(output, host, None, None, None, None, cmd,
+            self._update_host_output(output, host, None, None, None, None, None, cmd,
                                      exception=ex)
             raise ex
         self._update_host_output(output, host, self._get_exit_code(channel),
-                                 channel, stdout, stderr, cmd)
+                                 channel, stdout, stderr, stdin, cmd)
 
     def _update_host_output(self, output, host, exit_code, channel, stdout,
-                            stderr, cmd, exception=None):
+                            stderr, stdin, cmd, exception=None):
         """Update host output with given data"""
         if host in output:
             new_host = "_".join([host,
@@ -546,6 +546,7 @@ def _update_host_output(self, output, host, exit_code, channel, stdout,
                              'channel' : channel,
                              'stdout' : self._read_buff_ex_code(stdout, output),
                              'stderr' : self._read_buff_ex_code(stderr, output),
+                             'stdin' : stdin,
                              'cmd' : cmd,
                              'exception' : exception,})
 
@@ -615,7 +616,7 @@ def get_stdout(self, greenlet, return_buffers=False):
         warnings.warn("This method is being deprecated and will be removed in"
                       "future releases - use self.get_output instead", DeprecationWarning)
         gevent.sleep(.2)
-        channel, host, stdout, stderr = greenlet.get()
+        channel, host, stdout, stderr, stdin = greenlet.get()
         if channel.exit_status_ready():
             channel.close()
         else:

pssh/ssh_client.py

@@ -202,30 +202,46 @@ def _connect(self, client, host, port, sock=None, retries=1):
 
     def exec_command(self, command, sudo=False, user=None,
                      shell=None,
-                     use_shell=True, **kwargs):
+                     use_shell=True, use_pty=True,
+                     **kwargs):
         """Wrapper to :mod:`paramiko.SSHClient.exec_command`
         
         Opens a new SSH session with a new pty and runs command before yielding 
         the main gevent loop to allow other greenlets to execute.
         
-        :param command: Shell command to execute
+        :param command: Cxommand to execute
         :type command: str
         :param sudo: (Optional) Run with sudo. Defaults to False
         :type sudo: bool
+        :param user: (Optional) User to switch to via sudo to run command as. \
+        Defaults to user running the python process
+        :type user: str
+        :param shell: (Optional) Shell override to use instead of user login \
+        configured shell. For example ``shell='bash -c'``
+        :param use_shell: (Optional) Force use of shell on/off. \
+        Defaults to `True` for on
+        :type use_shell: bool
+        :param use_pty: (Optional) Enable/Disable use of pseudo terminal \
+        emulation. This is required in vast majority of cases, exception \
+        being where a shell is not used and stdout/stderr/stdin buffers \
+        are not required. Defaults to ``True``
+        :type use_pty: bool
         :param kwargs: (Optional) Keyword arguments to be passed to remote \
         command
         :type kwargs: dict
-        :rtype: Tuple of `(channel, hostname, stdout, stderr)`. \
+        :rtype: Tuple of `(channel, hostname, stdout, stderr, stdin)`. \
         Channel is the remote SSH channel, needed to ensure all of stdout has \
         been got, hostname is remote hostname the copy is to, stdout and \
         stderr are buffers containing command output.
         """
         channel = self.client.get_transport().open_session()
         if self.forward_ssh_agent:
             agent_handler = paramiko.agent.AgentRequestHandler(channel)
-        channel.get_pty()
+        if use_pty:
+            channel.get_pty()
         if self.channel_timeout:
             channel.settimeout(self.channel_timeout)
+        stdin = channel.makefile('wb')
         _stdout, _stderr = channel.makefile('rb'), \
                            channel.makefile_stderr('rb')
         stdout, stderr = self._read_output_buffer(_stdout,), \
@@ -247,7 +263,7 @@ def exec_command(self, command, sudo=False, user=None,
         channel.exec_command(_command, **kwargs)
         logger.debug("Command started")
         sleep(0)
-        return channel, self.host, stdout, stderr
+        return channel, self.host, stdout, stderr, stdin
 
     def _read_output_buffer(self, output_buffer, prefix=''):
         """Read from output buffers and log to host_logger"""