Refactor command::Submit

Cargo.toml

@@ -19,6 +19,7 @@ serde_yaml = "0.8.21"
 zip = "0.5.13"
 dialoguer = "0.9.0"
 time = { version = "0.3.1", features = ["serde"] }
+merge = "0.1.0"
 
 [dev-dependencies]
 mockall = "0.10.2"

src/api/baca_service.rs

@@ -88,7 +88,7 @@ impl BacaApi for BacaService {
 
         match resp.as_str() {
             "Niezalogowany jesteś" => Err(Error::LoggedOut),
-            "Błąd" => Err(Error::Submit),
+            "Błąd" => Err(Error::TaskNotActive),
             _ => Ok(()),
         }
     }

src/command/init.rs

@@ -1,39 +1,13 @@
 use crate::api;
 use crate::api::baca_api::BacaApi;
+use crate::command::prompt::{Input, Password, Prompt};
 use crate::command::Command;
 use crate::update::BacaRelease;
 use crate::workspace::{ConfigObject, Workspace};
 use crate::{error, workspace};
 use clap::ArgMatches;
-#[cfg(test)]
-use mockall::{automock, predicate::*};
 use tracing::{debug, info};
 
-#[cfg_attr(test, automock)]
-trait Prompt {
-    fn interact(&self) -> error::Result<String>;
-}
-
-struct Input(&'static str);
-
-impl Prompt for Input {
-    fn interact(&self) -> error::Result<String> {
-        Ok(dialoguer::Input::<String>::new()
-            .with_prompt(self.0)
-            .interact()?)
-    }
-}
-
-struct Password;
-
-impl Prompt for Password {
-    fn interact(&self) -> error::Result<String> {
-        Ok(dialoguer::Password::new()
-            .with_prompt("Password")
-            .interact()?)
-    }
-}
-
 pub struct Init {
     host: Option<String>,
     login: Option<String>,
@@ -135,12 +109,12 @@ fn save_version<W: Workspace>(workspace: &W) -> error::Result<()> {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use crate::api;
     use crate::api::baca_api::MockBacaApi;
+    use crate::command::prompt::MockPrompt;
     use crate::workspace::{ConnectionConfig, MockWorkspace};
 
-    use super::*;
-
     // todo: tests::utils
     fn make_mock_connection_config() -> ConnectionConfig {
         ConnectionConfig {

src/command/mod.rs

@@ -10,11 +10,13 @@ use crate::error;
 use crate::workspace::config_editor::ConfigEditor;
 use crate::workspace::{ConnectionConfig, Workspace};
 use clap::ArgMatches;
+use std::convert::TryFrom;
 
 mod details;
 mod init;
 mod last;
 mod log;
+mod prompt;
 mod refresh;
 mod submit;
 mod tasks;
@@ -39,7 +41,7 @@ where
         "refresh" => Refresh::new().execute(workspace, api),
         "log" => Log::from(matches).execute(workspace, api),
         "tasks" => Tasks::new().execute(workspace, api),
-        "submit" => Submit::from(matches).execute(workspace, api),
+        "submit" => Submit::try_from(matches)?.execute(workspace, api),
         "last" => Last::from(matches).execute(workspace, api),
         "config" => {
             ConfigEditor::new().edit::<W, ConnectionConfig>(workspace)?;

src/command/prompt.rs

@@ -0,0 +1,28 @@
+use crate::error;
+#[cfg(test)]
+use mockall::{automock, predicate::*};
+
+#[cfg_attr(test, automock)]
+pub trait Prompt {
+    fn interact(&self) -> error::Result<String>;
+}
+
+pub struct Input(pub &'static str);
+
+impl Prompt for Input {
+    fn interact(&self) -> error::Result<String> {
+        Ok(dialoguer::Input::<String>::new()
+            .with_prompt(self.0)
+            .interact()?)
+    }
+}
+
+pub struct Password;
+
+impl Prompt for Password {
+    fn interact(&self) -> error::Result<String> {
+        Ok(dialoguer::Password::new()
+            .with_prompt("Password")
+            .interact()?)
+    }
+}