Closes #3

Author: matthewrankin

dirwalker.py

@@ -24,24 +24,36 @@
 
 
 def find_filenames_with_extensions(
-        search_directory, extensions):
+        search_directory, extensions, recurse=True):
     """Find filenames with given extensions.
 
     Args:
         search_directory: A string of the absolute or relative directory to
             search.
         extensions: A list or tuple of strings containing the extensions to
             look for.
+        recurse: A boolean indicating whether or not to recurse any
+            subdirectories.
 
     Returns:
         A list of filenames found.
     """
     files_found = []
     search_directory = os.path.abspath(search_directory)
-    for root, dirs, files in os.walk(search_directory):
-        for filename in files:
-            current_file = os.path.join(root, filename)
+    print(search_directory)
+    if recurse:
+        for root, dirs, files in os.walk(search_directory):
+            for filename in files:
+                current_file = os.path.join(root, filename)
+                for extension in extensions:
+                    if filename.endswith(extension):
+                        files_found.append(current_file)
+    else:
+        for filename in os.listdir(search_directory):
             for extension in extensions:
                 if filename.endswith(extension):
+                    current_file = os.path.join(search_directory,
+                                                filename)
                     files_found.append(current_file)
+
     return files_found

setup.cfg

@@ -2,4 +2,4 @@
 description-file = README.md
 [flake8]
 max-line-length = 79
-max-complexity = 10
+max-complexity = 12

tasks.py

@@ -31,7 +31,7 @@ def release(start=False, finish=False, deploy=False, test=False, version=''):
         if deploy:
             if version:
                 run("python setup.py sdist")
-                run("git flow release finish v{ver}".format(
+                run("git flow release finish -m '{ver}' v{ver}".format(
                     ver=version), echo=True)
                 run("git push --tags")
                 run("git checkout master")

tests/sample_dir/sample_dir_level_2/sample_level_2_file01.txt renamed to tests/sample_dir/sample_dir_level_2/sample_level_2_file_01.txt

@@ -34,6 +34,30 @@ def setUp(self):
         self.known_sample_file_06_js = os.path.join(
             self.sample_dir,
             'sample_file_06.js')
+        self.known_sample_level_2_file_01_txt = os.path.join(
+            self.sample_dir,
+            'sample_dir_level_2',
+            'sample_level_2_file_01.txt')
+        self.known_sample_level_2_file_01_txt = os.path.join(
+            self.sample_dir,
+            'sample_dir_level_2',
+            'sample_level_2_file_01.txt')
+        self.known_sample_level_2_file_02_txt = os.path.join(
+            self.sample_dir,
+            'sample_dir_level_2',
+            'sample_level_2_file_02.txt')
+        self.known_sample_level_2_file_03_csv = os.path.join(
+            self.sample_dir,
+            'sample_dir_level_2',
+            'sample_level_2_file_03.csv')
+        self.known_sample_level_2_file_04_csv = os.path.join(
+            self.sample_dir,
+            'sample_dir_level_2',
+            'sample_level_2_file_04.csv')
+        self.known_sample_level_2_file_05_py = os.path.join(
+            self.sample_dir,
+            'sample_dir_level_2',
+            'sample_level_2_file_05.py')
 
     def test_find_single_file_without_extension_period(self):
         """Find extensions that don't have a period"""
@@ -43,6 +67,27 @@ def test_find_single_file_without_extension_period(self):
                 ['js']),
             [self.known_sample_file_06_js])
 
+    def test_find_multiple_files_without_extension_period(self):
+        """Find extensions in recursive directories"""
+        self.assertEqual(
+            dirwalker.find_filenames_with_extensions(
+                self.sample_dir,
+                ['txt']),
+            [self.known_sample_file_01_txt,
+                self.known_sample_file_02_txt,
+                self.known_sample_level_2_file_01_txt,
+                self.known_sample_level_2_file_02_txt])
+
+    def test_find_multiple_files_without_recursion(self):
+        """Find extensions without recursing subdirectories"""
+        self.assertEqual(
+            dirwalker.find_filenames_with_extensions(
+                self.sample_dir,
+                ['txt'],
+                recurse=False),
+            [self.known_sample_file_01_txt,
+                self.known_sample_file_02_txt])
+
     def test_find_single_file_with_extension_period(self):
         """Find extensions that have a period"""
         self.assertEqual(