Handle internal versions matches

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 0.4 (unreleased)
 
 - Added support for custom version arguments.
+- Fixed handling of internal versions matches.
 
 ## 0.3 (2016/10/18)
 

verchew/script.py

@@ -131,7 +131,7 @@ def check_dependencies(config):
     for name, settings in config.items():
         show("Checking for {0}...".format(name), head=True)
         output = get_version(settings['cli'], settings.get('cli_version_arg'))
-        if settings['version'] in output:
+        if match_version(settings['version'], output):
             show(_("~") + " MATCHED: {0}".format(settings['version']))
             success.append(_("~"))
         else:
@@ -154,6 +154,10 @@ def get_version(program, argument=None):
     return output
 
 
+def match_version(pattern, output):
+    return output.startswith(pattern) or " " + pattern in output
+
+
 def call(args):
     try:
         process = Popen(args, stdout=PIPE, stderr=STDOUT)

verchew/tests/test_script.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 
-# pylint: disable=unused-variable,unused-argument,expression-not-assigned
+# pylint: disable=unused-variable,unused-argument,expression-not-assigned,singleton-comparison
 
 from __future__ import unicode_literals
 
 import pytest
 from expecter import expect
 
-from verchew.script import find_config, parse_config, get_version, _
+from verchew.script import (find_config, parse_config, get_version,
+                            match_version, _)
 
 
 def describe_find_config():
@@ -80,6 +81,24 @@ def with_custom_argument():
         expect(get_version('python', argument='-V')).contains("Python ")
 
 
+def describe_match_version():
+
+    def when_exact():
+        expect(match_version("1.2.3", "1.2.3")) == True
+
+    def when_partial():
+        expect(match_version("1.2.", "1.2.3")) == True
+
+    def when_mismatch():
+        expect(match_version("1.", "2.0")) == False
+
+    def when_match_inside():
+        expect(match_version("1.", "Foobar 1.2.3")) == True
+
+    def when_mismatch_inside():
+        expect(match_version("2.", "Foobar 1.2.3")) == False
+
+
 def describe_format():
 
     def when_utf8():