WIP FIX: excluded option in config file not respected

The fix in this commit only works for excluding files,
not directories. Excluding directories properly requires
a bit of a refactor.

Author: danielhollas

fprettify/__init__.py

@@ -2057,11 +2057,11 @@ def build_ws_dict(args):
                 sys.exit(1)
         else:
             if not os.path.exists(directory):
-                sys.stderr.write("directory " + directory +
+                sys.stderr.write("file " + directory +
                                  " does not exist!\n")
                 sys.exit(1)
-            if not os.path.isfile(directory) and directory != '-' and not args.recursive:
-                sys.stderr.write("file " + directory + " does not exist!\n")
+            if os.path.isdir(directory) and not args.recursive:
+                sys.stderr.write("%s is a directory. Use --recursive option\n" % directory)
                 sys.exit(1)
 
         if not args.recursive:
@@ -2078,6 +2078,7 @@ def build_ws_dict(args):
             for dirpath, dirnames, files in os.walk(directory,topdown=True):
 
                 # Prune excluded patterns from list of child directories
+                # https://stackoverflow.com/a/19859907
                 dirnames[:] = [dirname for dirname in dirnames if not any(
                     [fnmatch(dirname,exclude_pattern) or fnmatch(os.path.join(dirpath,dirname),exclude_pattern)
                             for exclude_pattern in args.exclude]
@@ -2098,8 +2099,17 @@ def build_ws_dict(args):
                 filearguments['default_config_files'] = ['~/.fprettify.rc'] + get_config_file_list(os.path.abspath(filename) if filename != '-' else os.getcwd())
             file_argparser = get_arg_parser(filearguments)
             file_args = file_argparser.parse_args(argv[1:])
-            ws_dict = build_ws_dict(file_args)
 
+            # Skip excluded files but not if they we specified explicitly
+            # on the command line.
+            if filename != directory and any(
+                        fnmatch(os.path.basename(filename), exclude_pattern)
+                        for exclude_pattern in file_args.exclude):
+                if file_args.debug:
+                    sys.stderr.write("Skipping excluded file %s\n" % filename)
+                continue
+
+            ws_dict = build_ws_dict(file_args)
             case_dict = {
                     'keywords' : file_args.case[0],
                     'procedures' : file_args.case[1],

fprettify/tests/__init__.py

@@ -295,6 +295,79 @@ def test_io(self):
         else:
             os.remove(alien_file)
 
+
+    def test_config_file(self):
+        """simple test for configuration file reading"""
+
+        outstring = []
+        instring = "CALL  alien_invasion( x)"
+        outstring_with_config = "call alien_invasion(x)"
+        outstring_without_config = "CALL alien_invasion(x)"
+
+        dirname = 'test_tmp/'
+
+        if os.path.lexists(dirname):
+            raise AlienInvasion(
+                "remove directory test_tmp")  # pragma: no cover
+
+        os.mkdir(dirname)
+        alien_file = os.path.join(dirname, "alien_invasion.f90")
+        excluded_file = os.path.join(dirname, "excluded.f90")
+        config_file = os.path.join(dirname, ".fprettify.rc")
+        configuration = "case=[1,1,1,2]\nexclude=[excluded.f90]"
+
+        try:
+            with io.open(alien_file, 'w', encoding='utf-8') as infile:
+                infile.write(instring)
+
+            with io.open(excluded_file, 'w', encoding='utf-8') as infile:
+                infile.write(instring)
+
+            with io.open(config_file, 'w', encoding='utf-8') as infile:
+                infile.write(configuration)
+
+            # testing stdin --> stdout
+            # In this case, the config file will not be read,
+            # because it is not located in CWD.
+            p1 = subprocess.Popen(RUNSCRIPT,
+                                  stdout=subprocess.PIPE, stdin=subprocess.PIPE)
+            outstr = p1.communicate(instring.encode('UTF-8'))[0].decode('UTF-8')
+            self.assertEqual(outstring_without_config, outstr.strip())
+
+            # testing file --> stdout
+            p1 = subprocess.Popen([RUNSCRIPT, alien_file, '--stdout'],
+                                  stdout=subprocess.PIPE)
+            outstr = p1.communicate(instring.encode('UTF-8')[0])[0].decode('UTF-8')
+            self.assertEqual(outstring_with_config, outstr.strip())
+
+            # testing recursive mode
+            p1 = subprocess.Popen([RUNSCRIPT, '--recursive', dirname],
+                                  stdout=subprocess.PIPE)
+            p1.wait()
+
+            with io.open(alien_file, 'r', encoding='utf-8') as infile:
+                self.assertEqual(outstring_with_config, infile.read().strip())
+
+            # Excluded file should not be touched at all.
+            with io.open(excluded_file, 'r', encoding='utf-8') as infile:
+                self.assertEqual(instring, infile.read().strip())
+
+        except:  # pragma: no cover
+            if os.path.isfile(alien_file):
+                os.remove(alien_file)
+            if os.path.isfile(excluded_file):
+                os.remove(excluded_file)
+            if os.path.isfile(config_file):
+                os.remove(config_file)
+            if os.path.isdir(dirname):
+                os.rmdir(dirname)
+            raise
+        else:
+            os.remove(alien_file)
+            os.remove(excluded_file)
+            os.remove(config_file)
+            os.rmdir(dirname)
+
     def test_multi_alias(self):
         """test for issue #11 (multiple alias and alignment)"""
         instring="use A,only:B=>C,&\nD=>E"