Merge pull request #65 from jacebrowning/release/v3.0

Release v3.0

Author: jacebrowning

.python-version

@@ -0,0 +1,2 @@
+3.7.5
+2.7.14

.verchew.ini

@@ -16,7 +16,7 @@ version = Python 3
 [Poetry]
 
 cli = poetry
-version = 0.12
+version = 1.0 || 0.12
 
 [Graphviz]
 

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.0 (2019-12-07)
+
+- Removed `versions` in favor of `version` option.
+- Removed `|` in favor of `||` for checking multiple versions.
+- Added support for matching **any** version when `version` is not specified.
+
 # 2.0.1 (2019-10-13)
 
 - Restore compatibility layer to unofficially support legacy Python.

Makefile

@@ -28,8 +28,8 @@ run: install
 	poetry run python $(PACKAGE)/__main__.py
 
 .PHONY: demo ## Run the example
-demo: install
-	make doctor -C examples
+demo:
+	cd examples && make doctor
 
 # SYSTEM DEPENDENCIES ##########################################################
 
@@ -45,13 +45,15 @@ DEPENDENCIES := $(VIRTUAL_ENV)/.poetry-$(shell bin/checksum pyproject.toml poetr
 install: $(DEPENDENCIES) .cache
 
 $(DEPENDENCIES): poetry.lock
-	@ poetry config settings.virtualenvs.in-project true || poetry config virtualenvs.in-project true
+	@ poetry config virtualenvs.in-project true || poetry config settings.virtualenvs.in-project true
 	poetry install
 	@ touch $@
 
+ifndef CI
 poetry.lock: pyproject.toml
 	poetry lock
 	@ touch $@
+endif
 
 .cache:
 	@ mkdir -p .cache

examples/Makefile

@@ -5,4 +5,4 @@ all: doctor
 doctor:
 	@ echo
 	@ echo "$$ verchew"
-	@ PATH=bin:$(PATH) ../verchew/script.py
+	@ ../verchew/script.py

examples/verchew.ini

@@ -6,7 +6,7 @@ version = 1.2
 [Newer Working Program]
 
 cli = working-program
-versions =  4.1 | 4.2
+version =  4.1 || 4.2
 message = Version 4.x is required to get the special features.
 
 [Broken Program]

poetry.lock

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "verchew"
-version = "2.0.1"  # also update verchew/script.py
+version = "3.0"  # also update verchew/script.py
 description = "System dependency version checker."
 
 license = "MIT"

pyproject.toml

@@ -131,7 +131,7 @@ def it_displays_help_information(cli):
     def it_displays_version_information(cli):
         cmd = cli('--version')
 
-        expect(cmd.stdout or cmd.stderr).contains("verchew v2.")
+        expect(cmd.stdout).startswith("verchew v")
         expect(cmd.returncode) == 0
 
 

tests/test_cli.py

@@ -34,7 +34,6 @@
 import os
 import re
 import sys
-import warnings
 from collections import OrderedDict
 from subprocess import PIPE, STDOUT, Popen
 from typing import Any, Dict
@@ -43,11 +42,11 @@
 PY2 = sys.version_info[0] == 2
 
 if PY2:
-    import ConfigParser as configparser
+    import ConfigParser as configparser  # pylint: disable=import-error
 else:
     import configparser  # type: ignore
 
-__version__ = '2.0.1'
+__version__ = '3.0'
 
 CONFIG_FILENAMES = ['verchew.ini', '.verchew.ini', '.verchewrc', '.verchew']
 
@@ -197,21 +196,7 @@ def parse_config(path):
             data[section][name] = value
 
     for name in data:
-        if 'versions' in data[name]:
-            warnings.warn(
-                "'versions' is deprecated, use 'version' instead", DeprecationWarning
-            )
-            version = data[name].pop('versions') or ""
-        else:
-            version = data[name].get('version') or ""
-
-        if ' | ' in version:
-            warnings.warn(
-                "'|' is deprecated, use '||' to separate multiple versions",
-                DeprecationWarning,
-            )
-            version = version.replace(' | ', ' || ')
-
+        version = data[name].get('version') or ""
         data[name]['version'] = version
         data[name]['patterns'] = [v.strip() for v in version.split('||')]
 
@@ -227,7 +212,7 @@ def check_dependencies(config):
 
         for pattern in settings['patterns']:
             if match_version(pattern, output):
-                show(_("~") + " MATCHED: {0}".format(pattern))
+                show(_("~") + " MATCHED: {0}".format(pattern or "<anything>"))
                 success.append(_("~"))
                 break
         else:
@@ -237,9 +222,14 @@ def check_dependencies(config):
             else:
                 if QUIET:
                     print(
-                        "Unmatched {0} version: {1}".format(name, settings['version'])
+                        "Unmatched {0} version: {1}".format(
+                            name, settings['version'] or "<anything>"
+                        )
                     )
-                show(_("x") + " EXPECTED: {0}".format(settings['version']))
+                show(
+                    _("x")
+                    + " EXPECTED: {0}".format(settings['version'] or "<anything>")
+                )
                 success.append(_("x"))
             if settings.get('message'):
                 show(_("*") + " MESSAGE: {0}".format(settings['message']))
@@ -266,6 +256,9 @@ def get_version(program, argument=None):
 
 
 def match_version(pattern, output):
+    if "not found" in output:
+        return False
+
     regex = pattern.replace('.', r'\.') + r'(\b|/)'
 
     log.debug("Matching %s: %s", regex, output)