toml-combine 0.1.7__tar.gz → 0.2.0__tar.gz

{toml_combine-0.1.7 → toml_combine-0.2.0}/.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5
+        uses: astral-sh/setup-uv@0c5e2b8115b80b4c7c5ddf6ffdd634974642d182 # v5
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -53,7 +53,7 @@ jobs:
           ref: ${{ github.ref }}
 
       - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@f94ec6bedd8674c4426838e6b50417d36b6ab231 # v5
+        uses: astral-sh/setup-uv@0c5e2b8115b80b4c7c5ddf6ffdd634974642d182 # v5
 
       - name: Build wheel & sdist
         run: uv build

{toml_combine-0.1.7 → toml_combine-0.2.0}/.pre-commit-config.yaml

@@ -22,11 +22,11 @@ repos:
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/uv-pre-commit
     # uv version.
-    rev: 0.6.12
+    rev: 0.6.13
     hooks:
       - id: uv-lock
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.0
+    rev: v0.11.4
     hooks:
       - id: ruff
         args: [--fix, --unsafe-fixes, --show-fixes]

{toml_combine-0.1.7 → toml_combine-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toml-combine
-Version: 0.1.7
+Version: 0.2.0
 Summary: A tool for combining complex configurations in TOML format.
 Author-email: Joachim Jablon <ewjoachim@gmail.com>
 License-Expression: MIT
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
-Requires-Dist: tomli>=2.2.1
+Requires-Dist: tomlkit
 Description-Content-Type: text/markdown
 
 # Toml-combine
@@ -35,12 +35,6 @@ The configuration file is usually a TOML file. Here's a small example:
 [dimensions]
 environment = ["production", "staging"]
 
-[[output]]
-environment = "production"
-
-[[output]]
-environment = "staging"
-
 [default]
 name = "my-service"
 registry = "gcr.io/my-project/"
@@ -61,16 +55,6 @@ Dimensions lets you describe the main "thing" that makes the outputs differents,
 service might be `frontend` or `backend`. Some combinations of dimensions might not
 exists, for example, maybe there's no `staging` in `eu`.
 
-### Outputs
-
-Create a `output` for each configuration you want to generate, and specify the
-dimensions relevant for this output. It's ok to omit some dimensions when they're not
-used for a given output.
-
-> [!Note]
-> Defining a list as the value of one or more dimensions in a output
-> is a shorthand for defining all combinations of dimensions
-
 ### Default
 
 The common configuration to start from, before we start overlaying overrides on top.
@@ -93,7 +77,7 @@ specific to more specific, each one overriding the values of the previous ones:
 
 ### The configuration itself
 
-Under the layer of `dimensions/output/default/override` system, what you actually define
+Under the layer of `dimensions/default/override/mapping` system, what you actually define
 in the configuration is completely up to you. That said, only nested
 "dictionnaries"/"objects"/"tables"/"mapping" (those are all the same things in
 Python/JS/Toml lingo) will be merged between the default and the overrides, while
@@ -110,9 +94,6 @@ Let's look at an example:
 [dimensions]
 environment = ["production", "staging"]
 
-[[output]]
-environment = ["production", "staging"]
-
 [default]
 fruits = [{name="apple", color="red"}]
 
@@ -121,17 +102,16 @@ when.environment = "staging"
 fruits = [{name="orange", color="orange"}]
 ```
 
-In this example, on staging, `fruits` is `[{name="orange", color="orange"}]` and not `[{name="apple", color="red"}, {name="orange", color="orange"}]`.
-The only way to get multiple values to be merged is if they are tables: you'll need
+In this example, with `{"environment": "staging"}`, `fruits` is
+`[{name="orange", color="orange"}]` and not
+`[{name="apple", color="red"}, {name="orange", color="orange"}]`.
+The only way to get multiple values to be merged is if they are dicts: you'll need
 to chose an element to become the key:
 
 ```toml
 [dimensions]
 environment = ["production", "staging"]
 
-[[output]]
-environment = ["production", "staging"]
-
 [default]
 fruits.apple.color = "red"
 
@@ -146,22 +126,54 @@ This example is simple because `name` is a natural choice for the key. In some c
 the choice is less natural, but you can always decide to name the elements of your
 list and use that name as a key. Also, yes, you'll loose ordering.
 
-### A bigger example
+### Mapping
+
+When you call the tool either with the CLI or the lib (see both below), you will have to
+provide a mapping of the desired dimentions. These values will be compared to overrides
+to apply overrides when relevant. It's ok to omit some dimensions, corresponding
+overrides won't be selected. The mapping you pass is also returned in the output as a
+dict under the `dimensions` key.
+
+By default, the output is `toml` though you can switch to `json` with `--format=json`
+
+## CLI
+
+Example with the config from the previous section:
+
+```console
+$ toml-combine path/to/config.toml --environment=staging
+[dimensions]
+environment = "staging"
+
+[fruits]
+apple.color = "red"
+orange.color = "orange"
+```
+
+## Lib
+
+```python
+import toml_combine
+
+
+result = toml_combine.combine(config_file=config_file, environment="staging")
+
+print(result)
+{
+  "dimensions": {"environment": "staging"},
+  "fruits": {"apple": {"color": "red"}, "orange": {"color": "orange"}}
+}
+```
+
+You can pass either `config` (TOML string or dict) or `config_file` (`pathlib.Path` or string path) to `combine()`. All other `kwargs` specify the mapping you want.
+
+## A bigger example
 
 ```toml
 [dimensions]
 environment = ["production", "staging", "dev"]
 service = ["frontend", "backend"]
 
-# All 4 combinations of those values will exist
-[[output]]
-environment = ["production", "staging"]
-service = ["frontend", "backend"]
-
-# On dev, the "service" is not defined. That's ok.
-[[output]]
-environment = "dev"
-
 [default]
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
@@ -181,39 +193,86 @@ container.port = 8080
 name = "service-dev"
 when.environment = "dev"
 container.env.DEBUG = true
+
+[[override]]
+when.environment = ["staging", "dev"]
+when.service = "backend"
+container.env.ENABLE_EXPENSIVE_MONITORING = false
 ```
 
-### CLI
+This produces the following configs:
 
 ```console
-$ toml-combine {path/to/config.toml}
+$ uv run toml-combine example.toml --environment=production --service=frontend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-frontend"
+[dimensions]
+environment = "production"
+service = "frontend"
+
+[container]
+image_name = "my-image-frontend"
 ```
 
-Generates all the outputs described by the given TOML config.
+```console
+$ toml-combine example.toml --environment=production --service=backend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-backend"
+[dimensions]
+environment = "production"
+service = "backend"
 
-Note that you can restrict generation to some dimension values by passing
-`--{dimension}={value}`
+[container]
+image_name = "my-image-backend"
+port = 8080
+```
 
-## Lib
+```console
+$ toml-combine example.toml --environment=staging --service=frontend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-frontend"
+[dimensions]
+environment = "staging"
+service = "frontend"
 
-```python
-import toml_combine
+[container]
+image_name = "my-image-frontend"
+```
 
+```console
+$ toml-combine example.toml --environment=staging --service=backend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-backend"
+[dimensions]
+environment = "staging"
+service = "backend"
 
-result = toml_combine.combine(
-        config_file=config_file,
-        environment=["production", "staging"],
-        type="job",
-        job=["manage", "special-command"],
-    )
+[container]
+image_name = "my-image-backend"
+port = 8080
 
-print(result)
-{
-  "production-job-manage": {...},
-  "production-job-special-command": {...},
-  "staging-job-manage": {...},
-  "staging-job-special-command": {...},
-}
+[container.env]
+ENABLE_EXPENSIVE_MONITORING = false
 ```
 
-You can pass either `config` (TOML string or dict) or `config_file` (`pathlib.Path` or string path) to `combine()`. Additional `kwargs` restrict the output.
+```console
+$ toml-combine example.toml --environment=dev --service=backend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-backend"
+[dimensions]
+environment = "dev"
+service = "backend"
+
+[container]
+image_name = "my-image-backend"
+port = 8080
+[container.env]
+DEBUG = true
+ENABLE_EXPENSIVE_MONITORING = false
+
+```

{toml_combine-0.1.7 → toml_combine-0.2.0}/README.md

@@ -16,12 +16,6 @@ The configuration file is usually a TOML file. Here's a small example:
 [dimensions]
 environment = ["production", "staging"]
 
-[[output]]
-environment = "production"
-
-[[output]]
-environment = "staging"
-
 [default]
 name = "my-service"
 registry = "gcr.io/my-project/"
@@ -42,16 +36,6 @@ Dimensions lets you describe the main "thing" that makes the outputs differents,
 service might be `frontend` or `backend`. Some combinations of dimensions might not
 exists, for example, maybe there's no `staging` in `eu`.
 
-### Outputs
-
-Create a `output` for each configuration you want to generate, and specify the
-dimensions relevant for this output. It's ok to omit some dimensions when they're not
-used for a given output.
-
-> [!Note]
-> Defining a list as the value of one or more dimensions in a output
-> is a shorthand for defining all combinations of dimensions
-
 ### Default
 
 The common configuration to start from, before we start overlaying overrides on top.
@@ -74,7 +58,7 @@ specific to more specific, each one overriding the values of the previous ones:
 
 ### The configuration itself
 
-Under the layer of `dimensions/output/default/override` system, what you actually define
+Under the layer of `dimensions/default/override/mapping` system, what you actually define
 in the configuration is completely up to you. That said, only nested
 "dictionnaries"/"objects"/"tables"/"mapping" (those are all the same things in
 Python/JS/Toml lingo) will be merged between the default and the overrides, while
@@ -91,9 +75,6 @@ Let's look at an example:
 [dimensions]
 environment = ["production", "staging"]
 
-[[output]]
-environment = ["production", "staging"]
-
 [default]
 fruits = [{name="apple", color="red"}]
 
@@ -102,17 +83,16 @@ when.environment = "staging"
 fruits = [{name="orange", color="orange"}]
 ```
 
-In this example, on staging, `fruits` is `[{name="orange", color="orange"}]` and not `[{name="apple", color="red"}, {name="orange", color="orange"}]`.
-The only way to get multiple values to be merged is if they are tables: you'll need
+In this example, with `{"environment": "staging"}`, `fruits` is
+`[{name="orange", color="orange"}]` and not
+`[{name="apple", color="red"}, {name="orange", color="orange"}]`.
+The only way to get multiple values to be merged is if they are dicts: you'll need
 to chose an element to become the key:
 
 ```toml
 [dimensions]
 environment = ["production", "staging"]
 
-[[output]]
-environment = ["production", "staging"]
-
 [default]
 fruits.apple.color = "red"
 
@@ -127,22 +107,54 @@ This example is simple because `name` is a natural choice for the key. In some c
 the choice is less natural, but you can always decide to name the elements of your
 list and use that name as a key. Also, yes, you'll loose ordering.
 
-### A bigger example
+### Mapping
+
+When you call the tool either with the CLI or the lib (see both below), you will have to
+provide a mapping of the desired dimentions. These values will be compared to overrides
+to apply overrides when relevant. It's ok to omit some dimensions, corresponding
+overrides won't be selected. The mapping you pass is also returned in the output as a
+dict under the `dimensions` key.
+
+By default, the output is `toml` though you can switch to `json` with `--format=json`
+
+## CLI
+
+Example with the config from the previous section:
+
+```console
+$ toml-combine path/to/config.toml --environment=staging
+[dimensions]
+environment = "staging"
+
+[fruits]
+apple.color = "red"
+orange.color = "orange"
+```
+
+## Lib
+
+```python
+import toml_combine
+
+
+result = toml_combine.combine(config_file=config_file, environment="staging")
+
+print(result)
+{
+  "dimensions": {"environment": "staging"},
+  "fruits": {"apple": {"color": "red"}, "orange": {"color": "orange"}}
+}
+```
+
+You can pass either `config` (TOML string or dict) or `config_file` (`pathlib.Path` or string path) to `combine()`. All other `kwargs` specify the mapping you want.
+
+## A bigger example
 
 ```toml
 [dimensions]
 environment = ["production", "staging", "dev"]
 service = ["frontend", "backend"]
 
-# All 4 combinations of those values will exist
-[[output]]
-environment = ["production", "staging"]
-service = ["frontend", "backend"]
-
-# On dev, the "service" is not defined. That's ok.
-[[output]]
-environment = "dev"
-
 [default]
 registry = "gcr.io/my-project/"
 service_account = "my-service-account"
@@ -162,39 +174,86 @@ container.port = 8080
 name = "service-dev"
 when.environment = "dev"
 container.env.DEBUG = true
+
+[[override]]
+when.environment = ["staging", "dev"]
+when.service = "backend"
+container.env.ENABLE_EXPENSIVE_MONITORING = false
 ```
 
-### CLI
+This produces the following configs:
 
 ```console
-$ toml-combine {path/to/config.toml}
+$ uv run toml-combine example.toml --environment=production --service=frontend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-frontend"
+[dimensions]
+environment = "production"
+service = "frontend"
+
+[container]
+image_name = "my-image-frontend"
 ```
 
-Generates all the outputs described by the given TOML config.
+```console
+$ toml-combine example.toml --environment=production --service=backend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-backend"
+[dimensions]
+environment = "production"
+service = "backend"
 
-Note that you can restrict generation to some dimension values by passing
-`--{dimension}={value}`
+[container]
+image_name = "my-image-backend"
+port = 8080
+```
 
-## Lib
+```console
+$ toml-combine example.toml --environment=staging --service=frontend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-frontend"
+[dimensions]
+environment = "staging"
+service = "frontend"
 
-```python
-import toml_combine
+[container]
+image_name = "my-image-frontend"
+```
 
+```console
+$ toml-combine example.toml --environment=staging --service=backend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-backend"
+[dimensions]
+environment = "staging"
+service = "backend"
 
-result = toml_combine.combine(
-        config_file=config_file,
-        environment=["production", "staging"],
-        type="job",
-        job=["manage", "special-command"],
-    )
+[container]
+image_name = "my-image-backend"
+port = 8080
 
-print(result)
-{
-  "production-job-manage": {...},
-  "production-job-special-command": {...},
-  "staging-job-manage": {...},
-  "staging-job-special-command": {...},
-}
+[container.env]
+ENABLE_EXPENSIVE_MONITORING = false
 ```
 
-You can pass either `config` (TOML string or dict) or `config_file` (`pathlib.Path` or string path) to `combine()`. Additional `kwargs` restrict the output.
+```console
+$ toml-combine example.toml --environment=dev --service=backend
+registry = "gcr.io/my-project/"
+service_account = "my-service-account"
+name = "service-backend"
+[dimensions]
+environment = "dev"
+service = "backend"
+
+[container]
+image_name = "my-image-backend"
+port = 8080
+[container.env]
+DEBUG = true
+ENABLE_EXPENSIVE_MONITORING = false
+
+```

{toml_combine-0.1.7 → toml_combine-0.2.0}/pyproject.toml

@@ -34,7 +34,7 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 
-dependencies = ["tomli>=2.2.1"]
+dependencies = ["tomlkit"]
 
 [tool.uv]
 default-groups = ["test"]

{toml_combine-0.1.7 → toml_combine-0.2.0}/tests/test.toml

@@ -5,64 +5,6 @@ stack = ["next", "django"]
 service = ["api", "admin"]
 job = ["manage", "special-command"]
 
-[[output]]
-environment = "staging"
-stack = "next"
-type = "service"
-
-[[output]]
-environment = "staging"
-stack = "django"
-type = "service"
-service = "api"
-
-[[output]]
-environment = "staging"
-stack = "django"
-type = "service"
-service = "admin"
-
-[[output]]
-environment = "staging"
-stack = "django"
-type = "job"
-job = "manage"
-
-[[output]]
-environment = "staging"
-stack = "django"
-type = "job"
-job = "special-command"
-
-[[output]]
-environment = "production"
-stack = "next"
-type = "service"
-
-[[output]]
-environment = "production"
-stack = "django"
-type = "service"
-service = "api"
-
-[[output]]
-environment = "production"
-stack = "django"
-type = "service"
-service = "admin"
-
-[[output]]
-environment = "production"
-stack = "django"
-type = "job"
-job = "manage"
-
-[[output]]
-environment = "production"
-stack = "django"
-type = "job"
-job = "special-command"
-
 [default]
 registry.region = "us"
 
@@ -107,7 +49,9 @@ cloudsql_instance = "staging-postgres"
 containers.app.env.APP_FOO = "qux"
 
 [[override]]
-when.service = "admin"
+# The following line defines when in an array. It's not useful, as there's only one
+# value,  but we want to test that arrays work too.
+when.service = ["admin"]
 containers.app.name = "admin"
 containers.app.env.APP_ADMIN_ENABLED = true
 containers.app.env.APP_ID = 1234

toml_combine-0.2.0/tests/test_cli.py

@@ -0,0 +1,58 @@
+from __future__ import annotations
+
+import json
+import pathlib
+
+from toml_combine import cli, toml
+
+
+def test_cli__json(capsys):
+    """Test the CLI."""
+    cli.cli(
+        argv=[
+            "tests/test.toml",
+            "--format",
+            "json",
+            "--environment",
+            "staging",
+            "--type",
+            "service",
+            "--stack",
+            "django",
+            "--service",
+            "admin",
+        ]
+    )
+    out, err = capsys.readouterr()
+    print("out:")
+    print(out)
+    print("err:")
+    print(err)
+
+    expected = json.loads((pathlib.Path(__file__).parent / "result.json").read_text())
+    assert json.loads(out) == expected["staging-service-django-admin"]
+
+
+def test_cli__toml(capsys):
+    """Test the CLI."""
+    cli.cli(
+        argv=[
+            "tests/test.toml",
+            "--environment",
+            "staging",
+            "--type",
+            "service",
+            "--stack",
+            "django",
+            "--service",
+            "admin",
+        ]
+    )
+    out, err = capsys.readouterr()
+    print("out:")
+    print(out)
+    print("err:")
+    print(err)
+
+    expected = json.loads((pathlib.Path(__file__).parent / "result.json").read_text())
+    assert toml.loads(out) == expected["staging-service-django-admin"]