mirror of
https://github.com/nushell/nushell.git
synced 2024-12-12 10:10:51 +01:00
b6c7656194
# Description The PR overhauls how IO redirection is handled, allowing more explicit and fine-grain control over `stdout` and `stderr` output as well as more efficient IO and piping. To summarize the changes in this PR: - Added a new `IoStream` type to indicate the intended destination for a pipeline element's `stdout` and `stderr`. - The `stdout` and `stderr` `IoStream`s are stored in the `Stack` and to avoid adding 6 additional arguments to every eval function and `Command::run`. The `stdout` and `stderr` streams can be temporarily overwritten through functions on `Stack` and these functions will return a guard that restores the original `stdout` and `stderr` when dropped. - In the AST, redirections are now directly part of a `PipelineElement` as a `Option<Redirection>` field instead of having multiple different `PipelineElement` enum variants for each kind of redirection. This required changes to the parser, mainly in `lite_parser.rs`. - `Command`s can also set a `IoStream` override/redirection which will apply to the previous command in the pipeline. This is used, for example, in `ignore` to allow the previous external command to have its stdout redirected to `Stdio::null()` at spawn time. In contrast, the current implementation has to create an os pipe and manually consume the output on nushell's side. File and pipe redirections (`o>`, `e>`, `e>|`, etc.) have precedence over overrides from commands. This PR improves piping and IO speed, partially addressing #10763. Using the `throughput` command from that issue, this PR gives the following speedup on my setup for the commands below: | Command | Before (MB/s) | After (MB/s) | Bash (MB/s) | | --------------------------- | -------------:| ------------:| -----------:| | `throughput o> /dev/null` | 1169 | 52938 | 54305 | | `throughput \| ignore` | 840 | 55438 | N/A | | `throughput \| null` | Error | 53617 | N/A | | `throughput \| rg 'x'` | 1165 | 3049 | 3736 | | `(throughput) \| rg 'x'` | 810 | 3085 | 3815 | (Numbers above are the median samples for throughput) This PR also paves the way to refactor our `ExternalStream` handling in the various commands. For example, this PR already fixes the following code: ```nushell ^sh -c 'echo -n "hello "; sleep 0; echo "world"' | find "hello world" ``` This returns an empty list on 0.90.1 and returns a highlighted "hello world" on this PR. Since the `stdout` and `stderr` `IoStream`s are available to commands when they are run, then this unlocks the potential for more convenient behavior. E.g., the `find` command can disable its ansi highlighting if it detects that the output `IoStream` is not the terminal. Knowing the output streams will also allow background job output to be redirected more easily and efficiently. # User-Facing Changes - External commands returned from closures will be collected (in most cases): ```nushell 1..2 | each {|_| nu -c "print a" } ``` This gives `["a", "a"]` on this PR, whereas this used to print "a\na\n" and then return an empty list. ```nushell 1..2 | each {|_| nu -c "print -e a" } ``` This gives `["", ""]` and prints "a\na\n" to stderr, whereas this used to return an empty list and print "a\na\n" to stderr. - Trailing new lines are always trimmed for external commands when piping into internal commands or collecting it as a value. (Failure to decode the output as utf-8 will keep the trailing newline for the last binary value.) In the current nushell version, the following three code snippets differ only in parenthesis placement, but they all also have different outputs: 1. `1..2 | each { ^echo a }` ``` a a ╭────────────╮ │ empty list │ ╰────────────╯ ``` 2. `1..2 | each { (^echo a) }` ``` ╭───┬───╮ │ 0 │ a │ │ 1 │ a │ ╰───┴───╯ ``` 3. `1..2 | (each { ^echo a })` ``` ╭───┬───╮ │ 0 │ a │ │ │ │ │ 1 │ a │ │ │ │ ╰───┴───╯ ``` But in this PR, the above snippets will all have the same output: ``` ╭───┬───╮ │ 0 │ a │ │ 1 │ a │ ╰───┴───╯ ``` - All existing flags on `run-external` are now deprecated. - File redirections now apply to all commands inside a code block: ```nushell (nu -c "print -e a"; nu -c "print -e b") e> test.out ``` This gives "a\nb\n" in `test.out` and prints nothing. The same result would happen when printing to stdout and using a `o>` file redirection. - External command output will (almost) never be ignored, and ignoring output must be explicit now: ```nushell (^echo a; ^echo b) ``` This prints "a\nb\n", whereas this used to print only "b\n". This only applies to external commands; values and internal commands not in return position will not print anything (e.g., `(echo a; echo b)` still only prints "b"). - `complete` now always captures stderr (`do` is not necessary). # After Submitting The language guide and other documentation will need to be updated.
336 lines
8.6 KiB
Rust
336 lines
8.6 KiB
Rust
#[cfg(not(windows))]
|
|
use nu_test_support::fs::Stub::EmptyFile;
|
|
use nu_test_support::playground::Playground;
|
|
use nu_test_support::{nu, pipeline};
|
|
|
|
#[test]
|
|
fn better_empty_redirection() {
|
|
let actual = nu!(
|
|
cwd: "tests/fixtures/formats", pipeline(
|
|
"
|
|
ls | each { |it| nu --testbin cococo $it.name } | ignore
|
|
"
|
|
));
|
|
|
|
eprintln!("out: {}", actual.out);
|
|
|
|
assert!(!actual.out.contains('2'));
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn explicit_glob() {
|
|
Playground::setup("external with explicit glob", |dirs, sandbox| {
|
|
sandbox.with_files(vec![
|
|
EmptyFile("D&D_volume_1.txt"),
|
|
EmptyFile("D&D_volume_2.txt"),
|
|
EmptyFile("foo.sh"),
|
|
]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
^ls | glob '*.txt' | length
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "2");
|
|
})
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn bare_word_expand_path_glob() {
|
|
Playground::setup("bare word should do the expansion", |dirs, sandbox| {
|
|
sandbox.with_files(vec![
|
|
EmptyFile("D&D_volume_1.txt"),
|
|
EmptyFile("D&D_volume_2.txt"),
|
|
EmptyFile("foo.sh"),
|
|
]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
"
|
|
^ls *.txt
|
|
"
|
|
));
|
|
|
|
assert!(actual.out.contains("D&D_volume_1.txt"));
|
|
assert!(actual.out.contains("D&D_volume_2.txt"));
|
|
})
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn backtick_expand_path_glob() {
|
|
Playground::setup("backtick should do the expansion", |dirs, sandbox| {
|
|
sandbox.with_files(vec![
|
|
EmptyFile("D&D_volume_1.txt"),
|
|
EmptyFile("D&D_volume_2.txt"),
|
|
EmptyFile("foo.sh"),
|
|
]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
^ls `*.txt`
|
|
"#
|
|
));
|
|
|
|
assert!(actual.out.contains("D&D_volume_1.txt"));
|
|
assert!(actual.out.contains("D&D_volume_2.txt"));
|
|
})
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn single_quote_does_not_expand_path_glob() {
|
|
Playground::setup("single quote do not run the expansion", |dirs, sandbox| {
|
|
sandbox.with_files(vec![
|
|
EmptyFile("D&D_volume_1.txt"),
|
|
EmptyFile("D&D_volume_2.txt"),
|
|
EmptyFile("foo.sh"),
|
|
]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
^ls '*.txt'
|
|
"#
|
|
));
|
|
|
|
assert!(actual.err.contains("No such file or directory"));
|
|
})
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn double_quote_does_not_expand_path_glob() {
|
|
Playground::setup("double quote do not run the expansion", |dirs, sandbox| {
|
|
sandbox.with_files(vec![
|
|
EmptyFile("D&D_volume_1.txt"),
|
|
EmptyFile("D&D_volume_2.txt"),
|
|
EmptyFile("foo.sh"),
|
|
]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
^ls "*.txt"
|
|
"#
|
|
));
|
|
|
|
assert!(actual.err.contains("No such file or directory"));
|
|
})
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn failed_command_with_semicolon_will_not_execute_following_cmds() {
|
|
Playground::setup("external failed command with semicolon", |dirs, _| {
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
"
|
|
^ls *.abc; echo done
|
|
"
|
|
));
|
|
|
|
assert!(!actual.out.contains("done"));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn external_args_with_quoted() {
|
|
Playground::setup("external failed command with semicolon", |dirs, _| {
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
nu --testbin cococo "foo=bar 'hi'"
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "foo=bar 'hi'");
|
|
})
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn external_arg_with_long_flag_value_quoted() {
|
|
Playground::setup("external failed command with semicolon", |dirs, _| {
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
^echo --foo='bar'
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "--foo=bar");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn external_arg_with_variable_name() {
|
|
Playground::setup("external failed command with semicolon", |dirs, _| {
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
let dump_command = "PGPASSWORD='db_secret' pg_dump -Fc -h 'db.host' -p '$db.port' -U postgres -d 'db_name' > '/tmp/dump_name'";
|
|
nu --testbin nonu $dump_command
|
|
"#
|
|
));
|
|
|
|
assert_eq!(
|
|
actual.out,
|
|
r#"PGPASSWORD='db_secret' pg_dump -Fc -h 'db.host' -p '$db.port' -U postgres -d 'db_name' > '/tmp/dump_name'"#
|
|
);
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn external_command_escape_args() {
|
|
Playground::setup("external failed command with semicolon", |dirs, _| {
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
nu --testbin cococo "\"abcd"
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, r#""abcd"#);
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn external_command_not_expand_tilde_with_quotes() {
|
|
Playground::setup(
|
|
"external command not expand tilde with quotes",
|
|
|dirs, _| {
|
|
let actual = nu!(cwd: dirs.test(), pipeline(r#"nu --testbin nonu "~""#));
|
|
assert_eq!(actual.out, r#"~"#);
|
|
},
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn external_command_expand_tilde_with_back_quotes() {
|
|
Playground::setup(
|
|
"external command not expand tilde with quotes",
|
|
|dirs, _| {
|
|
let actual = nu!(cwd: dirs.test(), pipeline(r#"nu --testbin nonu `~`"#));
|
|
assert!(!actual.out.contains('~'));
|
|
},
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn external_command_receives_raw_binary_data() {
|
|
Playground::setup("external command receives raw binary data", |dirs, _| {
|
|
let actual =
|
|
nu!(cwd: dirs.test(), pipeline("0x[deadbeef] | nu --testbin input_bytes_length"));
|
|
assert_eq!(actual.out, r#"4"#);
|
|
})
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
#[test]
|
|
fn failed_command_with_semicolon_will_not_execute_following_cmds_windows() {
|
|
Playground::setup("external failed command with semicolon", |dirs, _| {
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
"
|
|
^cargo asdf; echo done
|
|
"
|
|
));
|
|
|
|
assert!(!actual.out.contains("done"));
|
|
})
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
#[test]
|
|
fn can_run_batch_files() {
|
|
use nu_test_support::fs::Stub::FileWithContent;
|
|
Playground::setup("run a Windows batch file", |dirs, sandbox| {
|
|
sandbox.with_files(vec![FileWithContent(
|
|
"foo.cmd",
|
|
r#"
|
|
@echo off
|
|
echo Hello World
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(cwd: dirs.test(), pipeline("foo.cmd"));
|
|
assert!(actual.out.contains("Hello World"));
|
|
});
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
#[test]
|
|
fn can_run_batch_files_without_cmd_extension() {
|
|
use nu_test_support::fs::Stub::FileWithContent;
|
|
Playground::setup(
|
|
"run a Windows batch file without specifying the extension",
|
|
|dirs, sandbox| {
|
|
sandbox.with_files(vec![FileWithContent(
|
|
"foo.cmd",
|
|
r#"
|
|
@echo off
|
|
echo Hello World
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(cwd: dirs.test(), pipeline("foo"));
|
|
assert!(actual.out.contains("Hello World"));
|
|
},
|
|
);
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
#[test]
|
|
fn can_run_batch_files_without_bat_extension() {
|
|
use nu_test_support::fs::Stub::FileWithContent;
|
|
Playground::setup(
|
|
"run a Windows batch file without specifying the extension",
|
|
|dirs, sandbox| {
|
|
sandbox.with_files(vec![FileWithContent(
|
|
"foo.bat",
|
|
r#"
|
|
@echo off
|
|
echo Hello World
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(cwd: dirs.test(), pipeline("foo"));
|
|
assert!(actual.out.contains("Hello World"));
|
|
},
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn quotes_trimmed_when_shelling_out() {
|
|
// regression test for a bug where we weren't trimming quotes around string args before shelling out to cmd.exe
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
nu --testbin cococo "foo"
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn redirect_combine() {
|
|
Playground::setup("redirect_combine", |dirs, _| {
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
run-external sh ...[-c 'echo Foo; echo >&2 Bar'] o+e>| print
|
|
"#
|
|
));
|
|
|
|
// Lines are collapsed in the nu! macro
|
|
assert_eq!(actual.out, "FooBar");
|
|
});
|
|
}
|