Skip to content

Commit

Permalink
WIP Fixing broken cwd in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
@kubouch
kubouch committed Jul 29, 2022
1 parent 3515aeb commit 96251da
Show file tree
Hide file tree
Showing 3 changed files with 224 additions and 96 deletions.
1 change: 1 addition & 0 deletions src/main.rs
View file
Expand Up @@ -177,6 +177,7 @@ fn main() -> Result<()> {
"nonu" => test_bins::nonu(),
"chop" => test_bins::chop(),
"repeater" => test_bins::repeater(),
"nu_repl" => test_bins::nu_repl(),
_ => std::process::exit(1),
}
std::process::exit(0)
Expand Down
124 changes: 124 additions & 0 deletions src/test_bins.rs
View file
@@ -1,5 +1,13 @@
use std::io::{self, BufRead, Write};

use nu_cli::{eval_env_change_hook, eval_hook};
use nu_command::create_default_context;
use nu_engine::eval_block;
use nu_parser::parse;
use nu_protocol::engine::{EngineState, Stack, StateWorkingSet};
use nu_protocol::{CliError, PipelineData, Span, Value};
// use nu_test_support::fs::in_directory;

/// Echo's value of env keys from args
/// Example: nu --testbin env_echo FOO BAR
/// If it it's not present echo's nothing
Expand Down Expand Up @@ -140,3 +148,119 @@ fn args() -> Vec<String> {
// skip (--testbin bin_name args)
std::env::args().skip(2).collect()
}

fn outcome_err(
engine_state: &EngineState,
error: &(dyn miette::Diagnostic + Send + Sync + 'static),
) {
let working_set = StateWorkingSet::new(engine_state);

eprintln!("Error: {:?}", CliError(error, &working_set));
}

fn outcome_ok(msg: String) {
println!("{}", msg);
}

pub fn nu_repl() {
//cwd: &str, source_lines: &[&str]) {
let cwd = std::env::current_dir().expect("Could not get current working directory.");
let source_lines = args();

let mut engine_state = create_default_context();
let mut stack = Stack::new();

stack.add_env_var(
"PWD".to_string(),
Value::String {
val: cwd.to_string_lossy().to_string(),
span: Span::test_data(),
},
);

let mut last_output = String::new();

for (i, line) in source_lines.iter().enumerate() {
let cwd = match nu_engine::env::current_dir(&engine_state, &stack) {
Ok(d) => d,
Err(err) => {
return outcome_err(&engine_state, &err);
}
};

// Before doing anything, merge the environment from the previous REPL iteration into the
// permanent state.
if let Err(err) = engine_state.merge_env(&mut stack, &cwd) {
return outcome_err(&engine_state, &err);
}

// Check for pre_prompt hook
let config = engine_state.get_config();
if let Some(hook) = config.hooks.pre_prompt.clone() {
if let Err(err) = eval_hook(&mut engine_state, &mut stack, vec![], &hook) {
return outcome_err(&engine_state, &err);
}
}

// Check for env change hook
let config = engine_state.get_config();
if let Err(err) = eval_env_change_hook(
config.hooks.env_change.clone(),
&mut engine_state,
&mut stack,
) {
return outcome_err(&engine_state, &err);
}

// Check for pre_execution hook
let config = engine_state.get_config();
if let Some(hook) = config.hooks.pre_execution.clone() {
if let Err(err) = eval_hook(&mut engine_state, &mut stack, vec![], &hook) {
return outcome_err(&engine_state, &err);
}
}

// Eval the REPL line
let (block, delta) = {
let mut working_set = StateWorkingSet::new(&engine_state);
let (block, err) = parse(
&mut working_set,
Some(&format!("line{}", i)),
line.as_bytes(),
false,
&[],
);

if let Some(err) = err {
return outcome_err(&engine_state, &err);
}
(block, working_set.render())
};

if let Err(err) = engine_state.merge_delta(delta) {
return outcome_err(&engine_state, &err);
}

let input = PipelineData::new(Span::test_data());
let config = engine_state.get_config();

match eval_block(&engine_state, &mut stack, &block, input, false, false) {
Ok(pipeline_data) => match pipeline_data.collect_string("", config) {
Ok(s) => last_output = s,
Err(err) => return outcome_err(&engine_state, &err),
},
Err(err) => return outcome_err(&engine_state, &err),
}

if let Some(cwd) = stack.get_env_var(&engine_state, "PWD") {
let path = match cwd.as_string() {
Ok(p) => p,
Err(err) => return outcome_err(&engine_state, &err),
};
let _ = std::env::set_current_dir(path);
engine_state.add_env_var("PWD".into(), cwd);
}
}

outcome_ok(last_output)
}
195 changes: 99 additions & 96 deletions tests/shell/mod.rs
View file
Expand Up @@ -72,102 +72,105 @@ fn nu_lib_dirs_repl() {
"#,
)]);

let inp = &[
r#"let-env NU_LIB_DIRS = [ ('scripts' | path expand) ]"#,
r#"source foo.nu"#,
r#"$env.FOO"#,
];

let actual_repl = nu_repl(dirs.test().to_str().unwrap(), inp);

assert!(actual_repl.err.is_empty());
assert_eq!(actual_repl.out, "foo");
})
}

