Refactor project config options

Author: ivankravets

Diff for: .vscode/settings.json

@@ -10,7 +10,7 @@ yapf:
 	yapf --recursive --in-place platformio/
 
 test:
-	py.test -v -s -n 3 --dist=loadscope tests --ignore tests/test_examples.py --ignore tests/test_pkgmanifest.py
+	py.test --verbose --capture=no --exitfirst -n 3 --dist=loadscope tests --ignore tests/test_examples.py --ignore tests/test_pkgmanifest.py
 
 before-commit: isort yapf lint test
 

Diff for: Makefile

@@ -163,22 +163,17 @@ def device_list(  # pylint: disable=too-many-branches
     "--environment",
     help="Load configuration from `platformio.ini` and specified environment")
 def device_monitor(**kwargs):  # pylint: disable=too-many-branches
-    custom_monitor_flags = []
     try:
         env_options = get_project_options(kwargs['project_dir'],
                                           kwargs['environment'])
-        if "monitor_flags" in env_options:
-            custom_monitor_flags = ProjectConfig.parse_multi_values(
-                env_options['monitor_flags'])
-        if env_options:
-            for k in ("port", "speed", "rts", "dtr"):
-                k2 = "monitor_%s" % k
-                if k == "speed":
-                    k = "baud"
-                if kwargs[k] is None and k2 in env_options:
-                    kwargs[k] = env_options[k2]
-                    if k != "port":
-                        kwargs[k] = int(kwargs[k])
+        for k in ("port", "speed", "rts", "dtr"):
+            k2 = "monitor_%s" % k
+            if k == "speed":
+                k = "baud"
+            if kwargs[k] is None and k2 in env_options:
+                kwargs[k] = env_options[k2]
+                if k != "port":
+                    kwargs[k] = int(kwargs[k])
     except exception.NotPlatformIOProject:
         pass
 
@@ -187,12 +182,12 @@ def device_monitor(**kwargs):  # pylint: disable=too-many-branches
         if len(ports) == 1:
             kwargs['port'] = ports[0]['port']
 
-    sys.argv = ["monitor"] + custom_monitor_flags
+    sys.argv = ["monitor"] + env_options.get("monitor_flags", [])
     for k, v in kwargs.items():
         if k in ("port", "baud", "rts", "dtr", "environment", "project_dir"):
             continue
         k = "--" + k.replace("_", "-")
-        if k in custom_monitor_flags:
+        if k in env_options.get("monitor_flags", []):
             continue
         if isinstance(v, bool):
             if v:

Diff for: platformio/commands/device.py

@@ -44,20 +44,17 @@ def _get_project_data(project_dir):
             config.validate(validate_options=False)
             libdeps_dir = get_project_libdeps_dir()
 
-            if config.has_section("platformio") and \
-                    config.has_option("platformio", "lib_extra_dirs"):
-                data['libExtraDirs'].extend(
-                    config.getlist("platformio", "lib_extra_dirs"))
+            data['libExtraDirs'].extend(
+                config.get("platformio", "lib_extra_dirs", []))
 
             for section in config.sections():
                 if not section.startswith("env:"):
                     continue
                 data['envLibdepsDirs'].append(join(libdeps_dir, section[4:]))
                 if config.has_option(section, "board"):
                     data['boards'].append(config.get(section, "board"))
-                if config.has_option(section, "lib_extra_dirs"):
-                    data['libExtraDirs'].extend(
-                        config.getlist(section, "lib_extra_dirs"))
+                data['libExtraDirs'].extend(
+                    config.get(section, "lib_extra_dirs", []))
 
             # skip non existing folders and resolve full path
             for key in ("envLibdepsDirs", "libExtraDirs"):
@@ -233,10 +230,8 @@ def get_project_examples():
                 try:
                     config = ProjectConfig(join(project_dir, "platformio.ini"))
                     config.validate(validate_options=False)
-                    if config.has_section("platformio") and \
-                            config.has_option("platformio", "description"):
-                        project_description = config.get(
-                            "platformio", "description")
+                    project_description = config.get("platformio",
+                                                     "description")
                 except exception.PlatformIOProjectException:
                     continue
 

Diff for: platformio/commands/home/rpc/handlers/project.py

@@ -70,7 +70,6 @@ def cli(
         project_option,
         env_prefix,
         silent):
-
     if not silent:
         if project_dir == getcwd():
             click.secho(

Diff for: platformio/commands/init.py

@@ -109,9 +109,8 @@ def cli(ctx, **options):
                 continue
             storage_dir = join(libdeps_dir, env)
             ctx.meta[CTX_META_STORAGE_DIRS_KEY].append(storage_dir)
-            if config.has_option("env:" + env, "lib_deps"):
-                ctx.meta[CTX_META_STORAGE_LIBDEPS_KEY][
-                    storage_dir] = config.getlist("env:" + env, "lib_deps")
+            ctx.meta[CTX_META_STORAGE_LIBDEPS_KEY][storage_dir] = config.get(
+                "env:" + env, "lib_deps", [])
 
 
 @cli.command("install", short_help="Install library")
@@ -175,8 +174,7 @@ def lib_install(  # pylint: disable=too-many-arguments
             if project_environments and env not in project_environments:
                 continue
             config.expand_interpolations = False
-            lib_deps = (config.getlist("env:" + env, "lib_deps")
-                        if config.has_option("env:" + env, "lib_deps") else [])
+            lib_deps = config.get("env:" + env, "lib_deps", [])
             for library in libraries:
                 if library in lib_deps:
                     continue

Diff for: platformio/commands/lib.py

@@ -107,9 +107,8 @@ def cli(  # pylint: disable=redefined-builtin
                 # filter and ignore patterns
                 patterns = dict(filter=list(filter), ignore=list(ignore))
                 for key in patterns:
-                    if config.has_option(section, "test_%s" % key):
-                        patterns[key].extend(
-                            config.getlist(section, "test_%s" % key))
+                    patterns[key].extend(
+                        config.get(section, "test_%s" % key, []))
 
                 skip_conditions = [
                     environment and envname not in environment,

Diff for: platformio/commands/test/command.py

@@ -92,9 +92,10 @@ def __init__(self, cmd_ctx, testname, envname, options):
         self._outputcpp_generated = False
 
     def get_transport(self):
-        transport = self.env_options.get("framework")
         if self.env_options.get("platform") == "native":
             transport = "native"
+        elif "framework" in self.env_options:
+            transport = self.env_options.get("framework")[0]
         if "test_transport" in self.env_options:
             transport = self.env_options['test_transport']
         if transport not in TRANSPORT_OPTIONS: