Merge branch 'release/2.2.2'

.coveragerc

@@ -0,0 +1,31 @@
+; vi:syntax=ini
+; See https://coverage.readthedocs.org/en/coverage-4.0.3/config.html
+
+[run]
+data_file = .coverage
+source =
+    hangman
+
+; debug = config
+; branch = False
+; include =
+;    hangman/
+; omit =
+;     tests/
+
+[report]
+fail_under = 80
+show_missing = True
+
+; exclude_lines =
+;     (?i)#\s*pragma[:\s]?\s*no\s*cover
+; include_errors = False
+; include =
+;     hangman/
+; omit =
+;     tests/
+; skip_covered = False
+
+[html]
+directory = .htmlcov
+title = Hangman Coverage Report

.gitignore

@@ -36,7 +36,7 @@ pip-log.txt
 pip-delete-this-directory.txt
 
 # Unit test / coverage reports
-htmlcov/
+.htmlcov/
 .tox/
 .coverage
 .coverage.*

.travis.yml

@@ -16,12 +16,12 @@ env:
   - TOXENV=py34
   - TOXENV=py35
   - TOXENV=pypy
-  # - TOXENV=docs
+   - TOXENV=docs
 
 # command to run tests, e.g. python setup.py test
 script:
   - tox -e $TOXENV
-  - coverage run --source=hangman setup.py test
+  - coverage run setup.py test
 
 after_success:
   - coveralls

HISTORY.rst

@@ -13,6 +13,7 @@ Next Release
 * Updated requirements.
 * Removed gratuitous docs -- less is more.
 * 2.2.1 Handle ctrl+d EOF to exit.
+* 2.2.2 Fix broken coverage report.
 
 
 2.1.0 (2015-18-05)

Makefile

@@ -51,7 +51,7 @@ clean-pyc:
 clean-test:
 	rm -fr .tox/
 	rm -f .coverage
-	rm -fr htmlcov/
+	rm -fr .htmlcov/
 
 clean-docs:
 	rm -f $(DOCSSOURCEDIR)/python_hangman.rst
@@ -68,10 +68,10 @@ test-all: lint
 	tox
 
 coverage:
-	coverage run --source hangman setup.py test
-	coverage report --show-missing
+	coverage run setup.py test
+	coverage report
 	coverage html
-	$(BROWSER) htmlcov/index.html
+	$(BROWSER) .htmlcov/index.html
 	$(MAKE) -C docs coverage
 
 github:

README.rst

@@ -27,10 +27,6 @@
 python_hangman
 ==============
 
-.. image:: https://img.shields.io/github/downloads/bionikspoon/python_hangman/total.svg
-    :target: https://github.com/bionikspoon/python_hangman
-    :alt: Github Downloads
-
 .. image:: https://badge.fury.io/py/python_hangman.svg
     :target: https://pypi.python.org/pypi/python_hangman/
     :alt: Latest Version
@@ -63,13 +59,14 @@ A well tested, cli, python version-agnostic, multi-platform hangman game. It's b
 Features
 ========
 
-- Free software: MIT license
-- Documentation: https://python_hangman.readthedocs.org.
 - Hangman!
+- Documentation: https://python_hangman.readthedocs.org
+- Open Source: https://github.com/bionikspoon/python_hangman
 - Idiomatic code.
 - Thoroughly tested with very high coverage.
 - Python version agnostic.
 - Demonstrates MVC design out of the scope of web development.
+- MIT license
 
 .. image:: https://cloud.githubusercontent.com/assets/5052422/11611464/00822c5c-9b95-11e5-9fcb-8c10fd9be7df.jpg
     :alt: Screenshot

docs/Makefile

@@ -180,5 +180,3 @@ pseudoxml:
 	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
 	@echo
 	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
-
-all: html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf latexpdfja text man texinfo info gettext changes xml pseudoxml linkcheck doctest coverage

docs/source/readme_features.rst

@@ -1,13 +1,14 @@
 Features
 ========
 
-- Free software: MIT license
-- Documentation: https://python_hangman.readthedocs.org.
 - Hangman!
+- Documentation: https://python_hangman.readthedocs.org
+- Open Source: https://github.com/bionikspoon/python_hangman
 - Idiomatic code.
 - Thoroughly tested with very high coverage.
 - Python version agnostic.
 - Demonstrates MVC design out of the scope of web development.
+- MIT license
 
 .. image:: https://cloud.githubusercontent.com/assets/5052422/11611464/00822c5c-9b95-11e5-9fcb-8c10fd9be7df.jpg
     :alt: Screenshot

docs/source/readme_title.rst

@@ -2,10 +2,6 @@
 python_hangman
 ==============
 
-.. image:: https://img.shields.io/github/downloads/bionikspoon/python_hangman/total.svg
-    :target: https://github.com/bionikspoon/python_hangman
-    :alt: Github Downloads
-
 .. image:: https://badge.fury.io/py/python_hangman.svg
     :target: https://pypi.python.org/pypi/python_hangman/
     :alt: Latest Version

hangman/__init__.py

@@ -20,4 +20,4 @@
 
 __author__ = 'Manu Phatak'
 __email__ = 'bionikspoon@gmail.com'
-__version__ = '2.2.1'
+__version__ = '2.2.2'

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.1
+current_version = 2.2.2
 commit = True
 tag = False
 tag_name = {new_version}

setup.py

@@ -38,7 +38,7 @@ def run_tests(self):
 
 setup(  # :off
     name='python_hangman',
-    version='2.2.1',
+    version='2.2.2',
     description='Python Hangman TDD/MVC demonstration.',
     long_description='\n\n'.join([readme, history]),
     author='Manu Phatak',

tests/test_view.py

@@ -2,7 +2,7 @@
 from textwrap import dedent
 
 from mock import Mock
-from pytest import fixture, raises
+from pytest import fixture, raises, mark
 
 from hangman import view
 
@@ -11,12 +11,15 @@
 def setup(monkeypatch):
     monkeypatch.setattr('click.getchar', lambda: 'A')
     monkeypatch.setattr('click.confirm', lambda _: True)
+    monkeypatch.setattr('click.clear', lambda: None)
 
 
 @fixture
-def patch_click_output(monkeypatch):
-    monkeypatch.setattr('click.secho', lambda *args, **_: None)
-    monkeypatch.setattr('click.echo', lambda *args, **_: None)
+def patch_echo(monkeypatch):
+    noop = lambda *__, **_: None  # noqa
+
+    monkeypatch.setattr('click.secho', noop)
+    monkeypatch.setattr('click.echo', noop)
 
 
 @fixture
@@ -296,18 +299,21 @@ def test_flash_message_handles_error_objects(game, capsys, flash):
     assert err == ''
 
 
+@mark.usefixtures('patch_echo')
 def test_prompting_for_a_guess():
     actual = view.prompt_guess()
     assert actual == 'A'
 
 
+@mark.usefixtures('patch_echo')
 def test_keyboard_interrupt(monkeypatch):
     monkeypatch.setattr('click.getchar', lambda: '\x03')
 
     with raises(KeyboardInterrupt):
         view.prompt_guess()
 
 
+@mark.usefixtures('patch_echo')
 def test_prompt_play_again_method_true():
     assert view.prompt_play_again() is True