Clean up config logic.

pytest_watch/command.py

@@ -35,15 +35,9 @@
 import colorama
 from docopt import docopt
 
-from .watcher import watch
 from . import __version__
-
-from ini_config_helpers import get_ini_option, get_ini_option_boolean, get_pytest_ini_path
-
-try:
-    from configparser import ConfigParser
-except ImportError:
-    from ConfigParser import ConfigParser  # ver. < 3.0
+from .watcher import watch
+from .config import merge_config
 
 
 def main(argv=None):
@@ -55,57 +49,9 @@ def main(argv=None):
     usage = __doc__[__doc__.find('Usage:'):]
     version = 'pytest-watch ' + __version__
     argv = argv if argv is not None else sys.argv[1:]
-    args_cmd = docopt(usage, argv=argv, version=version)
-
-    config_ini = ConfigParser()
-    pytest_ini_path = get_pytest_ini_path()
-    config_ini.read(pytest_ini_path)
-    args_ini = {}
-
-    # string ini config values
-    args_ini["--onpass"] = get_ini_option(config_ini, "onpass")
-
-    args_ini["--onfail"] = get_ini_option(config_ini, "onfail")
-
-    args_ini["--beforerun"] = get_ini_option(config_ini, "beforerun")
-
-    args_ini["--onexit"] = get_ini_option(config_ini, "onexit")
-
-    args_ini["--ext"] = get_ini_option(config_ini, "ext")
-
-    args_ini["--ignore"] = get_ini_option(config_ini, "ignore")
-
-    # boolean ini config values
-    args_ini["--help"] = get_ini_option_boolean(config_ini, "help")
-
-    args_ini["--version"] = get_ini_option_boolean(config_ini, "version")
-
-    args_ini["--clear"] = get_ini_option_boolean(config_ini, "clear")
-
-    args_ini["--nobeep"] = get_ini_option_boolean(config_ini, "nobeep")
-
-    args_ini["--poll"] = get_ini_option_boolean(config_ini, "poll")
-
-    args_ini["--no-spool"] = get_ini_option_boolean(config_ini, "no-spool")
-
-    args_ini["--verbose"] = get_ini_option_boolean(config_ini, "verbose")
-
-    args_ini["--quiet"] = get_ini_option_boolean(config_ini, "quiet")
-
-    # other config values
-    if config_ini.has_option("pytest-watch", "directories"):
-        args_ini['<directories>'] = config_ini.get("pytest-watch", "directories")
-        args_ini['<directories>'] = args_ini['<directories>'].split(", ")
-    else:
-        args_ini['<directories>'] = []
-
-    args_ini["<args>"] = get_ini_option(config_ini, "addopts")
+    args = docopt(usage, argv=argv, version=version)
 
-    args = {}
-    for arg_key in args_cmd:
-        args[arg_key] = args_cmd[arg_key] or args_ini.get(arg_key)
-    if args["--verbose"]:
-        print("pytest-watch args: " + str(args))
+    merge_config(args)
 
     pytest_args = []
     directories = args['<directories>']

pytest_watch/config.py

@@ -0,0 +1,51 @@
+try:
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
+
+import pytest
+
+
+CLI_OPTION_PREFIX = '--'
+
+
+class CollectConfig(object):
+    """
+    A pytest plugin to gets the configuration file.
+    """
+    def __init__(self):
+        self.path = None
+
+    def pytest_cmdline_main(self, config):
+        self.path = str(config.inifile)
+
+
+def merge_config(args):
+    collect_config = CollectConfig()
+    pytest.main(['--collect-only'], plugins=[collect_config])
+    if not collect_config.path:
+        return
+
+    config = ConfigParser()
+    config.read(collect_config.path)
+    if not config.has_section('pytest-watch'):
+        return
+
+    for cli_name in args:
+        if not cli_name.startswith(CLI_OPTION_PREFIX):
+            continue
+        config_name = cli_name[len(CLI_OPTION_PREFIX):]
+
+        # Let CLI options take precedence
+        if args[cli_name]:
+            continue
+
+        # Find config option
+        if not config.has_option('pytest-watch', config_name):
+            continue
+
+        # Merge config option using the expected type
+        if isinstance(args[cli_name], bool):
+            args[cli_name] = config.getboolean('pytest-watch', config_name)
+        else:
+            args[cli_name] = config.get('pytest-watch', config_name)