Move splitting of CLI env k-v-string to utility module

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

3 files changed, 15 insertions, 7 deletions

diff --git a/src/commands/build.rs b/src/commands/build.rs
index 419f661..75831a6 100644
--- a/src/commands/build.rs
+++ b/src/commands/build.rs
@@ -117,13 +117,7 @@ pub async fn build(repo_root: &Path,
 
     let additional_env = matches.values_of("env")
         .unwrap_or_default()
-        .map(|s| {
-            let v = s.split("=").collect::<Vec<_>>();
-            Ok((
-                 EnvironmentVariableName::from(*v.get(0).ok_or_else(|| anyhow!("Environment variable has no key: {}", s))?),
-                 String::from(*v.get(1).ok_or_else(|| anyhow!("Environment variable has no key: {}", s))?)
-            ))
-        })
+        .map(crate::util::env::parse_to_env)
         .collect::<Result<Vec<(EnvironmentVariableName, String)>>>()?;
 
     let packages = if let Some(pvers) = pvers {
diff --git a/src/util/env.rs b/src/util/env.rs
new file mode 100644
index 0000000..e210b37
--- /dev/null
+++ b/src/util/env.rs
@@ -0,0 +1,13 @@
+use anyhow::Result;
+use anyhow::anyhow;
+
+use crate::util::EnvironmentVariableName;
+
+pub fn parse_to_env(s: &str) -> Result<(EnvironmentVariableName, String)> {
+    let v = s.split("=").collect::<Vec<_>>();
+    Ok((
+         EnvironmentVariableName::from(*v.get(0).ok_or_else(|| anyhow!("Environment variable has no key: {}", s))?),
+         String::from(*v.get(1).ok_or_else(|| anyhow!("Environment variable has no key: {}", s))?)
+    ))
+}
+
diff --git a/src/util/mod.rs b/src/util/mod.rs
index 7077f47..539919a 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -29,6 +29,7 @@ impl AsRef<str> for EnvironmentVariableName {
 }
 
 pub mod docker;
+pub mod env;
 pub mod filters;
 pub mod git;
 pub mod parser;