feat: add extra profiles

Author: oknozor

bats-tests/tests.sh

@@ -94,6 +94,15 @@ setup() {
   assert_symlink_to "$HOME/dotfiles/.dots/maven/corporate.settings.xml" "$HOME/.m2/settings.xml"
 }
 
+@test "Link meta profile" {
+  run bombadil link -p corporate-sway
+  assert_success
+  assert_symlink_to "$HOME/dotfiles/.dots/sway" "$HOME/.config/sway"
+  assert_file_exist "$HOME/.config/sway/config"
+  assert_symlink_to "$HOME/dotfiles/.dots/maven/corporate.settings.xml" "$HOME/.m2/settings.xml"
+}
+
+
 @test "Profile should override default vars" {
   run bombadil link
   assert_success

bats-tests/tom_home/dotfiles/bombadil.toml

@@ -17,10 +17,16 @@ maven = { source = "maven/corporate.settings.xml", target = ".m2/settings.xml" }
 [profiles.i3.dots]
 i3 =  { source = "i3", target = ".config/i3" }
 
+[profiles.sway.dots]
+sway =  { source = "sway", target = ".config/sway" }
+
 [profiles.java-16]
 vars = [ "profiles/java16.toml"]
 
 [profiles.java-17.dots]
 bash = { vars = "profiles/java17.toml" }
 
+[profiles.corporate-sway]
+extra_profiles = ["corporate", "sway"]
+
 

bats-tests/tom_home/dotfiles/sway/config

@@ -235,13 +235,27 @@ impl Bombadil {
 
     /// Enable a dotfile profile by merging its config with the default profile
     pub fn enable_profiles(&mut self, profile_keys: Vec<&str>) -> Result<()> {
-        let profiles: Vec<Profile> = profile_keys
+        let mut profiles: Vec<Profile> = profile_keys
             .iter()
             // unwrap here is safe cause allowed profile keys are checked by clap
             .map(|profile_key| self.profiles.get(&profile_key.to_string()).unwrap())
             .cloned()
             .collect();
 
+        let sub_profiles: Vec<Profile> = profiles
+            .iter()
+            .flat_map(|profile| {
+                profile
+                    .extra_profiles
+                    .iter()
+                    .flat_map(|sub_profile| self.profiles.get(sub_profile))
+                    .collect::<Vec<&Profile>>()
+            })
+            .cloned()
+            .collect();
+
+        profiles.extend(sub_profiles);
+
         // Merge profile dots
         for profile in profiles.iter() {
             profile.dots.iter().for_each(|(key, dot_override)| {
@@ -900,6 +914,7 @@ mod tests {
             "profile_one".to_string(),
             Profile {
                 dots: dots_profile_one,
+                extra_profiles: vec![],
                 prehooks: vec![],
                 posthooks: vec![],
                 vars: vec![],
@@ -913,6 +928,7 @@ mod tests {
                 prehooks: vec![],
                 posthooks: vec![],
                 vars: vec![],
+                extra_profiles: vec![],
             },
         );
 

src/lib.rs

@@ -68,6 +68,10 @@ pub struct Profile {
     #[serde(default)]
     pub dots: HashMap<String, DotOverride>,
 
+    /// A list of additional profiles to enable
+    #[serde(default)]
+    pub extra_profiles: Vec<String>,
+
     /// Pre install hook commands
     #[serde(default)]
     pub prehooks: Vec<String>,