configaroo 0.2.3__py3-none-any.whl → 0.3.0__py3-none-any.whl

configaroo/__init__.py

@@ -15,4 +15,4 @@ __all__ = [
     "print_configuration",
 ]
 
-__version__ = "0.2.3"
+__version__ = "0.3.0"

configaroo/configuration.py

@@ -112,8 +112,22 @@ class Configuration(UserDict[str, Any]):
         cls = type(self)
         return self | {prefix: cls(self.setdefault(prefix, {})).add(rest, value)}
 
-    def add_envs(self, envs: dict[str, str], prefix: str = "") -> Self:
-        """Add environment variables to configuration."""
+    def add_envs(self, envs: dict[str, str] | None = None, prefix: str = "") -> Self:
+        """Add environment variables to configuration.
+
+        If you don't specify which environment variables to read, you'll
+        automatically add any that matches a top-level value of the
+        configuration.
+        """
+        if envs is None:
+            # Automatically add top-level configuration items
+            envs = {
+                re.sub(r"\W", "_", key).upper(): key
+                for key, value in self.data.items()
+                if isinstance(value, str | int | float)
+            }
+
+        # Read environment variables
         for env, key in envs.items():
             env_key = f"{prefix}{env}"
             if env_value := os.getenv(env_key):
@@ -129,7 +143,7 @@ class Configuration(UserDict[str, Any]):
         cls = type(self)
         variables = (
             (self.to_flat_dict() if _include_self else {})
-            | {"project_path": _find_pyproject_toml()}
+            | {"project_path": find_pyproject_toml()}
             | ({} if extra is None else extra)
         )
         parsed = cls(
@@ -196,7 +210,7 @@ def print_configuration(config: Configuration | BaseModel, indent: int = 4) -> N
     )
 
 
-def _get_rich_print() -> Callable[[str], None]:
+def _get_rich_print() -> Callable[[str], None]:  # pragma: no cover
     """Initialize a Rich console if Rich is installed, otherwise use built-in print."""
     try:
         from rich.console import Console  # noqa: PLC0415
@@ -222,13 +236,13 @@ def _print_dict_as_tree(
                 value,
                 indent=indent,
                 current_indent=current_indent + indent,
-                _print=print,
+                _print=_print,
             )
         else:
             _print(" " * current_indent + f"- {key}: {value!r}")
 
 
-def _find_pyproject_toml(
+def find_pyproject_toml(
     path: Path | None = None, _file_name: str = "pyproject.toml"
 ) -> Path:
     """Find a directory that contains a pyproject.toml file.
@@ -241,7 +255,7 @@ def _find_pyproject_toml(
     if (path / _file_name).exists() or path == path.parent:
         return path.resolve()
 
-    return _find_pyproject_toml(path.parent, _file_name=_file_name)
+    return find_pyproject_toml(path.parent, _file_name=_file_name)
 
 
 def _get_foreign_path() -> Path:

{configaroo-0.2.3.dist-info → configaroo-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: configaroo
-Version: 0.2.3
+Version: 0.3.0
 Summary: Bouncy handling of configuration files
 Author-email: Geir Arne Hjelle <geirarne@gmail.com>
 Maintainer-email: Geir Arne Hjelle <geirarne@gmail.com>
@@ -8,7 +8,7 @@ License-Expression: MIT
 Project-URL: homepage, https://github.com/gahjelle/configaroo
 Project-URL: github, https://github.com/gahjelle/configaroo
 Project-URL: issues, https://github.com/gahjelle/configaroo/issues
-Project-URL: changelog, https://github.com/gahjelle/configaroo/blob/main/CHANGELOG.md
+Project-URL: changelog, https://github.com/gahjelle/configaroo/releases
 Keywords: configuration,configuration-management,toml,json
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

{configaroo-0.2.3.dist-info → configaroo-0.3.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-configaroo/__init__.py,sha256=Ed1V019MUJ0Kac5NOY43u83axSsl7I1xE5j1DpAKXeI,412
-configaroo/configuration.py,sha256=CzKS9zy3VCaCDexF5_DuYIhRIyBs8EVst6full9zM34,9728
+configaroo/__init__.py,sha256=yNF3fDQx9xXJEXHtJmeYMdqy-Dnk0mHz2-EL590A858,412
+configaroo/configuration.py,sha256=phBUk_hHRFQb4vCcn6WHfNOnovEmdV6hnotRJkPSz2E,10255
 configaroo/exceptions.py,sha256=GfLf3CLfHStiQjvdS7ZAtrKF9gmGL_8biFLayue6J0M,772
 configaroo/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 configaroo/loaders/__init__.py,sha256=l2pHeD9PJ3ZQA5xUCq9nfFqw2YhAHLeTe50wvhMmTYA,977
 configaroo/loaders/json.py,sha256=fT2Lg4hPM2BuwqrDsP7bcJlepAdmEh2iKU-YVK4KmIA,306
 configaroo/loaders/toml.py,sha256=jw9U78Lf-GMA8QmGIM8xMBqOhPaa8ITSMAhhN1ZNyng,256
-configaroo-0.2.3.dist-info/licenses/LICENSE,sha256=rdeT6Y5bm0MUaERso7HRWpPj37Y1RD5li2lIQaMNJjc,1090
-configaroo-0.2.3.dist-info/METADATA,sha256=Y9N_zcN5p1jO4pHt1sI_BPX2qT_w9S_2UmdhKj87uyM,2686
-configaroo-0.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-configaroo-0.2.3.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
-configaroo-0.2.3.dist-info/RECORD,,
+configaroo-0.3.0.dist-info/licenses/LICENSE,sha256=rdeT6Y5bm0MUaERso7HRWpPj37Y1RD5li2lIQaMNJjc,1090
+configaroo-0.3.0.dist-info/METADATA,sha256=spH6HtB45ksEBsjuCJIADFjWabsQQfzTPZvCuMfV8Fk,2672
+configaroo-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+configaroo-0.3.0.dist-info/top_level.txt,sha256=JVYICl1cWSjvSOZuZMYm976z9lnZaWtHVRSt373QCxg,11
+configaroo-0.3.0.dist-info/RECORD,,