Extend find_all to support multiple files

Author: skirpichev

readthedocs_build/config/config.py

@@ -346,7 +346,7 @@ def load(path, env_config):
     The config will be validated.
     """
 
-    config_files = list(find_all(path, CONFIG_FILENAME))
+    config_files = list(find_all(path, (CONFIG_FILENAME,)))
     if not config_files:
         raise ConfigError(
             'No {filename} found'.format(filename=CONFIG_FILENAME),

readthedocs_build/config/find.py

@@ -1,8 +1,9 @@
 import os
 
 
-def find_all(path, filename):
+def find_all(path, filenames):
     path = os.path.abspath(path)
     for root, dirs, files in os.walk(path):
-        if filename in files:
-            yield os.path.abspath(os.path.join(root, filename))
+        for filename in filenames:
+            if filename in files:
+                yield os.path.abspath(os.path.join(root, filename))

readthedocs_build/config/test_find.py

@@ -6,15 +6,15 @@
 
 def test_find_no_files(tmpdir):
     with tmpdir.as_cwd():
-        paths = list(find_all(os.getcwd(), 'readthedocs.yml'))
+        paths = list(find_all(os.getcwd(), ('readthedocs.yml',)))
     assert len(paths) == 0
 
 
 def test_find_at_root(tmpdir):
     apply_fs(tmpdir, {'readthedocs.yml': '', 'otherfile.txt': ''})
 
     base = str(tmpdir)
-    paths = list(find_all(base, 'readthedocs.yml'))
+    paths = list(find_all(base, ('readthedocs.yml',)))
     assert paths == [
         os.path.abspath(os.path.join(base, 'readthedocs.yml'))
     ]
@@ -36,8 +36,42 @@ def test_find_nested(tmpdir):
     apply_fs(tmpdir, {'first/readthedocs.yml': ''})
 
     base = str(tmpdir)
-    paths = list(find_all(base, 'readthedocs.yml'))
+    paths = list(find_all(base, ('readthedocs.yml',)))
     assert set(paths) == set([
         str(tmpdir.join('first', 'readthedocs.yml')),
         str(tmpdir.join('third', 'readthedocs.yml')),
     ])
+
+
+def test_find_multiple_files(tmpdir):
+    apply_fs(tmpdir, {
+        'first': {
+            'readthedocs.yml': '',
+            '.readthedocs.yml': 'content',
+        },
+        'second': {
+            'confuser.txt': 'content',
+        },
+        'third': {
+            'readthedocs.yml': 'content',
+            'Makefile': '',
+        },
+    })
+    apply_fs(tmpdir, {'first/readthedocs.yml': ''})
+
+    base = str(tmpdir)
+    paths = list(find_all(base, ('readthedocs.yml',
+                                 '.readthedocs.yml')))
+    assert paths == [
+        str(tmpdir.join('first', 'readthedocs.yml')),
+        str(tmpdir.join('first', '.readthedocs.yml')),
+        str(tmpdir.join('third', 'readthedocs.yml')),
+    ]
+
+    paths = list(find_all(base, ('.readthedocs.yml',
+                                 'readthedocs.yml')))
+    assert paths == [
+        str(tmpdir.join('first', '.readthedocs.yml')),
+        str(tmpdir.join('first', 'readthedocs.yml')),
+        str(tmpdir.join('third', 'readthedocs.yml')),
+    ]