Add an option to specify the output directory

src/cli_driver.rs

@@ -363,7 +363,7 @@ struct ProcessingSession {
     /// This is the virtual "CWD" that our filesystem accesses use. It is the
     /// dirname of `primary_input_path`, or an empty path (i.e., corresponding
     /// to the CWD if `primary_input_path` is None.
-    fs_root: PathBuf,
+    #[allow(unused)] fs_root: PathBuf,
 
     /// This is the name of the format file to use. TeX has to open it by name
     /// internally, so it has to be String compatible.
@@ -382,6 +382,10 @@ struct ProcessingSession {
     /// engine doesn't know about this path at all.
     makefile_output_path: Option<PathBuf>,
 
+    /// This is the path, the processed file will be saved at. It defaults 
+    /// to the path of `primary_input_path` or `.` if STDIN is used.
+    output_path: PathBuf,
+
     pass: PassSetting,
     output_format: OutputFormat,
     tex_rerun_specification: Option<usize>,
@@ -426,6 +430,7 @@ impl ProcessingSession {
 
         let mut io_builder = CliIoBuilder::default();
         let primary_input_path;
+        let output_path;
         let fs_root;
         let tex_input_stem;
 
@@ -457,6 +462,22 @@ impl ProcessingSession {
             }
         }
 
+        if let Some(dir) = args.value_of("outdir") {
+
+            output_path = {
+                let tmp = PathBuf::from(dir);
+                match tmp.extension() {
+                    Some(_) => {
+                        tt_warning!(status, "file extension in `-o/--outdir`; only the directory will be used");
+                        tmp.parent().unwrap().to_path_buf()
+                        }
+                    None => tmp,
+                }};
+            if !output_path.exists() { return Err(ErrorKind::Msg(format!("output directory \"{}\" does not exist", output_path.display())).into());}
+        } else {
+            output_path = fs_root.clone().to_path_buf()
+        }
+
         let mut aux_path = Path::new(tex_input_stem).to_owned();
         aux_path.set_extension("aux");
         let mut xdv_path = aux_path.clone();
@@ -501,6 +522,7 @@ impl ProcessingSession {
             tex_pdf_path: pdf_path.into_os_string(),
             output_format: output_format,
             makefile_output_path: makefile_output_path,
+            output_path: output_path,
             tex_rerun_specification: reruns,
             keep_intermediates: args.is_present("keep_intermediates"),
             keep_logs: args.is_present("keep_logs"),
@@ -692,8 +714,8 @@ impl ProcessingSession {
                 continue;
             }
 
-            let mut real_path = self.fs_root.clone();
-            real_path.push(name);
+            let real_path = self.output_path.join(name);
+
 
             status.note_highlighted("Writing ", &real_path.to_string_lossy(), &format!(" ({} bytes)", contents.len()));
 
@@ -1052,6 +1074,11 @@ fn main() {
              .help("How much chatter to print when running.")
              .possible_values(&["default", "minimal"])
              .default_value("default"))
+        .arg(Arg::with_name("outdir")
+             .long("outdir")
+             .short("o")
+             .value_name("OUTDIR")
+             .help("The output directory. Default: Same like INPUT."))
         .arg(Arg::with_name("INPUT")
              .help("The file to process.")
              .required(true)

tests/executable.rs

@@ -175,6 +175,26 @@ fn test_space() {
     success_or_panic(output);
 }
 
+#[test] 
+fn test_outdir() {
+    let tempdir = setup_and_copy_files(&["subdirectory/content/1.tex"]);
+
+    let output = run_tectonic(tempdir.path(),
+                              &["--format=plain.fmt.gz", "subdirectory/content/1.tex", "--outdir=subdirectory"]);
+    success_or_panic(output);
+    check_file(&tempdir, "subdirectory/1.pdf");
+}
+
+#[test]
+#[should_panic]
+fn test_bad_outdir() {
+    let tempdir = setup_and_copy_files(&["subdirectory/content/1.tex"]);
+
+    let output = run_tectonic(tempdir.path(),
+                              &["--format=plain.fmt.gz", "subdirectory/content/1.tex", "--outdir=subdirectory/non_existent"]);
+    success_or_panic(output);
+}
+
 #[test]
 fn test_keep_logs_on_error() {
     // No input files here, but output files are created.