Fixed typo in opentimelineio.spk.yaml

Added render logic to linting command that caused some packages to return an error without it.

Signed-off-by: Nichol Yip <[email protected]>

Author: Nichol Yip

crates/spk-cli/group4/src/cmd_lint.rs

@@ -9,7 +9,7 @@ use clap::Args;
 use colored::Colorize;
 use spk_cli_common::{flags, CommandArgs, Run};
 use spk_schema::v0::Spec;
-use spk_schema::{AnyIdent, Error, LintedItem};
+use spk_schema::{AnyIdent, LintedItem, SpecTemplate, Template, TemplateExt};
 
 /// Validate spk yaml files
 #[derive(Args)]
@@ -24,20 +24,14 @@ pub struct Lint {
 #[async_trait::async_trait]
 impl Run for Lint {
     async fn run(&mut self) -> Result<i32> {
-        // let options = self.options.get_options()?;
         let mut out = 0;
+        let options = self.options.get_options()?;
         for spec in self.packages.iter() {
-            let file_path = spec
-                .canonicalize()
-                .map_err(|err| Error::InvalidPath(spec.to_owned(), err))?;
-            let file = std::fs::File::open(&file_path)
-                .map_err(|err| Error::FileOpenError(file_path.to_owned(), err))?;
-            let rdr = std::io::BufReader::new(file);
+            let yaml = SpecTemplate::from_file(spec).and_then(|t| t.render_lint(&options))?;
+            let lints: std::result::Result<LintedItem<Spec<AnyIdent>>, serde_yaml::Error> =
+                serde_yaml::from_str(&yaml);
 
-            let result: std::result::Result<LintedItem<Spec<AnyIdent>>, serde_yaml::Error> =
-                serde_yaml::from_reader(rdr);
-
-            match result {
+            match lints {
                 Ok(s) => match s.lints.is_empty() {
                     true => println!("{} {}", "OK".green(), spec.display()),
                     false => {

crates/spk-schema/src/spec.rs

@@ -163,6 +163,11 @@ impl Template for SpecTemplate {
             .map_err(Error::InvalidTemplate)?;
         Ok(SpecRecipe::from_yaml(rendered)?)
     }
+
+    fn render_lint(&self, options: &OptionMap) -> Result<String> {
+        let data = super::TemplateData::new(options);
+        spk_schema_liquid::render_template(&self.template, &data).map_err(Error::InvalidTemplate)
+    }
 }
 
 impl TemplateExt for SpecTemplate {

crates/spk-schema/src/template.rs

@@ -19,6 +19,9 @@ pub trait Template: Named + Sized {
 
     /// Render this template with the provided values.
     fn render(&self, options: &OptionMap) -> Result<Self::Output>;
+
+    /// Render this template but return the rendered string instead.
+    fn render_lint(&self, options: &OptionMap) -> Result<String>;
 }
 
 pub trait TemplateExt: Template {

packages/opentimelineio/opentimelineio.spk.yaml

@@ -32,7 +32,7 @@ install:
     - pkg: python
       fromBuildEnv: Binary
 
-  componenents:
+  components:
     - name: run
       files:
         - /bin/