fix: fix ignored path

Author: oknozor

src/dots.rs

@@ -1,4 +1,5 @@
 use crate::paths::DotPaths;
+use crate::settings::dotfile_dir;
 use crate::settings::dots::{Dot, DotOverride};
 use crate::templating::Variables;
 use anyhow::Result;
@@ -7,19 +8,20 @@ use std::fs;
 use std::fs::File;
 use std::io::Write;
 use std::path::{Path, PathBuf};
-use crate::settings::dotfile_dir;
 
 impl Dot {
-    pub(crate) fn install(
-        &self,
-        vars: &Variables,
-        auto_ignored: Vec<PathBuf>,
-    ) -> Result<()> {
+    pub(crate) fn install(&self, vars: &Variables, auto_ignored: Vec<PathBuf>) -> Result<()> {
         let source = &self.source()?;
         let copy_path = &self.build_copy_path();
         let source_str = source.to_str().unwrap_or_default();
-        let mut ignored_paths = self.get_ignored_paths(source_str)?;
-        ignored_paths.extend_from_slice(&auto_ignored);
+
+        let ignored_paths = if self.ignore.is_empty() {
+            auto_ignored
+        } else {
+            let mut ignored_paths = self.get_ignored_paths(source_str)?;
+            ignored_paths.extend_from_slice(&auto_ignored);
+            ignored_paths
+        };
 
         // Add local vars to the global ones
         let mut vars = vars.clone();
@@ -101,10 +103,7 @@ impl Dot {
 }
 
 impl DotOverride {
-    pub(crate) fn resolve_var_path(
-        &self,
-        origin: Option<&PathBuf>,
-    ) -> Option<PathBuf> {
+    pub(crate) fn resolve_var_path(&self, origin: Option<&PathBuf>) -> Option<PathBuf> {
         let source = match (self.get_source(), origin) {
             (Some(source), _) => source,
             (None, Some(origin)) => origin,
@@ -116,9 +115,7 @@ impl DotOverride {
     }
 }
 
-impl Dot {
-
-}
+impl Dot {}
 
 pub(crate) trait DotVar {
     fn vars(&self) -> Option<PathBuf>;
@@ -131,11 +128,7 @@ pub(crate) trait DotVar {
         self.vars() == Some(Dot::default_vars())
     }
 
-    fn resolve_from_source(
-        &self,
-        source: &Path,
-        path: &Path,
-    ) -> Option<PathBuf> {
+    fn resolve_from_source(&self, source: &Path, path: &Path) -> Option<PathBuf> {
         let relative_to_dot = dotfile_dir().join(source).join(path);
         let relative_to_dotfile_dir = dotfile_dir().join(path);
         // FIXME : we should not try to look for path like this
@@ -156,11 +149,7 @@ pub(crate) trait DotVar {
         }
     }
 
-    fn vars_path_not_found(
-        &self,
-        source: &Path,
-        path: &Path,
-    ) -> Option<PathBuf> {
+    fn vars_path_not_found(&self, source: &Path, path: &Path) -> Option<PathBuf> {
         if !self.is_default_var_path() {
             eprintln!(
                 "{} {:?} {} {:?} {} {:?}",
@@ -277,7 +266,6 @@ mod tests {
             vars: Dot::default_vars(),
         };
 
-
         // Act
         dot.symlink()?;
 
@@ -307,19 +295,17 @@ mod tests {
             &Variables::default(),
         )?;
 
-        run_cmd!(tree -a)?;
-
-
+        run_cmd!(tree - a)?;
 
         // Assert
-        let file_one = PathBuf::from("dotfiles_with_multiple_nested_dir/.dots/dir/subdir_one/subfile");
-        let file_two = PathBuf::from("dotfiles_with_multiple_nested_dir/.dots/dir/subdir_two/subfile");
+        let file_one =
+            PathBuf::from("dotfiles_with_multiple_nested_dir/.dots/dir/subdir_one/subfile");
+        let file_two =
+            PathBuf::from("dotfiles_with_multiple_nested_dir/.dots/dir/subdir_two/subfile");
         assert_that!(file_one).exists();
         assert_that!(file_two).exists();
-        assert_that!(fs::read_to_string(file_one)?)
-            .is_equal_to(&"Hello From subdir 1".to_string());
-        assert_that!(fs::read_to_string(file_two)?)
-            .is_equal_to(&"Hello From subdir 2".to_string());
+        assert_that!(fs::read_to_string(file_one)?).is_equal_to(&"Hello From subdir 1".to_string());
+        assert_that!(fs::read_to_string(file_two)?).is_equal_to(&"Hello From subdir 2".to_string());
         Ok(())
     }
 
@@ -342,7 +328,7 @@ mod tests {
             &Variables::default(),
         )?;
 
-        run_cmd!(tree -a)?;
+        run_cmd!(tree - a)?;
 
         assert_that!(PathBuf::from("dotfiles_non_utf8/.dots/ferris.png")).exists();
         Ok(())
@@ -465,7 +451,7 @@ mod tests {
         vars.insert("name", "Tom Bombadil");
 
         // Act
-        dot.install( &vars, vec![])?;
+        dot.install(&vars, vec![])?;
         let dot = PathBuf::from(".dots/dotfiles/dot");
 
         // Assert
@@ -533,7 +519,7 @@ mod tests {
         };
 
         // Arrange
-        dot.install( &Variables::default(), vec![])?;
+        dot.install(&Variables::default(), vec![])?;
 
         // Assert
         let content = fs::read_to_string(PathBuf::from(

src/git.rs

@@ -70,7 +70,7 @@ pub(crate) fn clone(remote: &str, path: &Path) -> Result<(), git2::Error> {
     cb.transfer_progress(|stats| {
         let mut state = state.borrow_mut();
         state.progress = Some(stats.to_owned());
-        print_clone_progress(&mut *state);
+        print_clone_progress(&mut state);
         true
     });
 
@@ -80,7 +80,7 @@ pub(crate) fn clone(remote: &str, path: &Path) -> Result<(), git2::Error> {
         state.path = path.map(|p| p.to_path_buf());
         state.current = cur;
         state.total = total;
-        print_clone_progress(&mut *state);
+        print_clone_progress(&mut state);
     });
 
     let mut fo = FetchOptions::new();

src/lib.rs

@@ -7,6 +7,7 @@ use crate::state::BombadilState;
 use crate::templating::Variables;
 use anyhow::{anyhow, Result};
 use colored::*;
+use ignore_files::IgnoreFilter;
 use settings::dots::Dot;
 use settings::Settings;
 use std::collections::HashMap;
@@ -16,7 +17,6 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::Duration;
 use std::{fs, io};
-use ignore_files::IgnoreFilter;
 use watchexec::{
     action::{Action, Outcome},
     config::{InitConfig, RuntimeConfig},
@@ -29,14 +29,14 @@ use watchexec::{
 use watchexec_filterer_ignore::IgnoreFilterer;
 
 mod dots;
+mod error;
 mod git;
 mod gpg;
 mod hook;
-mod state;
-mod templating;
 pub mod paths;
 pub mod settings;
-mod error;
+mod state;
+mod templating;
 
 pub(crate) const BOMBADIL_CONFIG: &str = "bombadil.toml";
 
@@ -86,7 +86,7 @@ impl Bombadil {
     pub fn link_self_config(dotfiles_path: Option<PathBuf>) -> Result<()> {
         let xdg_config_dir = dirs::config_dir();
         match xdg_config_dir {
-            None => return Err(anyhow!("$XDG_CONFIG does not exist")),
+            None => Err(anyhow!("$XDG_CONFIG does not exist")),
             Some(config_dir) => {
                 let bombadil_xdg_config = config_dir.join(BOMBADIL_CONFIG);
 
@@ -166,10 +166,7 @@ impl Bombadil {
         // Render current settings and create symlinks
         fs::create_dir(dot_copy_dir)?;
         for (key, dot) in self.dots.iter() {
-            if let Err(err) = dot.install(
-                &self.vars,
-                self.get_auto_ignored_files(key),
-            ) {
+            if let Err(err) = dot.install(&self.vars, self.get_auto_ignored_files(key)) {
                 eprintln!("{}", err);
                 continue;
             }
@@ -229,7 +226,6 @@ impl Bombadil {
 
     /// Watch dotfiles and automatically run link on changes
     pub async fn watch(profiles: Vec<String>) -> Result<()> {
-
         let mut bombadil = Bombadil::from_settings(Mode::Gpg)?;
         bombadil.enable_profiles(profiles.iter().map(String::as_str).collect())?;
 
@@ -569,10 +565,7 @@ impl Bombadil {
             .filter_map(|dot| dot.resolve_var_path(origin_source))
             .collect();
 
-        let _ = dot_origin.map(|dot| {
-            dot.resolve_var_path()
-                .map(|path| ignored.push(path))
-        });
+        let _ = dot_origin.map(|dot| dot.resolve_var_path().map(|path| ignored.push(path)));
 
         ignored
     }
@@ -650,7 +643,7 @@ mod tests {
     fn install_should_fail_and_continue() -> Result<()> {
         // Act
         Bombadil::from_settings(NoGpg)?.install()?;
-        run_cmd!(tree -a)?;
+        run_cmd!(tree - a)?;
         // Assert
         assert_that!(PathBuf::from(".config/template.css")).exists();
         assert_that!(PathBuf::from(".config/invalid")).does_not_exist();

src/paths/mod.rs

@@ -1,11 +1,9 @@
-use crate::error::Error::{
-    SourceNotFound, Symlink, TargetNotFound, TemplateNotFound, Unlink,
-};
+use crate::error::Error::{SourceNotFound, Symlink, TargetNotFound, TemplateNotFound, Unlink};
+use crate::error::*;
 use crate::settings::dotfile_dir;
 use crate::{Dot, DotVar};
 use colored::*;
 use dirs::home_dir;
-use crate::error::*;
 use std::fs;
 use std::os::unix;
 use std::path::{Path, PathBuf};

src/settings/mod.rs

@@ -1,15 +1,15 @@
 use crate::settings::imports::ImportPath;
 use crate::settings::profiles::ActiveProfile;
-use crate::{Profile, BOMBADIL_CONFIG, Gpg};
+use crate::{Gpg, Profile, BOMBADIL_CONFIG};
 use anyhow::anyhow;
 use colored::*;
 use config::Config;
 use config::{ConfigError, File};
+use dirs::home_dir;
 use lazy_static::lazy_static;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::PathBuf;
-use dirs::home_dir;
 
 pub mod dots;
 pub mod imports;
@@ -34,7 +34,8 @@ pub fn profiles() -> Vec<&'static str> {
 }
 
 pub fn dotfile_dir() -> PathBuf {
-    home_dir().expect("$HOME should be set")
+    home_dir()
+        .expect("$HOME should be set")
         .join(&SETTINGS.dotfiles_dir)
 }
 

src/templating.rs

@@ -1,4 +1,5 @@
 use crate::gpg::{Gpg, GPG_PREFIX};
+use crate::settings::GPG;
 use anyhow::{anyhow, Result};
 use colored::Colorize;
 use std::collections::HashMap;
@@ -7,7 +8,6 @@ use std::io::prelude::*;
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
 use tera::Tera;
-use crate::settings::GPG;
 
 #[derive(Clone, Debug, Default)]
 pub struct Variables {
@@ -19,10 +19,7 @@ pub struct Variables {
 }
 
 impl Variables {
-    pub(crate) fn from_paths(
-        base_path: &Path,
-        var_paths: &[PathBuf],
-    ) -> Result<Self> {
+    pub(crate) fn from_paths(base_path: &Path, var_paths: &[PathBuf]) -> Result<Self> {
         let mut out = Self::default();
         for path in var_paths {
             let variables = Self::from_toml(&base_path.join(path))?;