2023-01-13 20:00:30 +01:00
|
|
|
#[cfg(not(windows))]
|
2022-08-10 06:28:03 +02:00
|
|
|
use nu_test_support::fs::Stub::EmptyFile;
|
2022-07-17 23:30:33 +02:00
|
|
|
use nu_test_support::playground::Playground;
|
2022-03-08 02:17:33 +01:00
|
|
|
use nu_test_support::{nu, pipeline};
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn better_empty_redirection() {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: "tests/fixtures/formats", pipeline(
|
2023-07-21 17:32:37 +02:00
|
|
|
"
|
2023-02-22 17:18:33 +01:00
|
|
|
ls | each { |it| nu --testbin cococo $it.name } | ignore
|
2023-07-21 17:32:37 +02:00
|
|
|
"
|
2022-03-08 02:17:33 +01:00
|
|
|
));
|
|
|
|
|
|
|
|
eprintln!("out: {}", actual.out);
|
|
|
|
|
|
|
|
assert!(!actual.out.contains('2'));
|
|
|
|
}
|
2022-07-17 23:30:33 +02:00
|
|
|
|
|
|
|
#[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(
|
2023-07-21 17:32:37 +02:00
|
|
|
"
|
2022-07-17 23:30:33 +02:00
|
|
|
^ls *.txt
|
2023-07-21 17:32:37 +02:00
|
|
|
"
|
2022-07-17 23:30:33 +02:00
|
|
|
));
|
|
|
|
|
|
|
|
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"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2022-07-20 14:44:42 +02:00
|
|
|
#[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(
|
2023-07-21 17:32:37 +02:00
|
|
|
"
|
2022-07-20 14:44:42 +02:00
|
|
|
^ls *.abc; echo done
|
2023-07-21 17:32:37 +02:00
|
|
|
"
|
2022-07-20 14:44:42 +02:00
|
|
|
));
|
|
|
|
|
|
|
|
assert!(!actual.out.contains("done"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2022-08-26 13:50:41 +02:00
|
|
|
#[test]
|
|
|
|
fn external_args_with_quoted() {
|
|
|
|
Playground::setup("external failed command with semicolon", |dirs, _| {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(), pipeline(
|
|
|
|
r#"
|
2024-01-05 04:40:56 +01:00
|
|
|
nu --testbin cococo "foo=bar 'hi'"
|
2022-08-26 13:50:41 +02:00
|
|
|
"#
|
|
|
|
));
|
|
|
|
|
|
|
|
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");
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2022-08-27 15:22:02 +02:00
|
|
|
#[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'"#
|
|
|
|
);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2022-09-17 13:07:45 +02:00
|
|
|
#[test]
|
|
|
|
fn external_command_escape_args() {
|
|
|
|
Playground::setup("external failed command with semicolon", |dirs, _| {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(), pipeline(
|
|
|
|
r#"
|
2024-01-05 04:40:56 +01:00
|
|
|
nu --testbin cococo "\"abcd"
|
2022-09-17 13:07:45 +02:00
|
|
|
"#
|
|
|
|
));
|
|
|
|
|
|
|
|
assert_eq!(actual.out, r#""abcd"#);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2023-01-12 01:14:19 +01:00
|
|
|
#[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#"~"#);
|
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2023-03-26 11:17:51 +02:00
|
|
|
#[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 `~`"#));
|
Require that values that look like numbers parse as numberlike (#8635)
# Description
Require that any value that looks like it might be a number (starts with
a digit, or a '-' + digit, or a '+' + digits, or a special form float
like `-inf`, `inf`, or `NaN`) must now be treated as a number-like
value. Number-like syntax can only parse into number-like values.
Number-like values include: durations, ints, floats, ranges, filesizes,
binary data, etc.
# User-Facing Changes
BREAKING CHANGE
BREAKING CHANGE
BREAKING CHANGE
BREAKING CHANGE
BREAKING CHANGE
BREAKING CHANGE
BREAKING CHANGE
BREAKING CHANGE
Just making sure we see this for release notes 😅
This breaks any and all numberlike values that were treated as strings
before. Example, we used to allow `3,` as a bare word. Anything like
this would now require quotes or backticks to be treated as a string or
bare word, respectively.
# Tests + Formatting
Don't forget to add tests that cover your changes.
Make sure you've run and fixed any issues with these commands:
- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass
> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
# After Submitting
If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
2023-03-28 08:31:38 +02:00
|
|
|
assert!(!actual.out.contains('~'));
|
2023-03-26 11:17:51 +02:00
|
|
|
},
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
2023-02-24 21:39:52 +01:00
|
|
|
#[test]
|
|
|
|
fn external_command_receives_raw_binary_data() {
|
|
|
|
Playground::setup("external command receives raw binary data", |dirs, _| {
|
|
|
|
let actual =
|
2023-07-21 17:32:37 +02:00
|
|
|
nu!(cwd: dirs.test(), pipeline("0x[deadbeef] | nu --testbin input_bytes_length"));
|
2023-02-24 21:39:52 +01:00
|
|
|
assert_eq!(actual.out, r#"4"#);
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2022-07-20 14:44:42 +02:00
|
|
|
#[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(
|
2023-07-21 17:32:37 +02:00
|
|
|
"
|
2022-07-20 14:44:42 +02:00
|
|
|
^cargo asdf; echo done
|
2023-07-21 17:32:37 +02:00
|
|
|
"
|
2022-07-20 14:44:42 +02:00
|
|
|
));
|
|
|
|
|
|
|
|
assert!(!actual.out.contains("done"));
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2022-08-10 01:24:08 +02:00
|
|
|
#[cfg(windows)]
|
|
|
|
#[test]
|
|
|
|
fn can_run_batch_files() {
|
2022-08-10 06:28:03 +02:00
|
|
|
use nu_test_support::fs::Stub::FileWithContent;
|
2022-08-10 01:24:08 +02:00
|
|
|
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() {
|
2022-08-10 06:28:03 +02:00
|
|
|
use nu_test_support::fs::Stub::FileWithContent;
|
2022-08-10 01:24:08 +02:00
|
|
|
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() {
|
2022-08-10 06:28:03 +02:00
|
|
|
use nu_test_support::fs::Stub::FileWithContent;
|
2022-08-10 01:24:08 +02:00
|
|
|
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"));
|
|
|
|
},
|
|
|
|
);
|
|
|
|
}
|
2023-01-13 20:00:30 +01:00
|
|
|
|
|
|
|
#[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
|
2023-07-17 18:43:51 +02:00
|
|
|
let actual = nu!(pipeline(
|
2023-01-13 20:00:30 +01:00
|
|
|
r#"
|
2024-01-05 04:40:56 +01:00
|
|
|
nu --testbin cococo "foo"
|
2023-01-13 20:00:30 +01:00
|
|
|
"#
|
|
|
|
));
|
|
|
|
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
|
|
}
|
2023-04-28 14:55:48 +02:00
|
|
|
|
2023-11-07 09:35:24 +01:00
|
|
|
#[cfg(not(windows))]
|
2023-04-28 14:55:48 +02:00
|
|
|
#[test]
|
|
|
|
fn redirect_combine() {
|
|
|
|
Playground::setup("redirect_combine", |dirs, _| {
|
|
|
|
let actual = nu!(
|
|
|
|
cwd: dirs.test(), pipeline(
|
|
|
|
r#"
|
IO and redirection overhaul (#11934)
# 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.
2024-03-14 21:51:55 +01:00
|
|
|
run-external sh ...[-c 'echo Foo; echo >&2 Bar'] o+e>| print
|
2023-04-28 14:55:48 +02:00
|
|
|
"#
|
|
|
|
));
|
|
|
|
|
|
|
|
// Lines are collapsed in the nu! macro
|
|
|
|
assert_eq!(actual.out, "FooBar");
|
|
|
|
});
|
|
|
|
}
|