feat(cargo-shuttle): add project name to the default directory, ask again if path is rejected (#1654)

* misc: add project name to the default directory

* fix: tests

* fix: tests

* feat: ask again if path choice is denied

* fix: update test

---------

Co-authored-by: jonaro00 <[email protected]>

Author: christos-h

cargo-shuttle/src/lib.rs

@@ -398,31 +398,34 @@ impl Shuttle {
         let path = if needs_path {
             let path = args
                 .path
-                .to_str()
-                .context("path arg should always be set")?;
+                .join(project_args.name.as_ref().expect("name should be set"));
 
-            println!("Where should we create this project?");
-            let directory_str: String = Input::with_theme(&theme)
-                .with_prompt("Directory")
-                .default(path.to_owned())
-                .interact()?;
-            println!();
+            loop {
+                println!("Where should we create this project?");
 
-            let path = args::create_and_parse_path(OsString::from(directory_str))?;
+                let directory_str: String = Input::with_theme(&theme)
+                    .with_prompt("Directory")
+                    .default(format!("{}", path.display()))
+                    .interact()?;
+                println!();
 
-            if std::fs::read_dir(&path)
-                .expect("init dir to exist and list entries")
-                .count()
-                > 0
-                && !Confirm::with_theme(&theme)
-                    .with_prompt("Target directory is not empty. Are you sure?")
-                    .default(true)
-                    .interact()?
-            {
-                return Ok(CommandOutcome::Ok);
-            }
+                let path = args::create_and_parse_path(OsString::from(directory_str))?;
+
+                if std::fs::read_dir(&path)
+                    .expect("init dir to exist and list entries")
+                    .count()
+                    > 0
+                    && !Confirm::with_theme(&theme)
+                        .with_prompt("Target directory is not empty. Are you sure?")
+                        .default(true)
+                        .interact()?
+                {
+                    println!();
+                    continue;
+                }
 
-            path
+                break path;
+            }
         } else {
             args.path.clone()
         };

cargo-shuttle/tests/integration/init.rs

@@ -233,7 +233,7 @@ fn interactive_rocket_init() -> Result<(), Box<dyn std::error::Error>> {
     session.send_line("my-project")?;
     session.exp_string("Where should we create this project?")?;
     session.exp_string("Directory")?;
-    session.send_line(temp_dir_path.to_str().unwrap())?;
+    session.send_line(temp_dir_path.join("my-project").to_str().unwrap())?;
     session.exp_string(
         "Shuttle works with a range of web frameworks. Which one do you want to use?",
     )?;
@@ -246,7 +246,7 @@ fn interactive_rocket_init() -> Result<(), Box<dyn std::error::Error>> {
     session.flush()?;
     session.exp_string("no")?;
 
-    assert_valid_rocket_project(temp_dir_path.as_path(), "my-project");
+    assert_valid_rocket_project(&temp_dir_path.as_path().join("my-project"), "my-project");
 
     Ok(())
 }
@@ -268,7 +268,7 @@ fn interactive_rocket_init_manually_choose_template() -> Result<(), Box<dyn std:
     session.send_line("my-project")?;
     session.exp_string("Where should we create this project?")?;
     session.exp_string("Directory")?;
-    session.send_line(temp_dir_path.to_str().unwrap())?;
+    session.send_line(temp_dir_path.join("my-project").to_str().unwrap())?;
     session.exp_string(
         "Shuttle works with a range of web frameworks. Which one do you want to use?",
     )?;
@@ -281,7 +281,7 @@ fn interactive_rocket_init_manually_choose_template() -> Result<(), Box<dyn std:
     session.flush()?;
     session.exp_string("no")?;
 
-    assert_valid_rocket_project(temp_dir_path.as_path(), "my-project");
+    assert_valid_rocket_project(&temp_dir_path.as_path().join("my-project"), "my-project");
 
     Ok(())
 }
@@ -310,14 +310,14 @@ fn interactive_rocket_init_dont_prompt_framework() -> Result<(), Box<dyn std::er
     session.send_line("my-project")?;
     session.exp_string("Where should we create this project?")?;
     session.exp_string("Directory")?;
-    session.send_line(temp_dir_path.to_str().unwrap())?;
+    session.send_line(temp_dir_path.join("my-project").to_str().unwrap())?;
     session.exp_string("Creating project")?;
     session.exp_string("container on Shuttle?")?;
     session.send("n")?;
     session.flush()?;
     session.exp_string("no")?;
 
-    assert_valid_rocket_project(temp_dir_path.as_path(), "my-project");
+    assert_valid_rocket_project(&temp_dir_path.as_path().join("my-project"), "my-project");
 
     Ok(())
 }
@@ -343,7 +343,7 @@ fn interactive_rocket_init_dont_prompt_name() -> Result<(), Box<dyn std::error::
 
     session.exp_string("Where should we create this project?")?;
     session.exp_string("Directory")?;
-    session.send_line(temp_dir_path.to_str().unwrap())?;
+    session.send_line(temp_dir_path.join("my-project").to_str().unwrap())?;
     session.exp_string(
         "Shuttle works with a range of web frameworks. Which one do you want to use?",
     )?;
@@ -356,7 +356,7 @@ fn interactive_rocket_init_dont_prompt_name() -> Result<(), Box<dyn std::error::
     session.flush()?;
     session.exp_string("no")?;
 
-    assert_valid_rocket_project(temp_dir_path.as_path(), "my-project");
+    assert_valid_rocket_project(&temp_dir_path.as_path().join("my-project"), "my-project");
 
     Ok(())
 }
@@ -384,6 +384,13 @@ fn interactive_rocket_init_prompt_path_dirty_dir() -> Result<(), Box<dyn std::er
     ]);
     let mut session = rexpect::session::spawn_command(command, Some(EXPECT_TIMEOUT_MS))?;
 
+    session.exp_string("Where should we create this project?")?;
+    session.exp_string("Directory")?;
+    session.send_line(temp_dir_path.to_str().unwrap())?;
+    session.exp_string("Target directory is not empty. Are you sure?")?;
+    session.send("n")?;
+    session.flush()?;
+    session.exp_string("no")?;
     session.exp_string("Where should we create this project?")?;
     session.exp_string("Directory")?;
     session.send_line(temp_dir_path.to_str().unwrap())?;
@@ -397,7 +404,7 @@ fn interactive_rocket_init_prompt_path_dirty_dir() -> Result<(), Box<dyn std::er
     session.flush()?;
     session.exp_string("no")?;
 
-    assert_valid_rocket_project(temp_dir_path.as_path(), "my-project");
+    assert_valid_rocket_project(&temp_dir_path, "my-project");
 
     Ok(())
 }