diff options
| -rw-r--r-- | examples/echo/echo.md | 4 | ||||
| -rw-r--r-- | examples/muck/muck.md | 4 | ||||
| -rw-r--r-- | examples/website/website.md | 4 | ||||
| -rw-r--r-- | reference.md | 12 | ||||
| -rw-r--r-- | subplot.md | 135 | ||||
| -rw-r--r-- | subplotlib/files.md | 3 | ||||
| -rw-r--r-- | subplotlib/runcmd.md | 3 | ||||
| -rw-r--r-- | subplotlib/subplotlib.md | 8 | ||||
| -rw-r--r-- | tests/python/daemon.md | 8 | ||||
| -rw-r--r-- | tests/python/files.md | 6 | ||||
| -rw-r--r-- | tests/python/runcmd.md | 10 |
11 files changed, 99 insertions, 98 deletions
diff --git a/examples/echo/echo.md b/examples/echo/echo.md index f7a43b3..3a991ba 100644 --- a/examples/echo/echo.md +++ b/examples/echo/echo.md @@ -1,9 +1,9 @@ --- title: "**echo**(1) acceptance tests" author: The Subplot project -template: bash bindings: [echo.yaml] -functions: [echo.sh] +impls: + bash: [echo.sh] bibliography: [echo.bib] ... diff --git a/examples/muck/muck.md b/examples/muck/muck.md index e02e522..48f421f 100644 --- a/examples/muck/muck.md +++ b/examples/muck/muck.md @@ -3,8 +3,8 @@ title: Muck JSON storage server and API author: Lars Wirzenius date: work in progress bindings: [muck.yaml] -functions: [muck.py] -template: python +impls: + python: [muck.py] ... Introduction diff --git a/examples/website/website.md b/examples/website/website.md index 5d4f61e..391f09b 100644 --- a/examples/website/website.md +++ b/examples/website/website.md @@ -179,7 +179,7 @@ achieve this, you should make the following changes: --- title: Subplot website tutorial author: The Subplot project -template: python bindings: [website.yaml] -functions: [website.py] +impls: + python: [website.py] ... diff --git a/reference.md b/reference.md index 62f827b..7b7b2bd 100644 --- a/reference.md +++ b/reference.md @@ -66,15 +66,15 @@ exit "$exit" --- title: Test Subplot against reference subplots author: The Subplot project -template: python bindings: - reference.yaml - subplot.yaml - lib/runcmd.yaml - lib/files.yaml -functions: -- reference.py -- subplot.py -- lib/files.py -- lib/runcmd.py +impls: + python: + - reference.py + - subplot.py + - lib/files.py + - lib/runcmd.py ... @@ -1,15 +1,15 @@ --- title: "Subplot" author: The Subplot project -template: python bindings: - subplot.yaml - lib/runcmd.yaml - lib/files.yaml -functions: -- subplot.py -- lib/files.py -- lib/runcmd.py +impls: + python: + - subplot.py + - lib/files.py + - lib/runcmd.py classes: - json ... @@ -647,11 +647,11 @@ they are how Pandoc recongizes the block. title: "Subplot" author: The Subplot project date: work in progress -template: python bindings: - subplot.yaml -functions: -- subplot.py +impls: + python: + - subplot.py ... ~~~ @@ -818,8 +818,8 @@ then command fails --- title: Bad filenames in matched steps do not permit codegen bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # Bad filename @@ -976,8 +976,8 @@ duplicated for each scenario. --- title: Test scenario bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # Simple @@ -1087,7 +1087,7 @@ and stderr contains "no scenarios were found" ~~~{#noscenarios.md .file .markdown .numberLines} --- title: No scenarios in here -template: python +impls: { python: [] } ... # This is a title @@ -1125,8 +1125,8 @@ and command is successful --- title: All the keywords scenario bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # All keywords @@ -1198,8 +1198,8 @@ then command fails --- title: Continuation keyword misuse bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # Continuation keyword misuse @@ -1231,7 +1231,7 @@ then file foo.pdf exists --- title: This _uses_ ~~all~~ **most** inline `markup` subtitle: H~2~O is not 2^10^ -template: python +impls: { python: [] } ... # Introduction @@ -1262,8 +1262,8 @@ and command is successful --- title: Test scenario bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # Simple @@ -1370,8 +1370,8 @@ and command is successful --- title: Cleanup bindings: [cleanup.yaml] -functions: [cleanup.py] -template: python +impls: + python: [cleanup.py] ... # Cleanup @@ -1402,8 +1402,8 @@ and command fails --- title: Cleanup bindings: [cleanup.yaml] -functions: [cleanup.py] -template: python +impls: + python: [cleanup.py] ... # Cleanup @@ -1434,8 +1434,8 @@ and command is successful --- title: Cleanup bindings: [cleanup.yaml] -functions: [cleanup.sh] -template: bash +impls: + bash: [cleanup.sh] ... # Cleanup @@ -1469,8 +1469,8 @@ and command fails --- title: Cleanup bindings: [cleanup.yaml] -functions: [cleanup.sh] -template: bash +impls: + bash: [cleanup.sh] ... # Cleanup @@ -1509,8 +1509,8 @@ and step "then TMPDIR is set" was run --- title: TMPDIR bindings: [tmpdir.yaml] -functions: [tmpdir.py] -template: python +impls: + python: [tmpdir.py] ... # TMPDIR @@ -1561,8 +1561,8 @@ and command is successful --- title: Simple pattern capture bindings: [simplepattern.yaml] -functions: [capture.py] -template: python +impls: + python: [capture.py] ... # Simple pattern @@ -1605,8 +1605,8 @@ and stderr contains "simple pattern contains regex" --- title: Simple pattern capture bindings: [confusedpattern.yaml] -functions: [capture.py] -template: python +impls: + python: [capture.py] ... # Simple pattern @@ -1638,8 +1638,8 @@ then command is successful --- title: Simple pattern capture bindings: [confusedbutok.yaml] -functions: [capture.py] -template: python +impls: + python: [capture.py] ... # Simple pattern @@ -1675,8 +1675,8 @@ and command is successful --- title: Regex capture bindings: [regex.yaml] -functions: [capture.py] -template: python +impls: + python: [capture.py] ... # Regex @@ -1723,8 +1723,8 @@ then command is successful --- title: Values bindings: [values.yaml] -functions: [values.py] -template: python +impls: + python: [values.py] ... @@ -1797,8 +1797,8 @@ then command is successful --- title: Environment variables bindings: [env.yaml] -functions: [env.py] -template: python +impls: + python: [env.py] ... # Test @@ -1920,8 +1920,8 @@ and command is successful --- title: Test scenario bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # heading 1 @@ -1950,8 +1950,8 @@ and command is successful --- title: Test scenario bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # heading 1 @@ -1984,8 +1984,8 @@ and command is successful --- title: Test scenario bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # heading 1 @@ -2021,8 +2021,8 @@ and command is successful --- title: Test scenario bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # heading 1 @@ -2105,8 +2105,8 @@ then command is successful --- title: Plain *emph* **strong** ~~strikeout~~ superscript^10^ subscript~10~ bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... @@ -2160,8 +2160,8 @@ and command is successful --- title: Test scenario bindings: [b.yaml] -functions: [f.py] -template: python +impls: + python: [f.py] ... # One @@ -2203,8 +2203,8 @@ and command is successful --- title: Test scenario bindings: [b.yaml] -functions: [f.sh] -template: bash +impls: + bash: [f.sh] ... # One @@ -2384,8 +2384,8 @@ and stderr contains ": missing-functions.py:" --- title: Missing functions bindings: [b.yaml] -functions: [missing-functions.py] -template: python +impls: + python: [missing-functions.py] ... ~~~ @@ -2400,8 +2400,8 @@ subplot metadata would extract this information from the **simple.md** example: ~~~ title: Test scenario bindings: [b.yaml] -template: python -functions: [f.py] +impls: + python: [f.py] scenario Simple ~~~ @@ -2441,10 +2441,10 @@ title: Document refers to external images bindings: - b.yaml - other.yaml -template: python -functions: -- f.py -- other.py +impls: + python: + - f.py + - other.py bibliography: [foo.bib, bar.bib] ... @@ -2764,7 +2764,7 @@ then command fails ~~~~{#casemismatch.md .file .markdown} --- title: Case sensitivity mismatch -template: python +impls: { python: [] } bindings: - badbindings.yaml ... @@ -2788,11 +2788,10 @@ then command fails ~~~~{#twobindings.md .file .markdown} --- title: Two bindings match -template: python bindings: - twobindings.yaml -functions: -- a_function.py +impls: + python: [a_function.py] ... # Broken scenario because step has two possible bindings diff --git a/subplotlib/files.md b/subplotlib/files.md index a5b54fc..22e8f3c 100644 --- a/subplotlib/files.md +++ b/subplotlib/files.md @@ -1,9 +1,10 @@ --- title: Acceptance criteria for the files subplotlib step library author: The Subplot project -template: rust bindings: - lib/files.yaml +impls: + rust: [] ... # Introduction diff --git a/subplotlib/runcmd.md b/subplotlib/runcmd.md index 50e41f6..f6b9d85 100644 --- a/subplotlib/runcmd.md +++ b/subplotlib/runcmd.md @@ -1,10 +1,11 @@ --- title: Acceptance criteria for the runcmd step library for subplotlib. author: The Subplot project -template: rust bindings: - lib/runcmd.yaml - lib/files.yaml +impls: + rust: [] ... # Introduction diff --git a/subplotlib/subplotlib.md b/subplotlib/subplotlib.md index c46134a..d3b6a80 100644 --- a/subplotlib/subplotlib.md +++ b/subplotlib/subplotlib.md @@ -1,12 +1,12 @@ --- title: Testing the Rust crate "subplotlib" -template: rust bindings: - subplotlib.yaml - lib/datadir.yaml -functions: - - helpers/subplotlib_context.rs - - helpers/subplotlib_impl.rs +impls: + rust: + - helpers/subplotlib_context.rs + - helpers/subplotlib_impl.rs ... # Rust library for assisting with running subplots diff --git a/tests/python/daemon.md b/tests/python/daemon.md index 6d9b8f4..51c77b4 100644 --- a/tests/python/daemon.md +++ b/tests/python/daemon.md @@ -182,8 +182,8 @@ title: Acceptance criteria for the lib/daemon Subplot library author: The Subplot project bindings: - lib/daemon.yaml -template: python -functions: -- lib/daemon.py -- lib/runcmd.py +impls: + python: + - lib/daemon.py + - lib/runcmd.py ... diff --git a/tests/python/files.md b/tests/python/files.md index 5c96a2c..7837da6 100644 --- a/tests/python/files.md +++ b/tests/python/files.md @@ -97,9 +97,9 @@ then directory second does not exist --- title: Acceptance criteria for the files Subplot library author: The Subplot project -template: python bindings: - lib/files.yaml -functions: -- lib/files.py +impls: + python: + - lib/files.py ... diff --git a/tests/python/runcmd.md b/tests/python/runcmd.md index 7b88dd3..01e6904 100644 --- a/tests/python/runcmd.md +++ b/tests/python/runcmd.md @@ -202,13 +202,13 @@ then stderr doesn't match regex world$ --- title: Acceptance criteria for the lib/runcmd Subplot library author: The Subplot project -template: python bindings: - lib/runcmd.yaml - runcmd_test.yaml - lib/files.yaml -functions: -- lib/runcmd.py -- runcmd_test.py -- lib/files.py +impls: + python: + - lib/runcmd.py + - runcmd_test.py + - lib/files.py ... |