Adding feature-flags to release configuration

README.md

@@ -204,6 +204,9 @@ Available configuration keys are:
   * `replace`: the replacement string; you can use the any of the placeholders mentioned above.
 * `pre-release-hook`: provide a command to run before `cargo-release`
   commits version change
+* `features`: Provide a set of feature flags that should be 
+  passed to `cargo publish` (requires rust 1.33+)
+* `all_features`: Signal to `cargo publish`, that all features should be used (requires rust 1.33+)
 
 ```toml
 [package.metadata.release]

src/cargo.rs

@@ -1,8 +1,16 @@
 use cmd::call;
 use error::FatalError;
+use Features;
 
-pub fn publish(dry_run: bool) -> Result<bool, FatalError> {
-    call(vec![env!("CARGO"), "publish"], dry_run)
+pub fn publish(dry_run: bool, features: Features) -> Result<bool, FatalError> {
+    match features {
+        Features::None => call(vec![env!("CARGO"), "publish"], dry_run),
+        Features::Selective(vec) => call(
+            vec![env!("CARGO"), "publish", "--features", &vec.join(" ")],
+            dry_run,
+        ),
+        Features::All => call(vec![env!("CARGO"), "publish", "--all-features"], dry_run),
+    }
 }
 
 pub fn update(dry_run: bool) -> Result<bool, FatalError> {

src/config.rs

@@ -28,6 +28,8 @@ pub static TAG_MESSAGE: &'static str = "tag-message";
 pub static TAG_PREFIX: &'static str = "tag-prefix";
 pub static DOC_COMMIT_MESSAGE: &'static str = "doc-commit-message";
 pub static DISABLE_TAG: &'static str = "disable-tag";
+pub static ENABLE_FEATURES: &'static str = "enable-features";
+pub static ENABLE_ALL_FEATURES: &'static str = "all-features";
 
 fn load_from_file(path: &Path) -> io::Result<String> {
     let mut file = File::open(path)?;
@@ -123,6 +125,8 @@ pub fn verify_release_config(config: &Table) -> Option<Vec<&str>> {
         TAG_PREFIX,
         DOC_COMMIT_MESSAGE,
         DISABLE_TAG,
+        ENABLE_FEATURES,
+        ENABLE_ALL_FEATURES
     ];
     let mut invalid_keys = Vec::new();
     for i in config.keys() {

src/main.rs

@@ -42,8 +42,7 @@ fn get_string_option(
             config::get_release_config(config_file, config_file_key)
                 .and_then(|f| f.as_str())
                 .map(|f| f.to_owned())
-        })
-        .unwrap_or(default_value.to_owned())
+        }).unwrap_or(default_value.to_owned())
 }
 
 fn get_bool_option(cli: bool, config_file: Option<&Table>, config_file_key: &str) -> bool {
@@ -52,6 +51,25 @@ fn get_bool_option(cli: bool, config_file: Option<&Table>, config_file_key: &str
         .unwrap_or(false)
 }
 
+/// Takes a list in form `"a,b,d,e"` and returns a Vec: `["a", "b", "c", "d"]`
+fn get_list_option(
+    cli: &Option<Vec<String>>,
+    config_file: Option<&Table>,
+    config_file_key: &str,
+) -> Option<Vec<String>> {
+    cli.clone().or_else(|| {
+        config::get_release_config(config_file, config_file_key)
+            .and_then(|f| f.as_array())
+            .and_then(|a| {
+                Some(
+                    a.iter()
+                        .map(|i| String::from(i.as_str().unwrap()))
+                        .collect::<Vec<String>>(),
+                )
+            })
+    })
+}
+
 fn execute(args: &ReleaseOpt) -> Result<i32, error::FatalError> {
     let cargo_file = config::parse_cargo_config()?;
     let custom_config_path_option = args.config.as_ref();
@@ -120,20 +138,20 @@ fn execute(args: &ReleaseOpt) -> Result<i32, error::FatalError> {
             .unwrap_or("(cargo-release) start next development iteration {{version}}");
     let pre_release_replacements =
         config::get_release_config(release_config.as_ref(), config::PRE_RELEASE_REPLACEMENTS);
-    let pre_release_hook =
-        config::get_release_config(release_config.as_ref(), config::PRE_RELEASE_HOOK).and_then(
-            |h| match h {
-                &Value::String(ref s) => Some(vec![s.as_ref()]),
-                &Value::Array(ref a) => Some(
-                    a.iter()
-                        .map(|v| v.as_str())
-                        .filter(|o| o.is_some())
-                        .map(|s| s.unwrap())
-                        .collect(),
-                ),
-                _ => None,
-            },
-        );
+    let pre_release_hook = config::get_release_config(
+        release_config.as_ref(),
+        config::PRE_RELEASE_HOOK,
+    ).and_then(|h| match h {
+        &Value::String(ref s) => Some(vec![s.as_ref()]),
+        &Value::Array(ref a) => Some(
+            a.iter()
+                .map(|v| v.as_str())
+                .filter(|o| o.is_some())
+                .map(|s| s.unwrap())
+                .collect(),
+        ),
+        _ => None,
+    });
     let tag_msg = config::get_release_config(release_config.as_ref(), config::TAG_MESSAGE)
         .and_then(|f| f.as_str())
         .unwrap_or("(cargo-release) {{prefix}} version {{version}}");
@@ -150,6 +168,29 @@ fn execute(args: &ReleaseOpt) -> Result<i32, error::FatalError> {
         .and_then(|f| f.as_bool())
         .unwrap_or(!skip_publish);
     let metadata = args.metadata.as_ref();
+    let feature_list = get_list_option(
+        &if args.features.is_empty() {
+            None
+        } else {
+            Some(args.features.clone())
+        },
+        release_config.as_ref(),
+        config::ENABLE_FEATURES,
+    );
+    let all_features = get_bool_option(
+        args.all_features,
+        release_config.as_ref(),
+        config::ENABLE_FEATURES,
+    );
+
+    let features = if all_features {
+        Features::All
+    } else {
+        match feature_list {
+            Some(vec) => Features::Selective(vec),
+            None => Features::None,
+        }
+    };
 
     // STEP 0: Check if working directory is clean
     if !git::status()? {
@@ -234,7 +275,7 @@ fn execute(args: &ReleaseOpt) -> Result<i32, error::FatalError> {
     // STEP 3: cargo publish
     if publish {
         shell::log_info("Running cargo publish");
-        if !cargo::publish(dry_run)? {
+        if !cargo::publish(dry_run, features)? {
             return Ok(103);
         }
     }
@@ -267,11 +308,12 @@ fn execute(args: &ReleaseOpt) -> Result<i32, error::FatalError> {
                 .and_then(|f| f.as_str())
                 .map(|f| f.to_string())
                 .map(|f| replace_in(&f, &replacements))
-        })
-        .or_else(|| Some(format!("{}-", crate_name)));
+        }).or_else(|| Some(format!("{}-", crate_name)));
+
     if let Some(p) = tag_prefix.clone() {
         replacements.insert("{{prefix}}", p.clone());
     }
+
     let current_version = version.to_string();
     let tag_name = tag_prefix.as_ref().map_or_else(
         || current_version.clone(),
@@ -322,6 +364,16 @@ fn execute(args: &ReleaseOpt) -> Result<i32, error::FatalError> {
     Ok(0)
 }
 
+/// Expresses what features flags should be used
+pub enum Features {
+    /// None - don't use special features
+    None,
+    /// Only use selected features
+    Selective(Vec<String>),
+    /// Use all features via `all-features`
+    All,
+}
+
 #[derive(Debug, StructOpt)]
 struct ReleaseOpt {
     /// Release level:  bumping major|minor|patch|rc|beta|alpha version on release or removing prerelease extensions by default
@@ -382,6 +434,14 @@ struct ReleaseOpt {
     #[structopt(long = "no-confirm")]
     /// Skip release confirmation and version preview
     no_confirm: bool,
+
+    #[structopt(long = "features")]
+    /// Provide a set of features that need to be enabled
+    features: Vec<String>,
+
+    #[structopt(long = "all-features")]
+    /// Enable all features via `all-features`. Overrides `features`
+    all_features: bool,
 }
 
 #[derive(Debug, StructOpt)]