Merge pull request #16 from jacebrowning/feature/custom-version-arg

Add support for custom version arguments

.verchew

@@ -1,4 +1,34 @@
-[Python]
+[Make]
+
+cli = make
+
+version = GNU Make
+
+
+[Python 2]
 
 cli = python2
+
 version = Python 2.7.
+
+
+[Python 3]
+
+cli = python3
+
+version = Python 3.5.
+
+
+[pandoc]
+
+cli = pandoc
+
+version = 1.
+
+
+[Graphviz]
+
+cli = dot
+cli_version_arg = -V
+
+version = 2.

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Revision History
 
+## 0.4 (unreleased)
+
+- Added support for custom version arguments.
+
 ## 0.3 (2016/10/18)
 
 - Added support for detecting missing and broken programs.

Makefile

@@ -80,7 +80,7 @@ run: install
 
 .PHONY: doctor
 doctor:  ## Confirm system dependencies are available
-	@ verchew/script.py
+	verchew/script.py
 
 # PROJECT DEPENDENCIES #########################################################
 

docs/cli/options.md

@@ -14,3 +14,18 @@ To call `verchew` from an arbitrary directory, pass it the path to the root of y
 ```sh
 $ verchew --root=<path/to/project>
 ```
+
+# Custom Version Arguments
+
+If one of your system dependencies using an argument other than `--version` to display its version information, this can be changed in the configuration file using the `cli_version_arg` setting:
+
+```ini
+
+[Graphviz]
+
+cli = dot
+cli_version_arg = -V
+
+version = 2.
+
+```

verchew/script.py

@@ -130,7 +130,7 @@ def check_dependencies(config):
 
     for name, settings in config.items():
         show("Checking for {0}...".format(name), head=True)
-        output = get_version(settings['cli'])
+        output = get_version(settings['cli'], settings.get('cli_version_arg'))
         if settings['version'] in output:
             show(_("~") + " MATCHED: {0}".format(settings['version']))
             success.append(_("~"))
@@ -143,8 +143,9 @@ def check_dependencies(config):
     return _("x") not in success
 
 
-def get_version(program):
-    args = [program, '--version']
+def get_version(program, argument=None):
+    argument = argument or '--version'
+    args = [program, argument]
 
     show("$ {0}".format(" ".join(args)))
     output = call(args)

verchew/tests/test_script.py

@@ -76,6 +76,9 @@ def when_missing():
     def when_found():
         expect(get_version('python')).contains("Python ")
 
+    def with_custom_argument():
+        expect(get_version('python', argument='-V')).contains("Python ")
+
 
 def describe_format():