Use ProxyCommand from ~/.ssh/config if configured. This resolves #6

Author: Dan

pssh.py

@@ -19,13 +19,13 @@
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 """
 
+import logging
 import gevent.pool
 from gevent import socket
-import paramiko
-import os
-import logging
 from gevent import monkey
 monkey.patch_all()
+import paramiko
+import os
 
 host_logger = logging.getLogger('host_logging')
 handler = logging.StreamHandler()
@@ -37,15 +37,13 @@
 
 logger = logging.getLogger(__name__)
 
-
 def _setup_logger(_logger):
     """Setup default logger"""
     _handler = logging.StreamHandler()
     log_format = logging.Formatter('%(name)s - %(asctime)s - %(levelname)s - %(message)s')
     _handler.setFormatter(log_format)
     _logger.addHandler(handler)
     _logger.setLevel(logging.DEBUG)
-
 
 class UnknownHostException(Exception):
     """Raised when a host is unknown (dns failure)"""
@@ -93,7 +91,7 @@ def __init__(self, host,
         _ssh_config_file = os.path.sep.join([os.path.expanduser('~'),
                                              '.ssh',
                                              'config'])
-        # Load ~/.ssh/config if it exists to pick up username
+        # Load ~/.ssh/config if it exists to pick up username, ProxyCommand
         # and host address if set
         if os.path.isfile(_ssh_config_file):
             ssh_config.parse(open(_ssh_config_file))
@@ -115,14 +113,20 @@ def __init__(self, host,
         self.pkey = pkey
         self.port = port if port else 22
         self.host = resolved_address
+        self.proxy_command = paramiko.ProxyCommand(host_config['proxycommand']) if 'proxycommand' in \
+                             host_config else None
+        if self.proxy_command:
+            logger.debug("Proxy configured for destination host %s - ProxyCommand: '%s'" % (
+                self.host, " ".join(self.proxy_command.cmd),))
         self._connect()
 
     def _connect(self, retries=1):
         """Connect to host, throw UnknownHost exception on DNS errors"""
         try:
             self.client.connect(self.host, username=self.user,
                                 password=self.password, port=self.port,
-                                pkey=self.pkey)
+                                pkey=self.pkey,
+                                sock=self.proxy_command)
         except socket.gaierror, e:
             logger.error("Could not resolve host '%s'", self.host,)
             while retries < NUM_RETRIES: