Merge pull request #96 from PLUS-POSTECH/prepare-list-support

Introduce Problem struct to distinguish problems and repositories

Author: Qwaz

Cargo.lock

@@ -29,6 +29,7 @@ url = "1.7.2"
 whoami = "0.4.1"
 
 [dev-dependencies]
+matches = "0.1.8"
 serde_test = "1.0.85"
 
 [lib]

Cargo.toml

@@ -24,7 +24,7 @@ impl SomaCommand for BuildCommand {
             .arg(
                 Arg::with_name("problem")
                     .required(true)
-                    .help("the name of the problem"),
+                    .help("problem name with optional repository name prefix"),
             )
     }
 

src/bin/soma/commands/build.rs

@@ -24,7 +24,7 @@ impl SomaCommand for CleanCommand {
             .arg(
                 Arg::with_name("problem")
                     .required(true)
-                    .help("the name of the problem to clean up"),
+                    .help("problem name with optional repository name prefix"),
             )
     }
 

src/bin/soma/commands/clean.rs

@@ -26,7 +26,6 @@ impl SomaCommand for FetchCommand {
             .arg(
                 Arg::with_name("problem")
                     .required(true)
-                    // TODO: Separate problem name from repository name.
                     .help("problem name with optional repository name prefix"),
             )
     }

src/bin/soma/commands/fetch.rs

@@ -32,15 +32,25 @@ impl SomaCommand for ListCommand {
         if let None = repo_iter.peek() {
             env.printer().write_line("No repository was added.");
         } else {
-            env.printer()
-                .write_line(&format!("{:<20}{:<40}", "Name", "Origin"));
-
             for repository in repo_iter {
                 env.printer().write_line(&format!(
-                    "{:<20}{:<40}",
+                    "{} ({})",
                     repository.name(),
                     repository.backend()
                 ));
+
+                let mut peekable = repository.prob_name_iter().peekable();
+                while let Some(name) = peekable.next() {
+                    env.printer().write_line(&format!(
+                        "{}─ {}",
+                        if peekable.peek().is_none() {
+                            "└"
+                        } else {
+                            "├"
+                        },
+                        name
+                    ))
+                }
             }
         }
 

src/bin/soma/commands/list.rs

@@ -24,7 +24,7 @@ impl SomaCommand for RunCommand {
             .arg(
                 Arg::with_name("problem")
                     .required(true)
-                    .help("the name of the problem"),
+                    .help("problem name with optional repository name prefix"),
             )
             .arg(
                 Arg::with_name("port")

src/bin/soma/commands/run.rs

@@ -24,7 +24,7 @@ impl SomaCommand for StopCommand {
             .arg(
                 Arg::with_name("problem")
                     .required(true)
-                    .help("the name of the problem to stop"),
+                    .help("problem name with optional repository name prefix"),
             )
     }
 

src/bin/soma/commands/stop.rs

@@ -17,7 +17,7 @@ mod terminal_printer;
 
 fn cli_env(data_dir: &mut DataDirectory) -> SomaResult<Environment<impl Connect, TerminalPrinter>> {
     Environment::new(
-        username(),
+        username().to_lowercase(),
         data_dir,
         connect_default()?,
         TerminalPrinter::new(),