0.5

.github/workflows/wiki.yml

@@ -22,7 +22,7 @@ jobs:
           cargo run --target=x86_64-unknown-linux-gnu -- man -o ./markdown -f markdown
 
           # render and include schema
-          cargo run --target=x86_64-unknown-linux-gnu -- config schema > ./docs/schema.json
+          cargo run --target=x86_64-unknown-linux-gnu -- workflow schema > ./docs/schema.json
           fmerge merge -p "<-- %f -->" -f ./docs/README.md > ./docs/README_MERGED.md
           mv ./docs/README_MERGED.md ./docs/README.md
 

.neomake.yaml

@@ -3,10 +3,12 @@ version: "0.5"
 nodes:
   build:
     matrix:
-      - - env:
-            RELEASE: ""
-        - env:
-            RELEASE: "--release"
+      dense:
+        dimensions:
+          - - env:
+                RELEASE: ""
+            - env:
+                RELEASE: "--release"
     tasks:
       - script: |
           set -e

Cargo.toml

@@ -35,6 +35,7 @@ threadpool = "^1.8"
 schemars = "0.8.12"
 toml = "0.7.6"
 ron = "0.8.0"
+fancy-regex = "0.11.0"
 
 [dev-dependencies]
 rusty-hook = "0.11.2"

res/templates/max.yaml

@@ -16,10 +16,12 @@ nodes:
       args:
         - -c
     matrix:
-      - - env:
-            PRINT_VAL: value 0
-        - env:
-            PRINT_VAL: value 1
+      dense:
+        dimensions:
+          - - env:
+                PRINT_VAL: value 0
+            - env:
+                PRINT_VAL: value 1
     tasks:
       - shell:
           program: python
@@ -31,20 +33,22 @@ nodes:
 
   a:
     matrix:
-      - - env:
-            VA: A0
-        - env:
-            VA: A1
-      - - env:
-            VB: B0
-        - env:
-            VB: B1
-        - env:
-            VB: B2
-      - - env:
-            VC: C0
-        - env:
-            VC: C1
+      dense:
+        dimensions:
+          - - env:
+                VA: A0
+            - env:
+                VA: A1
+          - - env:
+                VB: B0
+            - env:
+                VB: B1
+            - env:
+                VB: B2
+          - - env:
+                VC: C0
+            - env:
+                VC: C1
     tasks:
       - script: echo "$VA $VB $VC"
   b:
@@ -75,8 +79,10 @@ nodes:
 
   test:
     matrix:
-      - - env:
-            OVERRIDE_ENV_VAR_0: new e0
+      dense:
+        dimensions:
+          - - env:
+                OVERRIDE_ENV_VAR_0: new e0
     tasks:
       - env:
           OVERRIDE_ENV_VAR_1: new e1

res/templates/python.yaml

@@ -3,14 +3,16 @@ version: "0.5"
 nodes:
   count:
     matrix:
-      - - env:
-            X: "0"
-        - env:
-            X: "1"
-      - - env:
-            Y: "0"
-        - env:
-            Y: "1"
+      dense:
+        dimensions:
+          - - env:
+                X: "0"
+            - env:
+                X: "1"
+          - - env:
+                Y: "0"
+            - env:
+                Y: "1"
     tasks:
       - shell:
           program: "python3"

src/args.rs

@@ -8,7 +8,7 @@ use std::{
 
 use clap::{Arg, ArgAction};
 
-use crate::{error::Error, model::ExecutionPlan};
+use crate::{error::Error, plan::ExecutionPlan};
 
 #[derive(Debug, Eq, PartialEq)]
 pub(crate) enum Privilege {

src/error.rs

@@ -41,4 +41,6 @@ pub(crate) enum Error {
     DeserializeRon(#[from] ron::error::SpannedError),
     #[error("handlebars")]
     Handlebars(#[from] handlebars::RenderError),
+    #[error("regex")]
+    RegexError(#[from] fancy_regex::Error),
 }

src/main.rs

@@ -10,6 +10,7 @@ pub mod args;
 pub mod error;
 pub mod model;
 pub mod output;
+pub mod plan;
 pub mod reference;
 pub mod workflow;
 
@@ -84,7 +85,7 @@ async fn main() -> Result<(), crate::error::Error> {
             format,
         } => {
             let m = model::Workflow::load(&workflow)?;
-            m.plan(&nodes, &format).await?;
+            m.describe(&nodes, &format).await?;
             Ok(())
         },
     }