fix: display undeclared variables when rendering templates

Author: oknozor

src/dots.rs

@@ -145,15 +145,19 @@ impl Dot {
         // Single file : inject vars and write to .dots/
         if source.is_file() {
             fs::create_dir_all(&target.parent().unwrap())?;
-            if let Ok(content) = vars.to_dot(source) {
-                let permissions = fs::metadata(source)?.permissions();
-                let mut dot_copy = File::create(&target)?;
-                dot_copy.write_all(content.as_bytes())?;
-                dot_copy.set_permissions(permissions)?;
-            } else {
-                // Something went wrong parsing or reading the source path,
-                // We just copy the file in place
-                fs::copy(source, target)?;
+            match vars.to_dot(source) {
+                Ok(content) => {
+                    let permissions = fs::metadata(source)?.permissions();
+                    let mut dot_copy = File::create(&target)?;
+                    dot_copy.write_all(content.as_bytes())?;
+                    dot_copy.set_permissions(permissions)?;
+                }
+                Err(err) => {
+                    // Something went wrong parsing or reading the source path,
+                    // We just copy the file in place
+                    fs::copy(source, target)?;
+                    eprintln!("{err:?}")
+                }
             }
         } else if source.is_dir() {
             fs::create_dir_all(target)?;

src/templating.rs

@@ -1,11 +1,12 @@
 use crate::gpg::{Gpg, GPG_PREFIX};
-use anyhow::{anyhow, Context, Result};
+use anyhow::{anyhow, Result};
 use colored::Colorize;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::prelude::*;
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
+use tera::Tera;
 
 #[derive(Clone, Debug, Default)]
 pub(crate) struct Variables {
@@ -82,8 +83,11 @@ impl Variables {
             context.insert(k.to_owned(), v);
         });
 
-        tera::Tera::one_off(&contents, &context, false)
-            .context("Failed to apply templating to file:")
+        let mut tera = Tera::default();
+        let filename = path.as_os_str().to_str().expect("Non UTF8 filename");
+
+        tera.add_raw_template(filename, &contents)?;
+        tera.render(filename, &context).map_err(Into::into)
     }
 
     pub(crate) fn resolve_ref(&mut self) {