Make it possible to scp send and recv files without recursion where target path is a directory - copy to directory with same filename as source filename

Added tests for scp_recv and send with recursion off where target path is dir. 
Resolves #183 (#213)

Author: pkittenis

pssh/clients/native/single.py

@@ -505,6 +505,9 @@ def scp_recv(self, remote_file, local_file, recurse=False, sftp=None,
                 return self._scp_recv_dir(file_list, remote_file,
                                           local_file, sftp,
                                           encoding=encoding)
+        elif local_file.endswith('/'):
+            remote_filename = remote_file.rsplit('/')[-1]
+            local_file += remote_filename
         destination = os.path.join(os.path.sep, os.path.sep.join(
             [_dir for _dir in local_file.split('/')
              if _dir][:-1]))
@@ -577,6 +580,9 @@ def scp_send(self, local_file, remote_file, recurse=False, sftp=None):
                     self._eagain(sftp.stat, destination)
                 except (SFTPHandleError, SFTPProtocolError):
                     self.mkdir(sftp, destination)
+        elif remote_file.endswith('/'):
+            local_filename = local_file.rsplit('/')[-1]
+            remote_file += local_filename
         self._scp_send(local_file, remote_file)
         logger.info("SCP local file %s to remote destination %s:%s",
                     local_file, self.host, remote_file)

tests/native/test_single_client.py

@@ -434,3 +434,85 @@ def test_scp_send_large_file(self):
                     os.unlink(_path)
                 except Exception:
                     pass
+
+    def test_scp_send_dir_target(self):
+        cur_dir = os.path.dirname(__file__)
+        file_name = 'file1'
+        file_path_from = os.path.sep.join([cur_dir, file_name])
+        file_copy_to_dirpath = os.path.expanduser('~/')
+        file_copy_to_abs = file_copy_to_dirpath + file_name
+        for _path in (file_path_from, file_copy_to_abs):
+            try:
+                os.unlink(_path)
+            except OSError:
+                pass
+        try:
+            with open(file_path_from, 'wb') as fh:
+                fh.write(b"adsfasldkfjabafj")
+            self.client.scp_send(file_path_from, file_copy_to_dirpath)
+            self.assertTrue(os.path.isfile(file_copy_to_abs))
+        finally:
+            for _path in (file_path_from, file_copy_to_abs):
+                try:
+                    os.unlink(_path)
+                except OSError:
+                    pass
+        # Relative path
+        file_copy_to_dirpath = './'
+        for _path in (file_path_from, file_copy_to_abs):
+            try:
+                os.unlink(_path)
+            except OSError:
+                pass
+        try:
+            with open(file_path_from, 'wb') as fh:
+                fh.write(b"adsfasldkfjabafj")
+            self.client.scp_send(file_path_from, file_copy_to_dirpath)
+            self.assertTrue(os.path.isfile(file_copy_to_abs))
+        finally:
+            for _path in (file_path_from, file_copy_to_abs):
+                try:
+                    os.unlink(_path)
+                except OSError:
+                    pass
+
+    def test_scp_recv_dir_target(self):
+        cur_dir = os.path.dirname(__file__)
+        file_name = 'file1'
+        file_path_from = os.path.sep.join([cur_dir, file_name])
+        file_copy_to_dirpath = os.path.expanduser('~/')
+        file_copy_to_abs = file_copy_to_dirpath + file_name
+        for _path in (file_path_from, file_copy_to_abs):
+            try:
+                os.unlink(_path)
+            except OSError:
+                pass
+        try:
+            with open(file_path_from, 'wb') as fh:
+                fh.write(b"adsfasldkfjabafj")
+            self.client.scp_recv(file_path_from, file_copy_to_dirpath)
+            self.assertTrue(os.path.isfile(file_copy_to_abs))
+        finally:
+            for _path in (file_path_from, file_copy_to_abs):
+                try:
+                    os.unlink(_path)
+                except OSError:
+                    pass
+        # Relative path
+        file_copy_to_dirpath = './'
+        for _path in (file_path_from, file_copy_to_abs):
+            try:
+                os.unlink(_path)
+            except OSError:
+                pass
+        try:
+            with open(file_path_from, 'wb') as fh:
+                fh.write(b"adsfasldkfjabafj")
+            self.client.scp_send(file_path_from, file_copy_to_dirpath)
+            self.assertTrue(os.path.isfile(file_copy_to_abs))
+        finally:
+            for _path in (file_path_from, file_copy_to_abs):
+                try:
+                    os.unlink(_path)
+                except OSError:
+                    pass