fix Envencode issue on windows

.gitignore

@@ -25,3 +25,4 @@ cram.egg-info
 tags
 cscope.*
 .idea
+.tox

.travis.yml

@@ -1,67 +1,43 @@
 language: python
 
+before_install:
+  - sudo apt-get install -y zsh
+
+install:
+  - pip install -r requirements-ci.txt -r requirements.txt
+
 matrix:
   allow_failures:
-    - python: nightly
-      env: TESTOPTS=--shell=dash
     - python: pypy
-      env: TESTOPTS=--shell=dash
+      env: TOXENV=pypy TESTOPTS=--shell=dash TOX_TESTENV_PASSENV="TESTOPTS"
     - python: pypy3
-      env: TESTOPTS=--shell=dash
+      env: TOXENV=pypy3 TESTOPTS=--shell=dash TOX_TESTENV_PASSENV="TESTOPTS"
+
   include:
+    - python: "3.4"
+      env: TOXENV=flake8 TESTOPTS=--shell=dash TOX_TESTENV_PASSENV="TESTOPTS"
+    - python: "3.4"
+      env: TOXENV=manifest TESTOPTS=--shell=dash TOX_TESTENV_PASSENV="TESTOPTS"
+
+    - python: "2.7"
+      env: TOXENV=py27 TESTOPTS=--shell=dash TOX_TESTENV_PASSENV="TESTOPTS"
+
+    - python: "3.4"
+      env: TOXENV=py34 TESTOPTS=--shell=dash TOX_TESTENV_PASSENV="TESTOPTS"
+
     - python: "3.5"
-      env: TESTOPTS=--shell=dash
+      env: TOXENV=py35 TESTOPTS=--shell=dash TOX_TESTENV_PASSENV="TESTOPTS"
     - python: "3.5"
-      env: TESTOPTS=--shell=bash
+      env: TOXENV=py35 TESTOPTS=--shell=bash TOX_TESTENV_PASSENV="TESTOPTS"
     - python: "3.5"
-      env: TESTOPTS=--shell=zsh
-      addons:
-        apt:
-          packages:
-            - zsh
-    - python: "3.4"
-      env: TESTOPTS=--shell=dash
-    - python: "3.3"
-      env: TESTOPTS=--shell=dash
-    - python: "3.2"
-      env: TESTOPTS=--shell=dash
-    - python: "2.7"
-      env: TESTOPTS=--shell=dash
-    - python: "2.6"
-      env: TESTOPTS=--shell=dash
-    - env: PYTHON=2.5 TESTOPTS=--shell=dash
-      addons:
-        apt:
-          sources:
-            - deadsnakes
-          packages:
-            - python2.5
-    - env: PYTHON=2.4 TESTOPTS=--shell=dash
-      addons:
-        apt:
-          sources:
-            - deadsnakes
-          packages:
-            - python2.4
-    - python: nightly
-      env: TESTOPTS=--shell=dash
-    - python: pypy
-      env: TESTOPTS=--shell=dash
-    - python: pypy3
-      env: TESTOPTS=--shell=dash
-  fast_finish: true
+      env: TOXENV=py35 TESTOPTS=--shell=zsh TOX_TESTENV_PASSENV="TESTOPTS"
 
-install: |
-  if [ -z "$PYTHON" ]
-  then
-    [ "$TRAVIS_PYTHON_VERSION" = "3.2" ] && pip install coverage==3.7.1
-    pip install -r requirements.txt
-  fi
+    - python: "3.6"
+      env: TOXENV=py36 TESTOPTS=--shell=dash TOX_TESTENV_PASSENV="TESTOPTS"
+    - python: "3.6"
+      env: TOXENV=py36 TESTOPTS=--shell=bash TOX_TESTENV_PASSENV="TESTOPTS"
+    - python: "3.6"
+      env: TOXENV=py36 TESTOPTS=--shell=zsh TOX_TESTENV_PASSENV="TESTOPTS"
 
-script: |
-  if [ -z "$PYTHON" ]
-  then
-    make test TESTOPTS="$TESTOPTS"
-  else
-    make quicktest PYTHON="python$PYTHON"
-  fi
+script:
+  - tox

MANIFEST.in

@@ -1,5 +1,6 @@
 include .coveragerc .pylintrc .travis.yml Makefile MANIFEST.in
 include *.md *.rst *.txt contrib/* scripts/*
 exclude contrib/PKGBUILD
+include tox.ini
 recursive-include examples *.t
 recursive-include tests *.py *.sh *.t

cram/_test.py

@@ -107,7 +107,7 @@ def test(lines, shell='/bin/sh', indent=2, testname=None, env=None,
 
     if isinstance(shell, (bytestype, unicodetype)):
         shell = [shell]
-    env['TESTSHELL'] = shell[0]
+    env['TESTSHELL'] = envencode(shell[0])
 
     if debug:
         stdin = []

requirements-ci.txt

@@ -0,0 +1 @@
+tox

requirements.txt

@@ -1,4 +1 @@
-check-manifest
 coverage
-pep8
-pyflakes

setup.cfg

@@ -7,3 +7,6 @@ universal = true
 # E301: expected blank line
 # E302: two new lines between functions/etc.
 ignore = E129,E261,E301,E302
+
+[flake8]
+ignore = E129,E261,E301,E302

setup.py

@@ -19,6 +19,7 @@ def long_description():
     """Get the long description from the README"""
     return open(os.path.join(sys.path[0], 'README.rst')).read()
 
+
 setup(
     author='Brodie Rao',
     author_email='brodie@bitheap.org',

tox.ini

@@ -0,0 +1,34 @@
+[tox]
+envlist = py27,py34,py35,py36,pypy,pypy3,flake8,manifest
+minversion = 2.0
+skip-missing-interpreters = True
+
+[testenv]
+deps = -rrequirements.txt
+commands =
+    make test TESTOPTS="{env:TESTOPTS}"
+whitelist_externals = make
+
+[testenv:flake8]
+basepython = python3.4
+commands =
+    flake8 setup.py cram
+deps =
+    flake8==3.3.0
+skip_install = True
+
+[testenv:manifest]
+basepython = python3.4
+commands =
+    check-manifest
+deps =
+    check-manifest==0.35
+skip_install = True
+
+[testenv:pep8]
+basepython = python3.4
+commands =
+    pep8 --config=setup.cfg --repeat .
+deps =
+    pep8==1.7.0
+skip_install = True