Broke directory copy logic into copy_dir; added recurse flag.

Author: Kincaid Savoie

pssh/ssh_client.py

@@ -263,7 +263,16 @@ def mkdir(self, sftp, directory):
             logger.error("Error occured creating directory %s on %s - %s",
                          directory, self.host, error)
 
-    def copy_file(self, local_file, remote_file):
+    def _copy_dir(self, local_dir, remote_dir):
+        """Calls copy_file on every file in the specified directory, copying
+        them to the specified remote directory."""
+        file_list = os.listdir(local_dir)
+        for file_name in file_list:
+            local_path = os.path.join(local_dir, file_name)
+            remote_path = os.path.join(remote_dir, file_name)
+            self.copy_file(local_path, remote_path)
+
+    def copy_file(self, local_file, remote_file, recurse=False):
         """Copy local file to host via SFTP/SCP
         
         Copy is done natively using SFTP/SCP version 2 protocol, no scp command \
@@ -274,25 +283,21 @@ def copy_file(self, local_file, remote_file):
         :param remote_file: Remote filepath on remote host to copy file to
         :type remote_file: str
         """
-        if os.path.isfile(local_file):
+        if os.path.isfile(local_file) or not recurse:
             sftp = self._make_sftp()
             destination = [_dir for _dir in remote_file.split(os.path.sep)
                            if _dir][:-1]
             if remote_file.startswith(os.path.sep):
                 destination[0] = os.path.sep + destination[0]
             # import ipdb; ipdb.set_trace()
             try:
-                sftp.stat(destination)
+                sftp.stat(destination[0])
             except IOError:
-                self.mkdir(sftp, destination)
+                self.mkdir(sftp, destination[0])
             try:
                 sftp.put(local_file, remote_file)
             except Exception, error:
                 logger.error("Error occured copying file %s to remote destination %s:%s - %s",
                              local_file, self.host, remote_file, error)
         else:
-            file_list = os.listdir(local_file)
-            for file_name in file_list:
-                local_path = os.path.join(local_file, file_name)
-                remote_path = os.path.join(remote_file, file_name)
-                self.copy_file(local_path, remote_path)
+            self._copy_dir(local_file, remote_file)