Merge pull request #53 from pact-foundation/verify-directories

Resolve #22: --pact-url accepts directories

Author: matthewbalvanz-wf

pact/test/test_verify.py

@@ -156,6 +156,56 @@ def test_deprecated_pact_urls(self):
             timeout=30)
 
 
+class expand_directoriesTestCase(TestCase):
+    def setUp(self):
+        super(expand_directoriesTestCase, self).setUp()
+
+        def posix_join(*args):
+            return '/'.join(args)
+
+        self.addCleanup(patch.stopall)
+        self.mock_isdir = patch.object(verify, 'isdir', autospec=True).start()
+        self.mock_join = patch.object(
+            verify, 'join', new=posix_join).start()
+        self.mock_listdir = patch.object(
+            verify, 'listdir', autospec=True).start()
+
+    def test_directory(self):
+        self.mock_isdir.return_value = True
+        self.mock_listdir.return_value = [
+            'consumer-provider.json',
+            'consumer2-provider.json',
+            'unrelated-file.txt']
+
+        result = verify.expand_directories(['/tmp'])
+        self.assertEqual(result, [
+            '/tmp/consumer-provider.json',
+            '/tmp/consumer2-provider.json',
+        ])
+
+    def test_file(self):
+        self.mock_isdir.return_value = False
+        result = verify.expand_directories(['/tmp/consumer-provider.json'])
+        self.assertEqual(result, ['/tmp/consumer-provider.json'])
+
+    def test_uri(self):
+        result = verify.expand_directories(['http://broker'])
+        self.assertEqual(result, ['http://broker'])
+
+    def test_windows_directories(self):
+        self.mock_isdir.return_value = True
+        self.mock_listdir.return_value = [
+            'consumer-provider.json',
+            'consumer2-provider.json',
+            'unrelated-file.txt']
+
+        result = verify.expand_directories(['C:\\tmp'])
+        self.assertEqual(result, [
+            'C:/tmp/consumer-provider.json',
+            'C:/tmp/consumer2-provider.json',
+        ])
+
+
 class path_existsTestCase(TestCase):
     def setUp(self):
         super(path_existsTestCase, self).setUp()

pact/verify.py

@@ -1,6 +1,7 @@
 """Methods to verify previously created pacts."""
 import sys
-from os.path import isfile
+from os import listdir
+from os.path import isfile, isdir, join
 
 import click
 
@@ -20,7 +21,7 @@
 @click.option(
     'pact_url', '--pact-url',
     help='The URI of the pact to verify.'
-         ' Can be an HTTP URI or a local file path.'
+         ' Can be an HTTP URI, a local file or directory path. '
          ' It can be specified multiple times to verify several pacts.',
     multiple=True)
 @click.option(
@@ -79,6 +80,7 @@ def main(base_url, pact_url, pact_urls, states_url, states_setup_url, username,
             + ' At least one of --pact-url or --pact-urls is required.')
         raise click.Abort()
 
+    all_pact_urls = expand_directories(all_pact_urls)
     missing_files = [path for path in all_pact_urls if not path_exists(path)]
     if missing_files:
         click.echo(
@@ -103,6 +105,30 @@ def main(base_url, pact_url, pact_urls, states_url, states_setup_url, username,
     sys.exit(p.returncode)
 
 
+def expand_directories(paths):
+    """
+    Iterate over paths and expand any that are directories into file paths.
+
+    :param paths: A list of file paths to expand.
+    :type paths: list
+    :return: A list of file paths with any directory paths replaced with the
+        JSON files in those directories.
+    :rtype: list
+    """
+    paths_ = []
+    for path in paths:
+        if path.startswith('http://') or path.startswith('https://'):
+            paths_.append(path)
+        elif isdir(path):
+            paths_.extend(
+                [join(path, p) for p in listdir(path) if p.endswith('.json')])
+        else:
+            paths_.append(path)
+
+    # Ruby pact verifier expects forward slashes regardless of OS
+    return [p.replace('\\', '/') for p in paths_]
+
+
 def path_exists(path):
     """
     Determine if a particular path exists.