enable definition of features at command line

Add the `--no-default-features` and `--features` arguments.

Fix #31

Author: Canop

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### next
-`check-all` target now checks all. Fix #27
+* `check-all` target now checks all - Fix #27
+* `--no-default-features` and `--features` - Fix #31
 
 <a name="v1.1.2"></a>
 ### v1.1.2 - 2021/01/05

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "bacon"
-version = "1.1.2"
+version = "1.1.3-dev"
 authors = ["dystroy <[email protected]>"]
 repository = "https://github.com/Canop/bacon"
 description = "background rust compiler"

Cargo.toml

@@ -49,6 +49,15 @@ pub struct Args {
     #[argh(option, short = 'j')]
     pub job: Option<String>,
 
+    /// ignore features of both the package and the bacon job
+    #[argh(switch)]
+    pub no_default_features: bool,
+
+    /// comma separated list of features to ask cargo to compile with
+    /// (if the job defines some, they're merged)
+    #[argh(option)]
+    pub features: Option<String>,
+
     /// path to watch (must be a rust directory or inside)
     #[argh(option, short = 'p')]
     pub path: Option<String>,

src/args.rs

@@ -14,3 +14,11 @@ pub struct Job {
     #[serde(default)]
     pub need_stdout: bool,
 }
+
+//impl Job {
+//    pub fn modified_command(&self, settings: &Settings) -> (String, Vec<String>) {
+//        let tokens = command.iter();
+//        let exec = tokens.next().unwrap(); // SAFETY: warranty in Job
+//
+//    }
+//}

src/job.rs

@@ -4,6 +4,7 @@ use {
     cargo_metadata::MetadataCommand,
     notify::{RecommendedWatcher, RecursiveMode, Watcher},
     std::{
+        collections::HashSet,
         env,
         fs,
         path::PathBuf,
@@ -152,10 +153,51 @@ impl Mission {
         let mut command = Command::new(
             tokens.next().unwrap(), // implies a check in the job
         );
+        let mut no_default_features_done = false;
+        let mut features_done = false;
+        let mut last_is_features = false;
         for arg in tokens {
+            let mut arg = arg.to_string();
+            if last_is_features {
+                // arg is expected there to be the list of features
+                features_done = true;
+                match (&self.settings.features, self.settings.no_default_features) {
+                    (Some(features), false) => {
+                        // we take the features of both the job and the args
+                        arg = merge_features(&arg, &features);
+                    }
+                    (Some(features), true) => {
+                        // arg add features and remove the job ones
+                        arg = features.clone();
+                    }
+                    (None, true) => {
+                        // arg just remove the job features
+                        arg = "".to_string()
+                    }
+                    (None, false) => {
+                        // nothing to change
+                    }
+                }
+                last_is_features = false;
+            } else if arg == "--no-default-features" {
+                no_default_features_done = true;
+                last_is_features = false;
+            } else if arg == "--features" {
+                last_is_features = true;
+            }
             command.arg(arg);
         }
+        if self.settings.no_default_features && !no_default_features_done {
+            command.arg("--no-default-features");
+        }
+        if !features_done {
+            if let Some(features) = &self.settings.features {
+                command.arg("--features");
+                command.arg(features);
+            }
+        }
         command.current_dir(&self.cargo_execution_directory);
+        debug!("command: {:#?}", &command);
         command
     }
 
@@ -164,3 +206,14 @@ impl Mission {
         self.job.need_stdout
     }
 }
+
+fn merge_features(a: &str, b: &str) -> String {
+    let mut features = HashSet::new();
+    for feature in a.split(',') {
+        features.insert(feature);
+    }
+    for feature in b.split(',') {
+        features.insert(feature);
+    }
+    features.iter().map(|&s|s).collect::<Vec<&str>>().join(",")
+}

src/mission.rs

@@ -1,11 +1,13 @@
 use crate::*;
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone)]
 pub struct Settings {
     pub summary: bool,
     pub wrap: bool,
     pub reverse: bool,
     pub vim_keys: bool,
+    pub no_default_features: bool,
+    pub features: Option<String>, // comma separated list
 }
 
 impl Settings {
@@ -42,6 +44,12 @@ impl Settings {
         if args.reverse {
             self.reverse = true;
         }
+        if args.no_default_features {
+            self.no_default_features = true;
+        }
+        if args.features.is_some() {
+            self.features = args.features.clone();
+        }
     }
 }
 
@@ -52,6 +60,8 @@ impl Default for Settings {
             wrap: false,
             reverse: false,
             vim_keys: false,
+            no_default_features: false,
+            features: None,
         }
     }
 }