Update templates to also get env and spk data

Signed-off-by: Ryan Bottriell <[email protected]>

Author: rydrman

crates/spk-cli/cmd-make-recipe/src/cmd_make_recipe.rs

@@ -56,7 +56,9 @@ impl Run for MakeRecipe {
 
         tracing::info!("rendering template for {}", template.name());
         tracing::info!("using options {}", options.format_option_map());
-        let rendered = spk_schema_liquid::render_template(template.source(), &options)
+        let data = spk_schema::TemplateData::new(&options);
+        tracing::debug!("full template data: {data:#?}");
+        let rendered = spk_schema_liquid::render_template(template.source(), &data)
             .context("Failed to render template")?;
         print!("{rendered}");
 

crates/spk-schema/src/lib.rs

@@ -52,7 +52,7 @@ pub use spk_schema_foundation::{
     FromYaml,
 };
 pub use spk_schema_ident::{self as ident, Ident};
-pub use template::{Template, TemplateExt};
+pub use template::{Template, TemplateExt, TemplateData};
 pub use test_spec::TestStage;
 pub use validation::{default_validators, ValidationSpec, Validator};
 pub use {serde_json, spk_schema_validators as validators};

crates/spk-schema/src/spec.rs

@@ -123,8 +123,8 @@ impl Template for SpecTemplate {
     }
 
     fn render(&self, options: &OptionMap) -> Result<Self::Output> {
-        let option_data = options.to_yaml_value_expanded();
-        let rendered = spk_schema_liquid::render_template(&self.template, &option_data)
+        let data = super::TemplateData::new(options);
+        let rendered = spk_schema_liquid::render_template(&self.template, &data)
             .map_err(Error::InvalidTemplate)?;
         Ok(SpecRecipe::from_yaml(&rendered)?)
     }

crates/spk-schema/src/template.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // https://github.com/imageworks/spk
 
+use std::collections::HashMap;
 use std::path::Path;
 
 use crate::foundation::option_map::OptionMap;
@@ -24,3 +25,45 @@ pub trait TemplateExt: Template {
     /// Load this template from a file on disk
     fn from_file(path: &Path) -> Result<Self>;
 }
+
+
+/// The structured data that should be made available
+/// when rendering spk templates into recipes
+#[derive(serde::Serialize, Debug, Clone)]
+pub struct TemplateData {
+    /// Information about the release of spk being used
+    spk: SpkInfo,
+    /// The option values for this template, expanded
+    /// from an option map so that namespaced options
+    /// like `python.abi` actual live under the `python`
+    /// field rather than as a field with a '.' in the name
+    opt: serde_yaml::Mapping,
+    /// Environment variable data for the current process
+    env: HashMap<String, String>,
+}
+
+/// The structured data that should be made available
+/// when rendering spk templates into recipes
+#[derive(serde::Serialize, Debug, Clone)]
+struct SpkInfo {
+    version: &'static str,
+}
+
+impl Default for SpkInfo {
+    fn default() -> Self {
+        Self {
+            version: env!("CARGO_PKG_VERSION")
+        }
+    }
+}
+
+impl TemplateData {
+    /// Create the set of templating data for the current process and options
+    pub fn new(options: &OptionMap) -> Self {
+        TemplateData {
+            spk: SpkInfo::default(),
+            opt: options.to_yaml_value_expanded(),
+            env: std::env::vars().into_iter().collect()
+        }
+    }
+}

packages/cmake/cmake.spk.yaml

@@ -1,4 +1,4 @@
-# {% default version = "3.16.4" %}
+# {% assign version = opt.version | default: "3.16.4" %}
 pkg: cmake/{{ version }}
 api: v0/package
 

packages/gnu/gcc/gcc48.spk.yaml

@@ -1,4 +1,4 @@
-# {{ default version = "4.8.5" }}
+# {{ assign version = opt.version | default: "4.8.5" }}
 pkg: gcc/{{ version }}
 api: v0/package
 

packages/gnu/gcc/gcc63.spk.yaml

@@ -1,4 +1,4 @@
-# {{ default version = "{{ version }}" }}
+# {% assign version = opt.version | default: "6.3.3" %}
 pkg: gcc/{{ version }}
 api: v0/package
 

packages/python/python2.spk.yaml

@@ -1,5 +1,6 @@
-# {% default version = "2.7.5" %}
-# {% assign cpXX = version | replace_re: "(\d+)\.(\d+).*", "cp$1$2" %}
+# {% assign version = env.VV | default: "2.7.5" %}
+# {% assign version = opt.version | default: "2.7.5" %}
+# {% assign cpXX = opt.version | replace_re: "(\d+)\.(\d+).*", "cp$1$2" %}
 pkg: python/{{ version }}
 api: v0/package
 sources:

packages/python/python3.spk.yaml

@@ -1,4 +1,4 @@
-# {% default version = "3.7.3" %}
+# {% assign version =  opt.version | default: "3.7.3" %}
 # {% assign cpXX = version | replace_re: "(\d+)\.(\d+).*", "cp$1$2" %}
 pkg: python/{{ version }}
 api: v0/package