Run --run-tests with stdin if no args given, else with last file.

jaq/src/cli.rs

@@ -44,7 +44,7 @@ pub struct Cli {
     pub files: Vec<PathBuf>,
     pub args: Vec<String>,
     //pub jsonargs: Vec<String>,
-    pub run_tests: Option<PathBuf>,
+    pub run_tests: Option<Vec<PathBuf>>,
     /// If there is some last output value `v`,
     /// then the exit status code is
     /// 1 if `v < true` (that is, if `v` is `false` or `null`) and
@@ -110,9 +110,7 @@ impl Cli {
 
             "args" => *mode = Mode::Args,
             //"jsonargs" => *mode = Mode::JsonArgs,
-            "run-tests" => {
-                self.run_tests = Some(args.next().ok_or(Error::Path("--run-tests"))?.into())
-            }
+            "run-tests" => self.run_tests = Some(args.map(PathBuf::from).collect()),
             "exit-status" => self.short('e', args)?,
             "version" => self.short('V', args)?,
             "help" => self.short('h', args)?,

jaq/src/main.rs

@@ -63,8 +63,11 @@ fn main() -> ExitCode {
 }
 
 fn real_main(cli: &Cli) -> Result<ExitCode, Error> {
-    if let Some(test_file) = &cli.run_tests {
-        return Ok(run_tests(std::fs::File::open(test_file)?));
+    if let Some(test_files) = &cli.run_tests {
+        return Ok(match test_files.last() {
+            Some(file) => run_tests(io::BufReader::new(std::fs::File::open(file)?)),
+            None => run_tests(io::stdin().lock()),
+        });
     }
 
     let (vars, mut ctx): (Vec<String>, Vec<Val>) = binds(cli)?.into_iter().unzip();
@@ -648,8 +651,8 @@ fn run_test(test: load::test::Test<String>) -> Result<(Val, Val), Error> {
     Ok((expect?, obtain.map_err(Error::Jaq)?))
 }
 
-fn run_tests(file: std::fs::File) -> ExitCode {
-    let lines = io::BufReader::new(file).lines().map(Result::unwrap);
+fn run_tests(read: impl BufRead) -> ExitCode {
+    let lines = read.lines().map(Result::unwrap);
     let tests = load::test::Parser::new(lines);
 
     let (mut passed, mut total) = (0, 0);