Better test support

.ci/travis.sh

@@ -0,0 +1,17 @@
+#!/bin/bash -e
+
+if [[ "$(uname -s)" == 'Darwin' ]]; then
+    brew update
+    brew install python$PY3
+    pip$PY3 install pytest nose
+    pip$PY3 install paramiko
+    pip$PY3 install .
+else
+    pip install paramiko || true
+    pip install .
+fi
+
+echo NoHostAuthenticationForLocalhost yes >> ~/.ssh/config
+echo StrictHostKeyChecking no >> ~/.ssh/config
+ssh-keygen -q -f ~/.ssh/id_rsa -N ''
+cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys

.travis.yml

@@ -1,25 +1,23 @@
 sudo: required
 language: python
-python:
-    - "2.6"
-    - "2.7"
-    - "3.2"
-    - "3.3"
-    - "3.4"
-    - "3.5"
-    - "nightly"
-    - "pypy"
+matrix:
+  include:
+    - python: 2.6
+    - python: 2.7
+    - python: 3.2
+    - python: 3.3
+    - python: 3.4
+    - python: 3.5
+    - python: nightly
+    - python: pypy
+    - language: generic
+      os: osx
+    - language: generic
+      os: osx
+      env: PY3=3
 
-before_script:
-    - "pip install paramiko || true"
-    - "echo NoHostAuthenticationForLocalhost yes >> ~/.ssh/config"
-    - "echo StrictHostKeyChecking no >> ~/.ssh/config"
-    - "ssh-keygen -q -f ~/.ssh/id_rsa -N ''"
-    - "cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys"
-    - "python setup.py install"
-    - "cd tests"
-
-script: nosetests -vv -d
+install: .ci/travis.sh
+script: cd tests && python$PY3 -m pytest
 
 notifications:
     email:

appveyor.yml

@@ -0,0 +1,27 @@
+environment:
+  matrix:
+    - PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python34"
+# Python 3.5 has to rebuild Crypto, because binaries are not available yet
+
+install:
+  - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH%
+
+  # Check that we have the expected version and architecture for Python
+  - python --version
+  - python -c "import struct; print(struct.calcsize('P') * 8)"
+
+  # Upgrade to the latest version of pip to avoid it displaying warnings
+  # about it being out of date.
+  - pip install --disable-pip-version-check --user --upgrade pip
+
+  - pip install -r dev-requirements.txt
+  - pip install pypiwin32
+  - pip install .
+
+build: false
+
+test_script:
+  - ps: cd tests
+  - python -m pytest
+

dev-requirements.txt

@@ -0,0 +1,2 @@
+paramiko
+pytest

plumbum/_testtools.py

@@ -0,0 +1,35 @@
+import os
+import sys
+import unittest
+from plumbum import local
+from plumbum.lib import IS_WIN32
+
+def ensure_skipIf(unittest):
+    """
+    This will ensure that unittest has skipIf. Call like::
+
+        import unittest
+        ensure_skipIf(unittest)
+    """
+
+    if not hasattr(unittest, "skipIf"):
+        import logging
+        import functools
+        def skipIf(condition, reason):
+            def deco(func):
+                if not condition:
+                    return func
+                else:
+                    @functools.wraps(func)
+                    def wrapper(*args, **kwargs):
+                        logging.warn("skipping test: "+reason)
+                    return wrapper
+            return deco
+        unittest.skipIf = skipIf
+
+ensure_skipIf(unittest)
+skipIf = unittest.skipIf
+
+skip_on_windows = unittest.skipIf(IS_WIN32, "Does not work on Windows (yet)")
+skip_without_chown = unittest.skipIf(not hasattr(os, "chown"), "os.chown not supported")
+skip_without_tty = unittest.skipIf(not sys.stdin.isatty(), "Not a TTY")

plumbum/lib.py

@@ -77,28 +77,6 @@ def get_method_function(m):
 else:
     from StringIO import StringIO
 
-def ensure_skipIf(unittest):
-    """
-    This will ensure that unittest has skipIf. Call like::
-
-        import unittest
-        ensure_skipIf(unittest)
-    """
-
-    if not hasattr(unittest, "skipIf"):
-        import logging
-        import functools
-        def skipIf(condition, reason):
-            def deco(func):
-                if not condition:
-                    return func
-                else:
-                    @functools.wraps(func)
-                    def wrapper(*args, **kwargs):
-                        logging.warn("skipping test: "+reason)
-                    return wrapper
-            return deco
-        unittest.skipIf = skipIf
 
 @contextmanager
 def captured_stdout(stdin = ""):

plumbum/machines/local.py

@@ -293,16 +293,16 @@ def list_processes(self):
             """
             import csv
             tasklist = local["tasklist"]
-            lines = tasklist("/V", "/FO", "CSV").encode("utf8").splitlines()
+            lines = tasklist("/V", "/FO", "CSV").splitlines()
             rows = csv.reader(lines)
-            header = rows.next()
+            header = next(rows)
             imgidx = header.index('Image Name')
             pididx = header.index('PID')
             statidx = header.index('Status')
             useridx = header.index('User Name')
             for row in rows:
-                yield ProcInfo(int(row[pididx]), row[useridx].decode("utf8"),
-                    row[statidx].decode("utf8"), row[imgidx].decode("utf8"))
+                yield ProcInfo(int(row[pididx]), row[useridx],
+                    row[statidx], row[imgidx])
     else:
         def list_processes(self):
             """

setup.cfg

@@ -0,0 +1,3 @@
+[nosetests]
+verbosity=2
+detailed-errors=1

setup.py

@@ -2,13 +2,26 @@
 import os
 
 try:
-    from setuptools import setup
+    from setuptools import setup, Command
 except ImportError:
-    from distutils.core import setup
+    from distutils.core import setup, Command
 
 HERE = os.path.dirname(__file__)
 exec(open(os.path.join(HERE, "plumbum", "version.py")).read())
 
+class PyDocs(Command):
+    user_options = []
+    def initialize_options(self):
+        pass
+    def finalize_options(self):
+        pass
+    def run(self):
+        import subprocess
+        import sys
+        os.chdir('docs')
+        errno = subprocess.call(['make', 'html'])
+        sys.exit(errno)
+
 setup(name = "plumbum",
     version = version_string,  # @UndefinedVariable
     description = "Plumbum: shell combinators library",
@@ -20,6 +33,8 @@
     platforms = ["POSIX", "Windows"],
     provides = ["plumbum"],
     keywords = "path, local, remote, ssh, shell, pipe, popen, process, execution",
+    cmdclass = {
+                'docs':PyDocs},
     # use_2to3 = False,
     # zip_safe = True,
     long_description = open(os.path.join(HERE, "README.rst"), "r").read(),

tests/pytest.ini

@@ -1,3 +1,6 @@
-# This is for py.test -f with xdist plugin
 [pytest]
+
+# This is for py.test -f with xdist plugin
 looponfailroots = . ../plumbum
+
+addopts = -v --capture=sys

tests/test_cli.py

@@ -3,9 +3,7 @@
 
 from plumbum import cli, local
 from plumbum.cli.terminal import ask, choose, hexdump, Progress
-from plumbum.lib import captured_stdout, ensure_skipIf
-
-ensure_skipIf(unittest)
+from plumbum.lib import captured_stdout
 
 class TestApp(cli.Application):
     @cli.switch(["a"])
@@ -28,7 +26,7 @@ def main(self, *args):
         self.eggs = "lalala"
         self.eggs = old
         self.tailargs = args
-        
+
 
 
 class Geet(cli.Application):