diff --git a/apps/wordcraft-cli/src/main.rs b/apps/wordcraft-cli/src/main.rs index 0bcf8377ea..b500db3293 100644 --- a/apps/wordcraft-cli/src/main.rs +++ b/apps/wordcraft-cli/src/main.rs @@ -603,6 +603,11 @@ fn run>(args: &[S]) -> Result<(), Failure> { write_stdout(|o| writeln!(o, "{r}")) } "run" => { + for (i, arg) in rest.iter().enumerate() { + if arg == "--cmd" && rest.get(i + 1).is_none_or(|value| value.starts_with("--")) { + return Err("--cmd needs a value".into()); + } + } validate_options("run", &rest, RUN_OPTIONS)?; let page = parse_page_arg("run", &rest)?; let scale = parse_scale_arg("run", &rest)?; @@ -636,7 +641,7 @@ fn run>(args: &[S]) -> Result<(), Failure> { let mut i = 0; while i < rest.len() { if rest.get(i).map(String::as_str) == Some("--cmd") { - let spec = rest.get(i + 1).ok_or("--cmd needs a value")?; + let spec = rest.get(i + 1).filter(|value| !value.starts_with("--")).ok_or("--cmd needs a value")?; let (id, params) = match spec.split_once('=') { Some((id, p)) => { (id.to_string(), serde_json::from_str::(p).map_err(|e| engine_error(format!("{id}: bad JSON params: {e}")))?) diff --git a/apps/wordcraft-cli/src/tests.rs b/apps/wordcraft-cli/src/tests.rs index c44143fb41..b22e4ffa05 100644 --- a/apps/wordcraft-cli/src/tests.rs +++ b/apps/wordcraft-cli/src/tests.rs @@ -497,6 +497,27 @@ fn command_line_template_wins_over_the_scripts_file() { assert!(std::fs::read_to_string(&b).unwrap().contains("FROM FILE")); } +#[test] +fn cmd_value_missing_is_reported() { + let missing = std::env::temp_dir().join(format!( + "wc-cli-missing-cmd-{}-{}.docx", + std::process::id(), + std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap_or_default().as_nanos() + )); + assert!(!missing.exists()); + let missing = missing.to_string_lossy(); + for argv in [ + vec!["run", "--cmd"], + vec!["run", "--cmd", "--save", "out.docx"], + vec!["run", "--cmd", "caret.docEnd", "--cmd", "--print"], + vec!["run", "--cmd", "--bogus"], + vec!["run", "--cmd", "--file", &missing], + ] { + assert_eq!(run(&args(&argv)), Err("--cmd needs a value".into()), "{argv:?}"); + } + assert!(run(&args(&["run", "--cmd", "caret.docEnd", "--cmd", "caret.docStart"])).is_ok()); +} + #[test] fn script_value_missing_is_reported() { let e = run(&args(&["run", "--script", "--cmd", "caret.docEnd"])).unwrap_err().to_string();