refactor: make profile template context global

Author: oknozor

src/dots.rs

@@ -24,7 +24,6 @@ impl Dot {
         &self,
         vars: &Variables,
         auto_ignored: Vec<PathBuf>,
-        profiles: &[String],
     ) -> Result<LinkResult> {
         let source = &self.source()?;
         let target = &self.copy_path_unchecked();
@@ -47,7 +46,7 @@ impl Dot {
         }
 
         // Recursively copy dotfile to .dots directory
-        self.traverse_and_copy(source, target, ignored_paths.as_slice(), &vars, profiles)
+        self.traverse_and_copy(source, target, ignored_paths.as_slice(), &vars)
     }
 
     fn load_local_vars(source: &Path) -> Variables {
@@ -73,7 +72,6 @@ impl Dot {
         target: &PathBuf,
         ignored: &[PathBuf],
         vars: &Variables,
-        profiles: &[String],
     ) -> Result<LinkResult> {
         if ignored.contains(source) {
             return Ok(LinkResult::Ignored {
@@ -85,7 +83,7 @@ impl Dot {
         if source.is_file() {
             fs::create_dir_all(target.parent().unwrap())?;
 
-            match vars.to_dot(source, profiles) {
+            match vars.to_dot(source) {
                 Ok(content) if target.exists() => self.update(source, target, content),
                 Ok(content) => self.create(source, target, content),
                 Err(e) if target.exists() => {
@@ -95,10 +93,10 @@ impl Dot {
                             // Those should be symlinked directly once this is implemented
                             // https://github.com/oknozor/toml-bombadil/issues/138
                         }
-                        ErrorKind::Msg(message) => println!("\t{}", message.red()),
                         _ => {
                             if let Some(source) = e.source() {
-                                println!("\t{}", source);
+                                let message = format!("{source}");
+                                println!("{}", message.red());
                             }
                         }
                     }
@@ -124,7 +122,6 @@ impl Dot {
                     &target.join(entry_name),
                     ignored,
                     vars,
-                    &[],
                 );
 
                 match result {
@@ -401,7 +398,6 @@ mod tests {
             &PathBuf::from("dotfiles_with_multiple_nested_dir/.dots/dir"),
             &[],
             &Variables::default(),
-            &[],
         )?;
 
         run_cmd!(tree -a;)?;
@@ -435,7 +431,6 @@ mod tests {
             &PathBuf::from("dotfiles_non_utf8/.dots/ferris.png"),
             &[],
             &Variables::default(),
-            &[],
         )?;
 
         run_cmd!(tree -a;)?;
@@ -475,7 +470,6 @@ mod tests {
                 PathBuf::from("source_dot/file.md"),
             ],
             &Variables::default(),
-            &[],
         )?;
 
         // Assert
@@ -537,7 +531,7 @@ mod tests {
             vars: Dot::default_vars(),
         };
 
-        dot.install(&Variables::default(), vec![], &[])?;
+        dot.install(&Variables::default(), vec![])?;
 
         assert_that!(PathBuf::from(".dots")).exists();
         assert_that!(PathBuf::from(".dots/source_dot")).exists();
@@ -561,7 +555,7 @@ mod tests {
         let vars: Variables = toml::from_str(r#"name = "Tom Bombadil""#)?;
 
         // Act
-        dot.install(&vars, vec![], &[])?;
+        dot.install(&vars, vec![])?;
         let dot = PathBuf::from(".dots/dotfiles/dot");
 
         // Assert
@@ -598,7 +592,7 @@ mod tests {
             vars: PathBuf::from("my_vars.toml"),
         };
 
-        dot.install(&Variables::default(), vec![], &[])?;
+        dot.install(&Variables::default(), vec![])?;
 
         let content = fs::read_to_string(".dots/dir/template")?;
         assert_that!(content).is_equal_to(&"Hello Tom\n".to_string());
@@ -629,7 +623,7 @@ mod tests {
         };
 
         // Arrange
-        dot.install(&Variables::default(), vec![], &[])?;
+        dot.install(&Variables::default(), vec![])?;
 
         // Assert
         let content = fs::read_to_string(PathBuf::from(

src/lib.rs

@@ -11,7 +11,7 @@ use crate::templating::Variables;
 use anyhow::{anyhow, Result};
 use colored::*;
 use ignore_files::IgnoreFilter;
-use serde_json::json;
+use serde_json::{json, Value};
 use settings::dots::Dot;
 use settings::Settings;
 use std::collections::HashMap;
@@ -172,12 +172,15 @@ impl Bombadil {
             self.vars.with_secrets(decrypted);
         }
 
+        let profiles_values = serde_json::to_value(&self.profile_enabled)?;
+        let mut profiles_context = tera::Map::new();
+        profiles_context.insert("profiles".to_string(), profiles_values);
+        self.vars.extend(Variables {
+            inner: Value::Object(profiles_context),
+        });
+
         for (key, dot) in self.dots.iter() {
-            match dot.install(
-                &self.vars,
-                self.get_auto_ignored_files(key),
-                self.profile_enabled.as_slice(),
-            ) {
+            match dot.install(&self.vars, self.get_auto_ignored_files(key)) {
                 Err(err) => errored.push(err),
                 Ok(linked) => {
                     match linked {
@@ -316,7 +319,7 @@ impl Bombadil {
                             || matches!(t, &Tag::FileEventKind(FileEventKind::Modify(_)))
                             || matches!(t, &Tag::FileEventKind(FileEventKind::Remove(_)))
                     }) {
-                        println!("{}", "Detected changes, re-linking dots".green());
+                        println!("{}", "Detected changes, re-linking dots ...".green());
                         // Finally, install the dots like usual
                         b.install().map_err(|e| RuntimeError::Handler {
                             ctx: "bombadil install",
@@ -380,19 +383,25 @@ impl Bombadil {
             .cloned()
             .collect();
 
-        let sub_profiles: Vec<Profile> = profiles
+        let sub_profiles: Vec<(String, Profile)> = profiles
             .iter()
             .flat_map(|profile| {
                 profile
                     .extra_profiles
                     .iter()
-                    .flat_map(|sub_profile| self.profiles.get(sub_profile))
-                    .collect::<Vec<&Profile>>()
+                    .flat_map(|sub_profile| {
+                        self.profiles
+                            .get(sub_profile)
+                            .map(|p| (sub_profile.clone(), p.clone()))
+                    })
+                    .collect::<Vec<(String, Profile)>>()
             })
-            .cloned()
             .collect();
 
-        profiles.extend(sub_profiles);
+        for (sub, profile) in sub_profiles {
+            self.profile_enabled.push(sub);
+            profiles.push(profile);
+        }
 
         // Merge profile dots
         for profile in profiles.iter() {

src/templating.rs

@@ -130,7 +130,7 @@ impl Variables {
 
     /// Read file in the given path and return its content
     /// with variable replaced by their values.
-    pub(crate) fn to_dot(&self, path: &Path, profiles: &[String]) -> tera::Result<String> {
+    pub(crate) fn to_dot(&self, path: &Path) -> tera::Result<String> {
         // Read file content
         let file = File::open(path)?;
         let mut buf_reader = BufReader::new(file);
@@ -140,9 +140,7 @@ impl Variables {
         // Create the tera context from variables and secrets.
         let mut context = tera::Context::new();
         let variable_context = Context::from_serialize(self.inner.clone())?;
-        let profiles_context = serde_json::to_value(profiles)?;
         context.extend(variable_context);
-        context.insert("profiles", &profiles_context);
         let mut tera = Tera::default();
         let filename = path.as_os_str().to_str().expect("Non UTF8 filename");
 
@@ -199,7 +197,7 @@ mod test {
         let variables = Value::Object(variables);
 
         let dot = Variables { inner: variables }
-            .to_dot(Path::new("tests/dotfiles_simple/template.css"), &[])
+            .to_dot(Path::new("tests/dotfiles_simple/template.css"))
             .unwrap();
 
         assert_eq!(
@@ -225,7 +223,7 @@ mod test {
         variables.push_secret("pass", "hunter2");
 
         let dot_content = variables
-            .to_dot(Path::new("tests/dotfiles_with_secret/template"), &[])
+            .to_dot(Path::new("tests/dotfiles_with_secret/template"))
             .unwrap();
 
         assert_eq!(
@@ -244,7 +242,7 @@ mod test {
         let content = Variables {
             inner: Value::Object(Map::new()),
         }
-        .to_dot(Path::new("tests/dotfiles_non_utf8/ferris.png"), &[]);
+        .to_dot(Path::new("tests/dotfiles_non_utf8/ferris.png"));
 
         assert_that!(content).is_err();
     }