Added coveralls test coverage. Updated readme. Moved testing code outside module into separate file.

Author: Dan

.coveragerc

@@ -0,0 +1,6 @@
+[report]
+omit =
+    */python?.?/*
+    */site-packages/nose/*
+    fake_server/*
+    tests/*

.travis.yml

@@ -4,7 +4,10 @@ python:
   - "2.7"
 install:
   - pip install -r requirements.txt
-script: nosetests
+  - pip install coveralls
+script: nosetests --with-coverage --cover-package=pssh
 notifications:
   email:
     on_failure: change
+after_success:
+  coveralls

README.rst

@@ -9,6 +9,14 @@ This is a *requirement* for commands on many (hundreds/thousands/hundreds of tho
 
 .. image:: https://api.travis-ci.org/pkittenis/parallel-ssh.png?branch=master
 	:target: https://travis-ci.org/pkittenis/parallel-ssh
+.. image:: https://coveralls.io/repos/pkittenis/parallel-ssh/badge.png?branch=master
+  :target: https://coveralls.io/r/pkittenis/parallel-ssh?branch=master
+.. image:: https://pypip.in/version/parallel-ssh/badge.png
+  :target: https://pypip.in/version/parallel-ssh
+  :alt: version
+.. image:: https://pypip.in/download/parallel-ssh/badge.png
+  :target: https://pypip.in/download/parallel-ssh
+  :alt: downloads
 
 Module documentation can be found at the repository's `github pages`_.
 
@@ -18,9 +26,6 @@ Module documentation can be found at the repository's `github pages`_.
 Installation
 ************
 
-.. note ::
-   libevent-dev package is no longer required as of gevent 1.0 which has migrated to libev. `parallel-ssh` now requires at least gevent version 1.0.
-
 ::
 
    $ pip install parallel-ssh

pssh.py

@@ -41,14 +41,6 @@
 NUM_RETRIES = 3
 
 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)"""
@@ -122,10 +114,7 @@ def __init__(self, host,
                             'hostname' in host_config
                             else host)
         _user = host_config['user'] if 'user' in host_config else None
-        if user:
-            user = user
-        else:
-            user = _user
+        user = user if user else _user
         client = paramiko.SSHClient()
         client.set_missing_host_key_policy(paramiko.MissingHostKeyPolicy())
         self.forward_ssh_agent = forward_ssh_agent
@@ -489,24 +478,3 @@ def _copy_file(self, host, local_file, remote_file):
                                                 port=self.port, pkey=self.pkey,
                                                 forward_ssh_agent=self.forward_ssh_agent)
         return self.host_clients[host].copy_file(local_file, remote_file)
-
-    
-def test():
-    client = SSHClient('localhost')
-    channel, host, stdout, stderr = client.exec_command('ls -ltrh')
-    for line in stdout:
-        print line.strip()
-    client.copy_file('../test', 'test_dir/test')
-
-def test_parallel():
-    client = ParallelSSHClient(['localhost'])
-    cmds = client.exec_command('ls -ltrh')
-    output = [client.get_stdout(cmd, return_buffers=True) for cmd in cmds]
-    print output
-    cmds = client.copy_file('../test', 'test_dir/test')
-    client.pool.join()
-
-if __name__ == "__main__":
-    _setup_logger(logger)
-    test()
-    test_parallel()

pssh_test.py

@@ -0,0 +1,32 @@
+from pssh import SSHClient, ParallelSSHClient
+import logging
+
+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)
+    
+def test():
+    client = SSHClient('localhost')
+    channel, host, stdout, stderr = client.exec_command('ls -ltrh')
+    for line in stdout:
+        print line.strip()
+    client.copy_file('../test', 'test_dir/test')
+
+def test_parallel():
+    client = ParallelSSHClient(['localhost'])
+    cmds = client.exec_command('ls -ltrh')
+    output = [client.get_stdout(cmd, return_buffers=True) for cmd in cmds]
+    print output
+    cmds = client.copy_file('../test', 'test_dir/test')
+    client.pool.join()
+
+if __name__ == "__main__":
+    _setup_logger(logger)
+    test()
+    test_parallel()

tests/test_pssh_client.py

@@ -20,7 +20,7 @@
 
 import unittest
 from pssh import ParallelSSHClient, UnknownHostException, \
-    AuthenticationException, ConnectionErrorException, _setup_logger
+    AuthenticationException, ConnectionErrorException
 from fake_server.fake_server import start_server, make_socket, logger as server_logger, \
     paramiko_logger
 import random
@@ -30,9 +30,6 @@
 import paramiko
 import os
 
-# _setup_logger(server_logger)
-# _setup_logger(paramiko_logger)
-
 USER_KEY = paramiko.RSAKey.from_private_key_file(
     os.path.sep.join([os.path.dirname(__file__), 'test_client_private_key']))
 

tests/test_ssh_client.py

@@ -19,18 +19,14 @@
 """
 
 import unittest
-from pssh import SSHClient, ParallelSSHClient, UnknownHostException, AuthenticationException, _setup_logger, logger
+from pssh import SSHClient, ParallelSSHClient, UnknownHostException, AuthenticationException, logger
 from fake_server.fake_server import start_server, make_socket, logger as server_logger, \
     paramiko_logger
 from fake_server.fake_agent import FakeAgent
 import paramiko
 import os
 from test_pssh_client import USER_KEY
 
-# _setup_logger(server_logger)
-# _setup_logger(logger)
-# _setup_logger(paramiko_logger)
-
 USER_KEY = paramiko.RSAKey.from_private_key_file(
     os.path.sep.join([os.path.dirname(__file__), 'test_client_private_key']))