Merge pull request #14 from sagiegurari/0.6.3

0.6.3

Author: sagiegurari

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGELOG
 
+### v0.6.3
+
+* Support custom working directory #13
+
 ### v0.6.2 (2020-02-17)
 
 * Use fsio crate for file system apis.

src/runner.rs

@@ -10,6 +10,7 @@ mod runner_test;
 use crate::types::{ErrorInfo, IoOptions, ScriptError, ScriptOptions};
 use fsio;
 use fsio::error::FsIOError;
+use fsio::path::from_path::FromPath;
 use std::env::current_dir;
 use std::process::{Child, Command, ExitStatus, Stdio};
 
@@ -82,6 +83,12 @@ fn modify_script(script: &String, options: &ScriptOptions) -> Result<String, Scr
                     // create cd command
                     let mut cd_command = "cd ".to_string();
                     cd_command.push_str(cwd);
+                    if let Some(ref working_directory) = options.working_directory {
+                        cd_command.push_str(" && cd ");
+                        let working_directory_string: String =
+                            FromPath::from_path(&working_directory);
+                        cd_command.push_str(&working_directory_string);
+                    }
 
                     let mut script_lines: Vec<String> = script
                         .trim()

src/runner_test.rs

@@ -1,6 +1,6 @@
 use super::*;
 use std::env::current_dir;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 #[test]
 fn create_script_file_and_delete() {
@@ -59,6 +59,22 @@ fn modify_script_exit_on_error() {
     assert_eq!(script, expected_script);
 }
 
+#[test]
+fn modify_script_working_directory() {
+    let mut options = ScriptOptions::new();
+    options.working_directory = Some(PathBuf::from("/usr/me/home"));
+
+    let cwd = current_dir().unwrap();
+    let mut expected_script = "".to_string();
+    expected_script.push_str("cd ");
+    expected_script.push_str(cwd.to_str().unwrap());
+    expected_script.push_str(" && cd /usr/me/home\necho test\n\n");
+
+    let script = modify_script(&"echo test".to_string(), &options).unwrap();
+
+    assert_eq!(script, expected_script);
+}
+
 #[test]
 fn modify_script_print_commands() {
     let mut options = ScriptOptions::new();

src/types.rs

@@ -12,6 +12,7 @@ use std::error;
 use std::fmt;
 use std::fmt::Display;
 use std::io::Error;
+use std::path::PathBuf;
 
 #[derive(Debug)]
 /// Holds the error information
@@ -57,6 +58,8 @@ impl Display for ScriptError {
 pub struct ScriptOptions {
     /// Defines the requested runner (defaults to cmd in windows and sh for other platforms)
     pub runner: Option<String>,
+    /// The working directory of the invocation
+    pub working_directory: Option<PathBuf>,
     /// Default is IoOptions::Inherit
     pub input_redirection: IoOptions,
     /// Default is IoOptions::Pipe (only pipe enables to capture the output)
@@ -83,6 +86,7 @@ impl ScriptOptions {
     pub fn new() -> ScriptOptions {
         ScriptOptions {
             runner: None,
+            working_directory: None,
             input_redirection: IoOptions::Inherit,
             output_redirection: IoOptions::Pipe,
             exit_on_error: false,

src/types_test.rs

@@ -21,6 +21,7 @@ fn script_options_new() {
     let options = ScriptOptions::new();
 
     assert!(options.runner.is_none());
+    assert!(options.working_directory.is_none());
     assert_eq!(options.input_redirection, IoOptions::Inherit);
     assert_eq!(options.output_redirection, IoOptions::Pipe);
     assert!(!options.exit_on_error);