yi-config-starter 0.1.3__py3-none-any.whl → 0.2.1__py3-none-any.whl

yi_config_starter/__init__.py

@@ -4,5 +4,5 @@ from yi_config_starter.config_starter import ApplicationConfiguration
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
-__version__ = "0.1.3"
+__version__ = "0.2.1"
 __all__ = ["ApplicationConfiguration"]

yi_config_starter/config_starter.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 
 import logging
 import os
+import re
 import sys
 from pathlib import Path
 from threading import RLock
@@ -166,8 +167,10 @@ class ApplicationConfiguration:
           {{separator}}    -> os.sep
           {{APPDATA}}      -> Windows %APPDATA% or "~/.config" fallback
           {{XDG_CONFIG}}   -> $XDG_CONFIG_HOME or "~/.config"
-          {{ENV:VAR_NAME}} -> value of environment variable VAR_NAME (empty if missing)
+          {{ENV:VAR_NAME}} -> value of environment variable VAR_NAME (empty if missing) (case-insensitive ENV)
         You can pass extra_placeholders to override or add tokens.
+
+        After replacements, raises ValueError if any unresolved {{...}} placeholders remain.
         """
         # base mapping
         appdata = os.environ.get("APPDATA") or str(Path.home() / ".config")
@@ -189,20 +192,23 @@ class ApplicationConfiguration:
         for k, v in mapping.items():
             text = text.replace(f"{{{{{k}}}}}", v)
 
-        # Replace {{ENV:NAME}} tokens
-        # Simple scan to avoid regex: find all occurrences of {{ENV:...}}
-        start = 0
-        while True:
-            i = text.find("{{ENV:", start)
-            if i == -1:
-                break
-            j = text.find("}}", i + 6)
-            if j == -1:
-                break  # unmatched; let YAML error out naturally
-            env_key = text[i + 6: j].strip()  # after "ENV:"
-            env_val = os.environ.get(env_key, "")
-            text = text[:i] + env_val + text[j + 2:]
-            start = i + len(env_val)
+        # Replace {{ENV:NAME}} tokens (case-insensitive ENV)
+        def _env_repl(match: re.Match) -> str:
+            env_key = match.group(1).strip()
+            return os.environ.get(env_key, "")
+
+        # Examples matched: {{ENV:PATH}}, {{env:Path}}, {{ Env : PATH }}
+        text = re.sub(r"\{\{\s*env\s*:\s*([^{}]+?)\s*}}", _env_repl, text, flags=re.IGNORECASE)
+
+        # Fail fast if any unresolved placeholders remain.
+        # We consider anything shaped like {{...}} to be a placeholder at this stage.
+        unresolved = {m.group(1).strip() for m in re.finditer(r"\{\{([^{}]+)}}", text)}
+        if unresolved:
+            names = ", ".join(sorted(unresolved))
+            raise ValueError(
+                f"Unresolved placeholders in config after preprocessing: {names}. "
+                f"Define them via built-ins, extra_placeholders, or environment variables using {{ENV:NAME}}."
+            )
 
         return text
 

{yi_config_starter-0.1.3.dist-info → yi_config_starter-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yi-config-starter
-Version: 0.1.3
+Version: 0.2.1
 Summary: Config starter for my local projects
 Author: Yunus Indori
 License: MIT License
@@ -100,20 +100,25 @@ Before parsing YAML, placeholders in the configuration file are substituted.
 | Placeholder        | Description                                    |
 | ------------------ | ---------------------------------------------- |
 | `{{HOME}}`         | User home directory                            |
-| `{{separator}}`    | OS path separator (`/` or `\`)                 |
+| `{{separator}}`    | OS path separator (`/` or `\\`)                 |
 | `{{APPDATA}}`      | Windows `%APPDATA%` or fallback to `~/.config` |
 | `{{XDG_CONFIG}}`   | `$XDG_CONFIG_HOME` or `~/.config`              |
-| `{{ENV:VAR_NAME}}` | Value of environment variable `VAR_NAME`       |
+| `{{ENV:VAR_NAME}}` | Value of environment variable `VAR_NAME` (case-insensitive: `ENV`/`env`) |
 
 Custom placeholders may be supplied via `extra_placeholders`.
 
+### Unresolved placeholders
+
+After preprocessing, if any `{{...}}` placeholders remain unresolved, a `ValueError` is raised listing **all** unresolved placeholder names.
+
 ### Example
 
 ```yaml
 paths:
   data_dir: "{{HOME}}{{separator}}data"
   cache_dir: "{{XDG_CONFIG}}{{separator}}my-app{{separator}}cache"
-  api_key: "{{ENV:MY_API_KEY}}"
+  # ENV token is case-insensitive, so {{env:...}} also works:
+  api_key: "{{env:MY_API_KEY}}"
 ```
 
 ---
@@ -164,4 +169,3 @@ Defined in:
 ## License
 
 MIT License — see the `LICENSE` file.
-

yi_config_starter-0.2.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+yi_config_starter/__init__.py,sha256=_2q1IdbQh1KBA2rULxO5U73TQJbSvgQmC0jrkE84RWA,211
+yi_config_starter/config_starter.py,sha256=MSwg4etZeVmUaC9XM0orsoHqcXnE6Lz2LCs1SIH3pUg,9347
+yi_config_starter-0.2.1.dist-info/licenses/LICENSE,sha256=eiNb74NQUNWxg1y2zfb3vtFX4nj-H5bfJU1kBzcJQK0,1071
+yi_config_starter-0.2.1.dist-info/METADATA,sha256=z7n7KxLnvUO-ZwFzLTC5J_XAs5QXFyXVjSL13SJe_Cg,4885
+yi_config_starter-0.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+yi_config_starter-0.2.1.dist-info/top_level.txt,sha256=EVuzCCMDDGlEOePW0nBaNZARp2rpRZEW9v29OmJms0U,18
+yi_config_starter-0.2.1.dist-info/RECORD,,

yi_config_starter-0.1.3.dist-info/RECORD

@@ -1,7 +0,0 @@
-yi_config_starter/__init__.py,sha256=BLo5vO4l2d1CERyNxrNNG3JeRbe8T24IC_3Us4b3se8,211
-yi_config_starter/config_starter.py,sha256=vlL9BdFA-XX5tssH8rRwxR4_Tod_hMrcBTUMbbqHzpY,8872
-yi_config_starter-0.1.3.dist-info/licenses/LICENSE,sha256=eiNb74NQUNWxg1y2zfb3vtFX4nj-H5bfJU1kBzcJQK0,1071
-yi_config_starter-0.1.3.dist-info/METADATA,sha256=tuDNVGdljoADtcaOBTnK9Q1BeVX_V_tHxEIH9L69SDc,4626
-yi_config_starter-0.1.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-yi_config_starter-0.1.3.dist-info/top_level.txt,sha256=EVuzCCMDDGlEOePW0nBaNZARp2rpRZEW9v29OmJms0U,18
-yi_config_starter-0.1.3.dist-info/RECORD,,