Changed hardcoded bash to user login defined shell. Added multiple single quote test

Author: Dan

pssh/ssh_client.py

@@ -187,12 +187,13 @@ def _connect(self, client, host, port, sock=None, retries=1):
             logger.error(msg)
             raise SSHException(msg, host, port)
 
-    def exec_command(self, command, sudo=False, user=None, **kwargs):
+    def exec_command(self, command, sudo=False, user=None,
+                     shell=None,
+                     use_shell=True, **kwargs):
         """Wrapper to :mod:`paramiko.SSHClient.exec_command`
         
-        Opens a new SSH session with a new pty and runs command with given \
-        `kwargs` if any. Greenlet then yields (sleeps) while waiting for \
-        command to finish executing or channel to close indicating the same.
+        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
         :type command: str
@@ -217,15 +218,19 @@ def exec_command(self, command, sudo=False, user=None, **kwargs):
         stdout, stderr = self._read_output_buffer(_stdout,), \
                          self._read_output_buffer(_stderr,
                                                   prefix='\t[err]')
+
+        shell = '$SHELL -c' if not shell else shell
+        _command = ''
         if sudo and not user:
-            command = 'sudo -S bash -c \'%s\'' % (command,)
+            _command = 'sudo -S '
         elif user:
-            command = 'sudo -u %s -S bash -c \'%s\'' % (
-                user, command,)
+            _command = 'sudo -u %s -S ' % (user,)
+        if use_shell:
+            _command += '%s \'%s\'' % (shell, command,)
         else:
-            command = 'bash -c \'%s\'' % (command,)
-        logger.debug("Running command %s on %s", command, self.host)
-        channel.exec_command(command, **kwargs)
+            _command += '\'%s\'' % (command,)
+        logger.debug("Running parsed command %s on %s", _command, self.host)
+        channel.exec_command(_command, **kwargs)
         logger.debug("Command started")
         sleep(0)
         return channel, self.host, stdout, stderr

tests/test_pssh_client.py

@@ -601,3 +601,16 @@ def test_ssh_exception(self):
             raise Exception("Expected SSHException")
         server.kill()
         del _socket
+
+    def test_multiple_single_quotes_in_cmd(self):
+        output = self.client.run_command("echo 'me' 'and me'")
+        self.client.join(output)
+        stdout = list(output[self.host]['stdout'])
+        expected = 'me and me'
+        self.assertTrue(output[self.host]['exit_code'] == 0,
+                        msg="Error executing cmd with multiple single quotes - %s" % (
+                            stdout,))
+        self.assertEqual([expected], stdout,
+                         msg="Got unexpected output. Expected %s, got %s" % (
+                             expected, stdout,))
+