WIP

.gitattributes

@@ -1,4 +1,5 @@
 website/** linguist-documentation
+docs/** linguist-documentation
 bats-tests/** linguist-documentation
 ci/**linguist-documentation
 config_examplesi/** linguist-documentation

config_examples/vars.example.toml

@@ -1,6 +1,7 @@
-# - A var file MUST contains valid toml with only string key/value pair.
+# - A var file MUST contains valid toml.
 # - The name of the file can be anything (ex: color-scheme.toml).
 # - A bombadil config can have many var files.
+[theme]
 terminal = "alacritty"
 background = "#292C3E"
 foreground = "#EBEBEB"

src/dots.rs

@@ -27,7 +27,7 @@ impl Dot {
         profiles: &[String],
     ) -> Result<LinkResult> {
         let source = &self.source()?;
-        let target = &self.build_copy_path();
+        let target = &self.copy_path_unchecked();
         let source_str = source.to_str().unwrap_or_default();
 
         let ignored_paths = if self.ignore.is_empty() {
@@ -87,12 +87,19 @@ impl Dot {
             fs::create_dir_all(target.parent().unwrap())?;
 
             match vars.to_dot(source, profiles) {
-                Ok(content) if target.exists() => self.update(source, target, content),
-                Ok(content) => self.create(source, target, content),
+                Ok(content) if target.exists() => {
+                    self.update(source, target, content)
+                },
+                Ok(content) => {
+                    self.create(source, target, content)
+                },
                 Err(e) if target.exists() => {
                     match e.kind {
-                        ErrorKind::Utf8Conversion { .. } => {}
-                        ErrorKind::Io(_) => {}
+                        ErrorKind::Utf8Conversion { .. } | ErrorKind::Io(..) => {
+                            // Skip non utf8 files like binaries, images etc.
+                            // Those should be symlinked directly once this is implemented
+                            // https://github.com/oknozor/toml-bombadil/issues/138
+                        }
                         ErrorKind::Msg(message) => println!("\t{}", message.to_string().red()),
                         _ => {
                             if let Some(source) = e.source() {
@@ -103,7 +110,7 @@ impl Dot {
                     self.update_raw(source, target)
                 }
                 Err(_) => {
-                    fs::copy(&source, &target)?;
+                    fs::copy(&source, target)?;
                     Ok(LinkResult::Created {
                         target: target.clone(),
                         copy: self.copy_path()?,
@@ -312,7 +319,7 @@ mod tests {
             mkdir .config;
             tree -a;
         )
-        .unwrap();
+            .unwrap();
 
         Bombadil::link_self_config(Some(PathBuf::from(dotfiles))).unwrap();
     }

src/paths/mod.rs

@@ -19,7 +19,7 @@ pub trait DotPaths {
     fn copy_path(&self) -> Result<PathBuf>;
 
     /// Build the rendered template path, use this to create the rendered file
-    fn build_copy_path(&self) -> PathBuf;
+    fn copy_path_unchecked(&self) -> PathBuf;
 
     /// Remove the dotfile target symlink
     fn unlink(&self) -> Result<()>;
@@ -52,13 +52,12 @@ impl DotPaths for Dot {
     }
 
     fn copy_path(&self) -> Result<PathBuf> {
-        let path = self.build_copy_path();
-
+        let path = self.copy_path_unchecked();
         path.canonicalize()
             .map_err(|error| TemplateNotFound { path, error })
     }
 
-    fn build_copy_path(&self) -> PathBuf {
+    fn copy_path_unchecked(&self) -> PathBuf {
         dotfile_dir().join(".dots").join(&self.source)
     }