#[test]
fn nu_lib_dirs_script() {
Playground::setup("nu_lib_dirs_script", |dirs, sandbox| {
sandbox
.mkdir("scripts")
.with_files(vec![FileWithContentToBeTrimmed(
"scripts/foo.nu",
r#"
let-env FOO = "foo"
"#,
)])
.with_files(vec![FileWithContentToBeTrimmed(
"main.nu",
r#"
source foo.nu
"#,
)]);

let inp = &[
r#"let-env NU_LIB_DIRS = [ ('scripts' | path expand) ]"#,
r#"source main.nu"#,
r#"$env.FOO"#,
];

let actual_repl = nu_repl(dirs.test().to_str().unwrap(), inp);

assert!(actual_repl.err.is_empty());
assert_eq!(actual_repl.out, "foo");
// let inp = &[
// r#"let-env NU_LIB_DIRS = [ ('scripts' | path expand) ]"#,
// r#"source foo.nu"#,
// r#"$env.FOO"#,
// ];

//let actual_repl = nu_repl(dirs.test().to_str().unwrap(), inp);
let actual_repl =
nu!(cwd: dirs.test(), r#"nu --testbin=nu_repl [ 'let x = 4' '4 + $x' ]"#.to_string());

// assert!(actual_repl.err.is_empty());
// assert_eq!(actual_repl.out, "foo");
assert_eq!(actual_repl.out, "8");
})
}

#[test]
fn nu_lib_dirs_relative_repl() {
Playground::setup("nu_lib_dirs_relative_repl", |dirs, sandbox| {
sandbox
.mkdir("scripts")
.with_files(vec![FileWithContentToBeTrimmed(
"scripts/foo.nu",
r#"
let-env FOO = "foo"
"#,
)]);

let inp = &[
r#"let-env NU_LIB_DIRS = [ 'scripts' ]"#,
r#"source foo.nu"#,
r#"$env.FOO"#,
];

let actual_repl = nu_repl(dirs.test().to_str().unwrap(), inp);

assert!(actual_repl.err.is_empty());
assert_eq!(actual_repl.out, "foo");
})
}

#[test]
fn nu_lib_dirs_relative_script() {
Playground::setup("nu_lib_dirs_relative_script", |dirs, sandbox| {
sandbox
.mkdir("scripts")
.with_files(vec![FileWithContentToBeTrimmed(
"scripts/main.nu",
r#"
source ../foo.nu
"#,
)])
.with_files(vec![FileWithContentToBeTrimmed(
"foo.nu",
r#"
let-env FOO = "foo"
"#,
)]);

let inp = &[
r#"let-env NU_LIB_DIRS = [ 'scripts' ]"#,
r#"source scripts/main.nu"#,
r#"$env.FOO"#,
];

let actual_repl = nu_repl(dirs.test().to_str().unwrap(), inp);

assert!(actual_repl.err.is_empty());
assert_eq!(actual_repl.out, "foo");
})
}
// #[test]
// fn nu_lib_dirs_script() {
// Playground::setup("nu_lib_dirs_script", |dirs, sandbox| {
// sandbox
// .mkdir("scripts")
// .with_files(vec![FileWithContentToBeTrimmed(
// "scripts/foo.nu",
// r#"
// let-env FOO = "foo"
// "#,
// )])
// .with_files(vec![FileWithContentToBeTrimmed(
// "main.nu",
// r#"
// source foo.nu
// "#,
// )]);

// let inp = &[
// r#"let-env NU_LIB_DIRS = [ ('scripts' | path expand) ]"#,
// r#"source main.nu"#,
// r#"$env.FOO"#,
// ];

// let actual_repl = nu_repl(dirs.test().to_str().unwrap(), inp);

// assert!(actual_repl.err.is_empty());
// assert_eq!(actual_repl.out, "foo");
// })
// }

// #[test]
// fn nu_lib_dirs_relative_repl() {
// Playground::setup("nu_lib_dirs_relative_repl", |dirs, sandbox| {
// sandbox
// .mkdir("scripts")
// .with_files(vec![FileWithContentToBeTrimmed(
// "scripts/foo.nu",
// r#"
// let-env FOO = "foo"
// "#,
// )]);

// let inp = &[
// r#"let-env NU_LIB_DIRS = [ 'scripts' ]"#,
// r#"source foo.nu"#,
// r#"$env.FOO"#,
// ];

// let actual_repl = nu_repl(dirs.test().to_str().unwrap(), inp);

// assert!(actual_repl.err.is_empty());
// assert_eq!(actual_repl.out, "foo");
// })
// }

// #[test]
// fn nu_lib_dirs_relative_script() {
// Playground::setup("nu_lib_dirs_relative_script", |dirs, sandbox| {
// sandbox
// .mkdir("scripts")
// .with_files(vec![FileWithContentToBeTrimmed(
// "scripts/main.nu",
// r#"
// source ../foo.nu
// "#,
// )])
// .with_files(vec![FileWithContentToBeTrimmed(
// "foo.nu",
// r#"
// let-env FOO = "foo"
// "#,
// )]);

// let inp = &[
// r#"let-env NU_LIB_DIRS = [ 'scripts' ]"#,
// r#"source scripts/main.nu"#,
// r#"$env.FOO"#,
// ];

// let actual_repl = nu_repl(dirs.test().to_str().unwrap(), inp);

// assert!(actual_repl.err.is_empty());
// assert_eq!(actual_repl.out, "foo");
// })
// }

0 comments on commit 96251da

Please sign in to comment.