Clean up coverage generation and reporting in tox & travis.

.gitignore

@@ -1,8 +1,6 @@
 *.pyc
 /_trial_temp/
 /build/
-htmlcov
-.coverage
 /src/*.egg-info
 /.tox/
 /docs/_build/

coverage.conf

@@ -0,0 +1,7 @@
+[run]
+branch = True
+source = klein
+
+[report]
+precision = 2
+show_missing = True

tox.ini

@@ -56,14 +56,28 @@ setenv =
     PIP_DISABLE_PIP_VERSION_CHECK=1
     VIRTUALENV_NO_DOWNLOAD=1
 
+    coverage: COVERAGE_FILE={toxworkdir}/coverage/coverage.{envname}
+    {coverage_combine,codecov}: COVERAGE_FILE={toxworkdir}/coverage/coverage
+
+    {coverage,coverage_combine}: COVERAGE_HTML={envlogdir}/coverage_report_html
+    {coverage,coverage_combine,codecov}: COVERAGE_XML={envlogdir}/coverage_report.xml
+
 commands =
     "{toxinidir}/.travis/environment"
 
     # Run trial without coverage
     trial: trial --random=0 --logfile="{envlogdir}/trial.log" --temp-directory="{envlogdir}/trial.d" {posargs:klein}
 
+    # Create a directory for coverage reports
+    coverage: python -c 'import os; d="{toxworkdir}/coverage"; os.makedirs(d) if not os.path.exists(d) else None'
+
     # Run trial with coverage
-    coverage: coverage run -p "{envbindir}/trial" --random=0 --logfile="{envlogdir}/trial.log" --temp-directory="{envlogdir}/trial.d" {posargs:klein}
+    coverage: coverage run --rcfile="{toxinidir}/coverage.conf" "{envdir}/bin/trial" --random=0 --logfile="{envlogdir}/trial.log" --temp-directory="{envlogdir}/trial.d" {posargs:klein}
+
+    # Coverage reports
+    coverage-html: coverage html --rcfile="{toxinidir}/coverage.conf" -d "{env:COVERAGE_HTML}"
+    coverage-xml: coverage xml --rcfile="{toxinidir}/coverage.conf" -o "{env:COVERAGE_XML}"
+    coverage: coverage report --rcfile="{toxinidir}/coverage.conf" --skip-covered --omit "*/test/*"
 
 
 ##
@@ -72,6 +86,8 @@ commands =
 
 [testenv:flake8]
 
+basepython = python3.5
+
 skip_install = True
 
 deps =
@@ -83,8 +99,6 @@ deps =
     pep8-naming
     mccabe
 
-basepython = python3.5
-
 commands =
     "{toxinidir}/.travis/environment"
 
@@ -125,10 +139,10 @@ max-complexity = 21
 
 [testenv:twistedchecker]
 
-deps = twistedchecker
-
 basepython = python2.7
 
+deps = twistedchecker
+
 commands =
     "{toxinidir}/.travis/environment"
 
@@ -141,18 +155,41 @@ commands =
 
 [testenv:twistedchecker-diff]
 
+basepython = python2.7
+
 deps =
     {[testenv:twistedchecker]deps}
     diff_cover
 
-basepython = python2.7
-
 commands =
     "{toxinidir}/.travis/environment"
 
     "{toxinidir}/.travis/twistedchecker-diff" {posargs:klein}
 
 
+##
+# Combine coverage reports
+##
+
+[testenv:coverage_combine]
+
+basepython = python3.5
+
+skip_install = True
+
+deps = coverage
+
+commands =
+    "{toxinidir}/.travis/environment"
+
+    coverage combine --append
+
+    coverage html --rcfile="{toxinidir}/coverage.conf" -d "{env:COVERAGE_HTML}"
+    coverage xml --rcfile="{toxinidir}/coverage.conf" -o "{env:COVERAGE_XML}"
+
+    coverage report --rcfile="{toxinidir}/coverage.conf" --fail-under=100 --omit "*/test/*"
+
+
 ##
 # Publish to Codecov
 ##
@@ -179,12 +216,12 @@ commands =
 
 [testenv:docs]
 
+basepython = python2.7
+
 deps =
     sphinx
     sphinx_rtd_theme
 
-basepython = python2.7
-
 commands =
     "{toxinidir}/.travis/environment"
 
@@ -197,10 +234,10 @@ commands =
 
 [testenv:docs-linkcheck]
 
-deps = {[testenv:docs]deps}
-
 basepython = python2.7
 
+deps = {[testenv:docs]deps}
+
 commands =
     "{toxinidir}/.travis/environment"