merge global and frontmatter env values #49

Author: luto

docs/syntax.md

@@ -69,7 +69,8 @@ All given relative paths are relative to the `shellinspector.yaml` file itself.
 Shellinspector can be configured in various ways outlined below. These config
 values are set using an optional YAML section at the start of the file. This
 takes precedence over the values provided in the config file. The `settings`
-dict gets merged, all other values are overwritten completely.
+and the `environment` dicts gets merged, all other values are overwritten
+completely.
 
 ```yaml
 ---

src/shellinspector/parser.py

@@ -388,6 +388,22 @@ def parse(
 
         setattr(specfile.settings, key.name, value)
 
+    global_env = config.get("environment", {})
+    frontmatter_env = frontmatter_settings.get("environment", {})
+
+    for key in global_env.keys():
+        value = None
+
+        with suppress(LookupError):
+            value = global_env[key]
+            root_path = config_path.parent
+
+        with suppress(LookupError):
+            value = frontmatter_env[key]
+            root_path = specfile.path.parent
+
+        specfile.environment[key] = value
+
     for sk, sv in specfile.environment.items():
         if not isinstance(sv, str):
             continue

tests/e2e/311_env_external_1.ispec

@@ -7,3 +7,6 @@ environment:
 alessa
 [@local]$ echo $OUTSIDE_PAGER2
 bless
+# from shellinspector.yaml
+[@local]$ echo $OUTSIDE_PAGER3
+cless

tests/e2e/shellinspector.yaml

@@ -2,3 +2,4 @@
 environment:
   OUTSIDE_PAGER1: a${PAGER}a
   OUTSIDE_PAGER2: b$PAGER
+  OUTSIDE_PAGER3: c$PAGER

tests/test_parser.py

@@ -574,7 +574,7 @@ def test_global_config_combine():
         ),
     )
 
-    assert specfile.environment == {"FROM_ISPEC": 1}
+    assert specfile.environment == {"FROM_ISPEC": 1, "FROM_CONFIG": 1}
     assert specfile.examples == [{"FROM_ISPEC": 1}]