Merge pull request #18 from devrc-hub/feature/set-variable-from-cli

feature(cli): Add set variable option from command line

Author: Lispython

src/cli.rs

@@ -4,10 +4,32 @@ use structopt::{
     StructOpt,
 };
 
+use std::error::Error;
+
+use crate::errors::{DevrcError, DevrcResult};
+
 pub fn get_crate_version() -> &'static str {
     env!("CARGO_PKG_VERSION")
 }
 
+/// Parse a single key-value pair
+fn parse_key_val<T>(s: &str) -> DevrcResult<(T, T)>
+where
+    T: std::str::FromStr,
+    T::Err: Error + 'static,
+{
+    let pos = s.find('=').ok_or({
+        //format!("invalid KEY=value: no `=` found in `{}`", s)}
+        DevrcError::InvalidArgument
+    })?;
+    Ok((
+        s[..pos].parse().map_err(|_| DevrcError::InvalidArgument)?,
+        s[pos + 1..]
+            .parse()
+            .map_err(|_| DevrcError::InvalidArgument)?,
+    ))
+}
+
 #[derive(StructOpt, Debug)]
 #[structopt(version = get_crate_version())]
 #[structopt(name = "devrc")]
@@ -77,11 +99,10 @@ pub struct CommandLine {
     /// Suppress all output
     #[structopt(short, long)]
     pub quiet: bool,
-    // #[structopt(subcommand)]
-    // pub sub: Option<Subcommands>, // /// Trailing newline behavior for the password. If "auto",
-    //                               // /// a trailing newline will be printed iff stdout is detected to be a tty.
-    //                               // #[structopt(long="newline", default_value="auto", raw(possible_values="&NewlineBehavior::variants()"))]
-    //                               // newline: NewlineBehavior
+
+    /// Override <VARIABLE> with <VALUE>
+    #[structopt(long = "--set", parse(try_from_str = parse_key_val), name="VAR=VALUE")]
+    pub set: Vec<(String, String)>,
 }
 
 impl CommandLine {

src/errors.rs

@@ -29,6 +29,7 @@ pub enum DevrcError {
     Code { code: i32 },
     RuntimeError,
     CircularDependencies,
+    InvalidArgument,
 }
 
 impl Display for DevrcError {

src/main.rs

@@ -41,6 +41,10 @@ fn main() -> Result<(), Box<dyn Error>> {
         runner.load()?;
     }
 
+    if !opt.set.is_empty() {
+        runner.setup_variables(opt.set.into())?
+    }
+
     if opt.list {
         runner.list_tasks()?;
     } else if opt.list_vars {

src/runner.rs

@@ -13,6 +13,7 @@ use crate::{
         get_absolute_path, get_directory_devrc_file, get_global_devrc_file,
         get_local_user_defined_devrc_file,
     },
+    variables::RawVariables,
     workshop::Designer,
 };
 
@@ -68,6 +69,10 @@ impl Runner {
         Ok(())
     }
 
+    pub fn setup_variables(&mut self, variables: RawVariables) -> DevrcResult<()> {
+        self.devrc.add_variables(variables)
+    }
+
     // Try to get devrcfile
     pub fn get_rawdevrc_file<F>(&self, try_file_func: F) -> DevrcResult<RawDevrcfile>
     where

src/variables.rs

@@ -82,6 +82,17 @@ impl RawVariables {
     }
 }
 
+impl From<Vec<(String, String)>> for RawVariables {
+    fn from(items: Vec<(String, String)>) -> Self {
+        Self {
+            vars: items
+                .iter()
+                .map(move |x| (x.0.clone(), ValueKind::String(x.1.clone())))
+                .collect::<indexmap::IndexMap<String, ValueKind>>(),
+        }
+    }
+}
+
 impl ValueKind {
     pub fn evaluate(&self, name: &str, scope: &Scope) -> DevrcResult<String> {
         match self {