rename --grasp-servers flag to --grasp-server

Allow multiple values via repeated --grasp-server flags
instead of the less intuitive plural --grasp-servers form.

2 files changed, 13 insertions, 13 deletions

diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs
index 827acf8..3fa67ba 100644
--- a/src/bin/ngit/sub_commands/init.rs
+++ b/src/bin/ngit/sub_commands/init.rs
@@ -304,8 +304,8 @@ fn resolve_grasp_servers(
     identifier: &str,
     interactive: bool,
 ) -> Result<Vec<String>> {
-    if !args.grasp_servers.is_empty() {
-        return Ok(args.grasp_servers.clone());
+    if !args.grasp_server.is_empty() {
+        return Ok(args.grasp_server.clone());
     }
 
     let has_both_relays_and_clone_url = !args.relays.is_empty() && !args.clone.is_empty();
@@ -414,13 +414,13 @@ fn validate_fresh(cli: &Cli, args: &SubCommandArgs, user_has_grasp_list: bool) -
         missing.push(("--name <NAME>", "repository name or identifier"));
     }
 
-    let has_grasp_servers = !args.grasp_servers.is_empty();
+    let has_grasp_servers = !args.grasp_server.is_empty();
     let has_both_relays_and_clone_url = !args.relays.is_empty() && !args.clone.is_empty();
     let missing_servers =
         !has_grasp_servers && !user_has_grasp_list && !has_both_relays_and_clone_url;
     if missing_servers {
         missing.push((
-            "--grasp-servers <URL>...",
+            "--grasp-server <URL>...",
             "where your git+nostr data is hosted",
         ));
     }
@@ -467,7 +467,7 @@ pub struct SubCommandArgs {
     description: Option<String>,
     #[clap(short, long, value_parser, num_args = 1..)]
     /// where your git+nostr data is hosted
-    grasp_servers: Vec<String>,
+    grasp_server: Vec<String>,
     #[clap(long, value_parser, num_args = 1..)]
     /// additional relays beyond grasp servers
     relays: Vec<String>,
@@ -495,7 +495,7 @@ impl SubCommandArgs {
             || self.description.is_some()
             || !self.clone.is_empty()
             || !self.relays.is_empty()
-            || !self.grasp_servers.is_empty()
+            || !self.grasp_server.is_empty()
             || !self.web.is_empty()
             || !self.blossoms.is_empty()
             || !self.other_maintainers.is_empty()
diff --git a/tests/ngit_init.rs b/tests/ngit_init.rs
index f70bc2e..b25e321 100644
--- a/tests/ngit_init.rs
+++ b/tests/ngit_init.rs
@@ -64,7 +64,7 @@ mod state_a_fresh {
             p.expect_eventually("logged in as")?;
             p.expect_eventually("missing required fields")?;
             p.expect_eventually("--name <NAME>")?;
-            p.expect_eventually("--grasp-servers")?;
+            p.expect_eventually("--grasp-server")?;
             Ok(())
         }
 
@@ -82,7 +82,7 @@ mod state_a_fresh {
             ];
             let mut p = CliTester::new_from_dir(&git_repo.dir, args);
             p.expect_eventually("logged in as")?;
-            p.expect_eventually("missing --grasp-servers")?;
+            p.expect_eventually("missing --grasp-server")?;
             Ok(())
         }
 
@@ -102,7 +102,7 @@ mod state_a_fresh {
             p.expect_eventually("logged in as")?;
             p.expect_eventually("missing required fields")?;
             p.expect_eventually("--name <NAME>")?;
-            p.expect_eventually("--grasp-servers")?;
+            p.expect_eventually("--grasp-server")?;
             Ok(())
         }
     }
@@ -177,7 +177,7 @@ mod state_a_fresh {
                 run_init_with_grasp_server(vec![
                     "--name",
                     "My Project",
-                    "--grasp-servers",
+                    "--grasp-server",
                     "ws://localhost:8055",
                 ])
                 .await
@@ -461,7 +461,7 @@ mod state_b_coordinate_only {
                         "--disable-cli-spinners",
                         "init",
                         "--force",
-                        "--grasp-servers",
+                        "--grasp-server",
                         "ws://localhost:8055",
                     ];
                     let mut p = CliTester::new_from_dir(&dir, args);
@@ -938,7 +938,7 @@ mod state_d_co_maintainer {
                         TEST_KEY_1_NSEC,
                         "--disable-cli-spinners",
                         "init",
-                        "--grasp-servers",
+                        "--grasp-server",
                         "ws://localhost:8055",
                     ];
                     let mut p = CliTester::new_from_dir(&dir, args);
@@ -1241,7 +1241,7 @@ mod state_e_not_listed {
                         "--disable-cli-spinners",
                         "init",
                         "--force",
-                        "--grasp-servers",
+                        "--grasp-server",
                         "ws://localhost:8055",
                     ];
                     let mut p = CliTester::new_from_dir(&dir, args);