2022-12-22 15:46:55 +01:00
|
|
|
/// Run a command in nu and get its output
|
2022-08-13 04:13:50 +02:00
|
|
|
///
|
|
|
|
/// The `nu!` macro accepts a number of options like the `cwd` in which the
|
|
|
|
/// command should be run. It is also possible to specify a different `locale`
|
|
|
|
/// to test locale dependent commands.
|
|
|
|
///
|
|
|
|
/// Pass options as the first arguments in the form of `key_1: value_1, key_1:
|
|
|
|
/// value_2, ...`. The options are defined in the `NuOpts` struct inside the
|
|
|
|
/// `nu!` macro.
|
|
|
|
///
|
|
|
|
/// The command can be formatted using `{}` just like `println!` or `format!`.
|
|
|
|
/// Pass the format arguments comma separated after the command itself.
|
|
|
|
///
|
|
|
|
/// # Examples
|
|
|
|
///
|
|
|
|
/// ```no_run
|
|
|
|
/// # // NOTE: The `nu!` macro needs the `nu` binary to exist. The test are
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 08:31:26 +01:00
|
|
|
/// # // therefore only compiled but not run (that's what the `no_run` at
|
2022-08-13 04:13:50 +02:00
|
|
|
/// # // the beginning of this code block is for).
|
|
|
|
/// #
|
|
|
|
/// use nu_test_support::nu;
|
|
|
|
///
|
|
|
|
/// let outcome = nu!(
|
|
|
|
/// "date now | date to-record | get year"
|
|
|
|
/// );
|
|
|
|
///
|
|
|
|
/// let dir = "/";
|
|
|
|
/// let outcome = nu!(
|
|
|
|
/// "ls {} | get name",
|
|
|
|
/// dir,
|
|
|
|
/// );
|
|
|
|
///
|
|
|
|
/// let outcome = nu!(
|
|
|
|
/// cwd: "/",
|
|
|
|
/// "ls | get name",
|
|
|
|
/// );
|
|
|
|
///
|
|
|
|
/// let cell = "size";
|
|
|
|
/// let outcome = nu!(
|
|
|
|
/// locale: "de_DE.UTF-8",
|
|
|
|
/// "ls | into int {}",
|
|
|
|
/// cell,
|
|
|
|
/// );
|
|
|
|
///
|
|
|
|
/// let decimals = 2;
|
|
|
|
/// let outcome = nu!(
|
|
|
|
/// locale: "de_DE.UTF-8",
|
|
|
|
/// "10 | into string --decimals {}",
|
|
|
|
/// decimals,
|
|
|
|
/// );
|
|
|
|
/// ```
|
2019-12-15 17:15:06 +01:00
|
|
|
#[macro_export]
|
|
|
|
macro_rules! nu {
|
2022-08-13 04:13:50 +02:00
|
|
|
// In the `@options` phase, we restucture all the
|
|
|
|
// `$field_1: $value_1, $field_2: $value_2, ...`
|
|
|
|
// pairs to a structure like
|
|
|
|
// `@options[ $field_1 => $value_1 ; $field_2 => $value_2 ; ... ]`.
|
|
|
|
// We do this to later distinguish the options from the `$path` and `$part`s.
|
|
|
|
// (See
|
|
|
|
// https://users.rust-lang.org/t/i-dont-think-this-local-ambiguity-when-calling-macro-is-ambiguous/79401?u=x3ro
|
|
|
|
// )
|
|
|
|
//
|
|
|
|
// If there is any special treatment needed for the `$value`, we can just
|
|
|
|
// match for the specific `field` name.
|
|
|
|
(
|
|
|
|
@options [ $($options:tt)* ]
|
|
|
|
cwd: $value:expr,
|
|
|
|
$($rest:tt)*
|
|
|
|
) => {
|
|
|
|
nu!(@options [ $($options)* cwd => $crate::fs::in_directory($value) ; ] $($rest)*)
|
2023-04-10 00:55:29 +02:00
|
|
|
};
|
|
|
|
// For all other options, we call `.into()` on the `$value` and hope for the best. ;)
|
|
|
|
(
|
|
|
|
@options [ $($options:tt)* ]
|
|
|
|
$field:ident : $value:expr,
|
|
|
|
$($rest:tt)*
|
|
|
|
) => {
|
|
|
|
nu!(@options [ $($options)* $field => $value.into() ; ] $($rest)*)
|
|
|
|
};
|
|
|
|
|
|
|
|
// When the `$field: $value,` pairs are all parsed, the next tokens are the `$path` and any
|
|
|
|
// number of `$part`s, potentially followed by a trailing comma.
|
|
|
|
(
|
|
|
|
@options [ $($options:tt)* ]
|
|
|
|
$path:expr
|
|
|
|
$(, $part:expr)*
|
|
|
|
$(,)*
|
|
|
|
) => {{
|
|
|
|
// Here we parse the options into a `NuOpts` struct
|
|
|
|
let opts = nu!(@nu_opts $($options)*);
|
|
|
|
// and format the `$path` using the `$part`s
|
|
|
|
let path = nu!(@format_path $path, $($part),*);
|
|
|
|
// Then finally we go to the `@main` phase, where the actual work is done.
|
|
|
|
nu!(@main opts, path)
|
|
|
|
}};
|
|
|
|
|
|
|
|
// Create the NuOpts struct from the `field => value ;` pairs
|
|
|
|
(@nu_opts $( $field:ident => $value:expr ; )*) => {
|
2023-09-21 20:11:56 +02:00
|
|
|
$crate::macros::NuOpts{
|
2023-04-10 00:55:29 +02:00
|
|
|
$(
|
|
|
|
$field: Some($value),
|
|
|
|
)*
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
// Helper to format `$path`.
|
|
|
|
(@format_path $path:expr $(,)?) => {
|
|
|
|
// When there are no `$part`s, do not format anything
|
|
|
|
$path
|
|
|
|
};
|
|
|
|
(@format_path $path:expr, $($part:expr),* $(,)?) => {{
|
|
|
|
format!($path, $( $part ),*)
|
|
|
|
}};
|
|
|
|
|
|
|
|
// Do the actual work.
|
|
|
|
(@main $opts:expr, $path:expr) => {{
|
2023-09-21 20:11:56 +02:00
|
|
|
$crate::macros::nu_run_test($opts, $path, false)
|
2023-04-10 00:55:29 +02:00
|
|
|
}};
|
|
|
|
|
|
|
|
// This is the entrypoint for this macro.
|
|
|
|
($($token:tt)*) => {{
|
|
|
|
|
|
|
|
nu!(@options [ ] $($token)*)
|
|
|
|
}};
|
|
|
|
}
|
|
|
|
|
|
|
|
#[macro_export]
|
|
|
|
macro_rules! nu_with_std {
|
|
|
|
// In the `@options` phase, we restucture all the
|
|
|
|
// `$field_1: $value_1, $field_2: $value_2, ...`
|
|
|
|
// pairs to a structure like
|
|
|
|
// `@options[ $field_1 => $value_1 ; $field_2 => $value_2 ; ... ]`.
|
|
|
|
// We do this to later distinguish the options from the `$path` and `$part`s.
|
|
|
|
// (See
|
|
|
|
// https://users.rust-lang.org/t/i-dont-think-this-local-ambiguity-when-calling-macro-is-ambiguous/79401?u=x3ro
|
|
|
|
// )
|
|
|
|
//
|
|
|
|
// If there is any special treatment needed for the `$value`, we can just
|
|
|
|
// match for the specific `field` name.
|
|
|
|
(
|
|
|
|
@options [ $($options:tt)* ]
|
|
|
|
cwd: $value:expr,
|
|
|
|
$($rest:tt)*
|
|
|
|
) => {
|
|
|
|
nu!(@options [ $($options)* cwd => $crate::fs::in_directory($value) ; ] $($rest)*)
|
2022-08-13 04:13:50 +02:00
|
|
|
};
|
|
|
|
// For all other options, we call `.into()` on the `$value` and hope for the best. ;)
|
|
|
|
(
|
|
|
|
@options [ $($options:tt)* ]
|
|
|
|
$field:ident : $value:expr,
|
|
|
|
$($rest:tt)*
|
|
|
|
) => {
|
|
|
|
nu!(@options [ $($options)* $field => $value.into() ; ] $($rest)*)
|
|
|
|
};
|
|
|
|
|
|
|
|
// When the `$field: $value,` pairs are all parsed, the next tokens are the `$path` and any
|
|
|
|
// number of `$part`s, potentially followed by a trailing comma.
|
|
|
|
(
|
|
|
|
@options [ $($options:tt)* ]
|
|
|
|
$path:expr
|
|
|
|
$(, $part:expr)*
|
|
|
|
$(,)*
|
|
|
|
) => {{
|
|
|
|
// Here we parse the options into a `NuOpts` struct
|
|
|
|
let opts = nu!(@nu_opts $($options)*);
|
|
|
|
// and format the `$path` using the `$part`s
|
|
|
|
let path = nu!(@format_path $path, $($part),*);
|
|
|
|
// Then finally we go to the `@main` phase, where the actual work is done.
|
|
|
|
nu!(@main opts, path)
|
2019-12-15 17:15:06 +01:00
|
|
|
}};
|
|
|
|
|
2022-08-13 04:13:50 +02:00
|
|
|
// Create the NuOpts struct from the `field => value ;` pairs
|
|
|
|
(@nu_opts $( $field:ident => $value:expr ; )*) => {
|
2023-09-21 20:11:56 +02:00
|
|
|
$crate::macros::NuOpts{
|
2022-08-13 04:13:50 +02:00
|
|
|
$(
|
|
|
|
$field: Some($value),
|
|
|
|
)*
|
|
|
|
..Default::default()
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
// Helper to format `$path`.
|
|
|
|
(@format_path $path:expr $(,)?) => {
|
|
|
|
// When there are no `$part`s, do not format anything
|
|
|
|
$path
|
|
|
|
};
|
|
|
|
(@format_path $path:expr, $($part:expr),* $(,)?) => {{
|
|
|
|
format!($path, $( $part ),*)
|
2019-12-15 17:15:06 +01:00
|
|
|
}};
|
|
|
|
|
2022-08-13 04:13:50 +02:00
|
|
|
// Do the actual work.
|
|
|
|
(@main $opts:expr, $path:expr) => {{
|
2023-09-21 20:11:56 +02:00
|
|
|
$crate::macros::nu_run_test($opts, $path, true)
|
2020-09-14 16:07:02 +02:00
|
|
|
}};
|
2022-08-13 04:13:50 +02:00
|
|
|
|
|
|
|
// This is the entrypoint for this macro.
|
|
|
|
($($token:tt)*) => {{
|
|
|
|
nu!(@options [ ] $($token)*)
|
|
|
|
}};
|
2020-09-14 16:07:02 +02:00
|
|
|
}
|
|
|
|
|
2022-07-22 06:14:37 +02:00
|
|
|
#[macro_export]
|
|
|
|
macro_rules! nu_with_plugins {
|
2024-04-21 14:36:26 +02:00
|
|
|
(cwd: $cwd:expr, plugins: [$(($plugin_name:expr)),*$(,)?], $command:expr) => {{
|
Local socket mode and foreground terminal control for plugins (#12448)
# Description
Adds support for running plugins using local socket communication
instead of stdio. This will be an optional thing that not all plugins
have to support.
This frees up stdio for use to make plugins that use stdio to create
terminal UIs, cc @amtoine, @fdncred.
This uses the [`interprocess`](https://crates.io/crates/interprocess)
crate (298 stars, MIT license, actively maintained), which seems to be
the best option for cross-platform local socket support in Rust. On
Windows, a local socket name is provided. On Unixes, it's a path. The
socket name is kept to a relatively small size because some operating
systems have pretty strict limits on the whole path (~100 chars), so on
macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash
includes the plugin filename and timestamp to be unique enough.
This also adds an API for moving plugins in and out of the foreground
group, which is relevant for Unixes where direct terminal control
depends on that.
TODO:
- [x] Generate local socket path according to OS conventions
- [x] Add support for passing `--local-socket` to the plugin executable
instead of `--stdio`, and communicating over that instead
- [x] Test plugins that were broken, including
[amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore)
- [x] Automatically upgrade to using local sockets when supported,
falling back if it doesn't work, transparently to the user without any
visible error messages
- Added protocol feature: `LocalSocket`
- [x] Reset preferred mode to `None` on `register`
- [x] Allow plugins to detect whether they're running on a local socket
and can use stdio freely, so that TUI plugins can just produce an error
message otherwise
- Implemented via `EngineInterface::is_using_stdio()`
- [x] Clean up foreground state when plugin command exits on the engine
side too, not just whole plugin
- [x] Make sure tests for failure cases work as intended
- `nu_plugin_stress_internals` added
# User-Facing Changes
- TUI plugins work
- Non-Rust plugins could optionally choose to use this
- This might behave differently, so will need to test it carefully
across different operating systems
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
- [ ] Document local socket option in plugin contrib docs
- [ ] Document how to do a terminal UI plugin in plugin contrib docs
- [ ] Document: `EnterForeground` engine call
- [ ] Document: `LeaveForeground` engine call
- [ ] Document: `LocalSocket` protocol feature
2024-04-15 20:28:18 +02:00
|
|
|
nu_with_plugins!(
|
|
|
|
cwd: $cwd,
|
|
|
|
envs: Vec::<(&str, &str)>::new(),
|
2024-04-21 14:36:26 +02:00
|
|
|
plugins: [$(($plugin_name)),*],
|
Local socket mode and foreground terminal control for plugins (#12448)
# Description
Adds support for running plugins using local socket communication
instead of stdio. This will be an optional thing that not all plugins
have to support.
This frees up stdio for use to make plugins that use stdio to create
terminal UIs, cc @amtoine, @fdncred.
This uses the [`interprocess`](https://crates.io/crates/interprocess)
crate (298 stars, MIT license, actively maintained), which seems to be
the best option for cross-platform local socket support in Rust. On
Windows, a local socket name is provided. On Unixes, it's a path. The
socket name is kept to a relatively small size because some operating
systems have pretty strict limits on the whole path (~100 chars), so on
macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash
includes the plugin filename and timestamp to be unique enough.
This also adds an API for moving plugins in and out of the foreground
group, which is relevant for Unixes where direct terminal control
depends on that.
TODO:
- [x] Generate local socket path according to OS conventions
- [x] Add support for passing `--local-socket` to the plugin executable
instead of `--stdio`, and communicating over that instead
- [x] Test plugins that were broken, including
[amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore)
- [x] Automatically upgrade to using local sockets when supported,
falling back if it doesn't work, transparently to the user without any
visible error messages
- Added protocol feature: `LocalSocket`
- [x] Reset preferred mode to `None` on `register`
- [x] Allow plugins to detect whether they're running on a local socket
and can use stdio freely, so that TUI plugins can just produce an error
message otherwise
- Implemented via `EngineInterface::is_using_stdio()`
- [x] Clean up foreground state when plugin command exits on the engine
side too, not just whole plugin
- [x] Make sure tests for failure cases work as intended
- `nu_plugin_stress_internals` added
# User-Facing Changes
- TUI plugins work
- Non-Rust plugins could optionally choose to use this
- This might behave differently, so will need to test it carefully
across different operating systems
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
- [ ] Document local socket option in plugin contrib docs
- [ ] Document how to do a terminal UI plugin in plugin contrib docs
- [ ] Document: `EnterForeground` engine call
- [ ] Document: `LeaveForeground` engine call
- [ ] Document: `LocalSocket` protocol feature
2024-04-15 20:28:18 +02:00
|
|
|
$command
|
|
|
|
)
|
2022-07-22 06:14:37 +02:00
|
|
|
}};
|
2022-09-07 16:07:42 +02:00
|
|
|
(cwd: $cwd:expr, plugin: ($plugin_name:expr), $command:expr) => {{
|
Local socket mode and foreground terminal control for plugins (#12448)
# Description
Adds support for running plugins using local socket communication
instead of stdio. This will be an optional thing that not all plugins
have to support.
This frees up stdio for use to make plugins that use stdio to create
terminal UIs, cc @amtoine, @fdncred.
This uses the [`interprocess`](https://crates.io/crates/interprocess)
crate (298 stars, MIT license, actively maintained), which seems to be
the best option for cross-platform local socket support in Rust. On
Windows, a local socket name is provided. On Unixes, it's a path. The
socket name is kept to a relatively small size because some operating
systems have pretty strict limits on the whole path (~100 chars), so on
macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash
includes the plugin filename and timestamp to be unique enough.
This also adds an API for moving plugins in and out of the foreground
group, which is relevant for Unixes where direct terminal control
depends on that.
TODO:
- [x] Generate local socket path according to OS conventions
- [x] Add support for passing `--local-socket` to the plugin executable
instead of `--stdio`, and communicating over that instead
- [x] Test plugins that were broken, including
[amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore)
- [x] Automatically upgrade to using local sockets when supported,
falling back if it doesn't work, transparently to the user without any
visible error messages
- Added protocol feature: `LocalSocket`
- [x] Reset preferred mode to `None` on `register`
- [x] Allow plugins to detect whether they're running on a local socket
and can use stdio freely, so that TUI plugins can just produce an error
message otherwise
- Implemented via `EngineInterface::is_using_stdio()`
- [x] Clean up foreground state when plugin command exits on the engine
side too, not just whole plugin
- [x] Make sure tests for failure cases work as intended
- `nu_plugin_stress_internals` added
# User-Facing Changes
- TUI plugins work
- Non-Rust plugins could optionally choose to use this
- This might behave differently, so will need to test it carefully
across different operating systems
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
- [ ] Document local socket option in plugin contrib docs
- [ ] Document how to do a terminal UI plugin in plugin contrib docs
- [ ] Document: `EnterForeground` engine call
- [ ] Document: `LeaveForeground` engine call
- [ ] Document: `LocalSocket` protocol feature
2024-04-15 20:28:18 +02:00
|
|
|
nu_with_plugins!(
|
|
|
|
cwd: $cwd,
|
|
|
|
envs: Vec::<(&str, &str)>::new(),
|
|
|
|
plugin: ($plugin_name),
|
|
|
|
$command
|
|
|
|
)
|
|
|
|
}};
|
|
|
|
|
|
|
|
(
|
|
|
|
cwd: $cwd:expr,
|
|
|
|
envs: $envs:expr,
|
2024-04-21 14:36:26 +02:00
|
|
|
plugins: [$(($plugin_name:expr)),*$(,)?],
|
Local socket mode and foreground terminal control for plugins (#12448)
# Description
Adds support for running plugins using local socket communication
instead of stdio. This will be an optional thing that not all plugins
have to support.
This frees up stdio for use to make plugins that use stdio to create
terminal UIs, cc @amtoine, @fdncred.
This uses the [`interprocess`](https://crates.io/crates/interprocess)
crate (298 stars, MIT license, actively maintained), which seems to be
the best option for cross-platform local socket support in Rust. On
Windows, a local socket name is provided. On Unixes, it's a path. The
socket name is kept to a relatively small size because some operating
systems have pretty strict limits on the whole path (~100 chars), so on
macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash
includes the plugin filename and timestamp to be unique enough.
This also adds an API for moving plugins in and out of the foreground
group, which is relevant for Unixes where direct terminal control
depends on that.
TODO:
- [x] Generate local socket path according to OS conventions
- [x] Add support for passing `--local-socket` to the plugin executable
instead of `--stdio`, and communicating over that instead
- [x] Test plugins that were broken, including
[amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore)
- [x] Automatically upgrade to using local sockets when supported,
falling back if it doesn't work, transparently to the user without any
visible error messages
- Added protocol feature: `LocalSocket`
- [x] Reset preferred mode to `None` on `register`
- [x] Allow plugins to detect whether they're running on a local socket
and can use stdio freely, so that TUI plugins can just produce an error
message otherwise
- Implemented via `EngineInterface::is_using_stdio()`
- [x] Clean up foreground state when plugin command exits on the engine
side too, not just whole plugin
- [x] Make sure tests for failure cases work as intended
- `nu_plugin_stress_internals` added
# User-Facing Changes
- TUI plugins work
- Non-Rust plugins could optionally choose to use this
- This might behave differently, so will need to test it carefully
across different operating systems
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
- [ ] Document local socket option in plugin contrib docs
- [ ] Document how to do a terminal UI plugin in plugin contrib docs
- [ ] Document: `EnterForeground` engine call
- [ ] Document: `LeaveForeground` engine call
- [ ] Document: `LocalSocket` protocol feature
2024-04-15 20:28:18 +02:00
|
|
|
$command:expr
|
|
|
|
) => {{
|
2024-04-21 14:36:26 +02:00
|
|
|
$crate::macros::nu_with_plugin_run_test($cwd, $envs, &[$($plugin_name),*], $command)
|
Local socket mode and foreground terminal control for plugins (#12448)
# Description
Adds support for running plugins using local socket communication
instead of stdio. This will be an optional thing that not all plugins
have to support.
This frees up stdio for use to make plugins that use stdio to create
terminal UIs, cc @amtoine, @fdncred.
This uses the [`interprocess`](https://crates.io/crates/interprocess)
crate (298 stars, MIT license, actively maintained), which seems to be
the best option for cross-platform local socket support in Rust. On
Windows, a local socket name is provided. On Unixes, it's a path. The
socket name is kept to a relatively small size because some operating
systems have pretty strict limits on the whole path (~100 chars), so on
macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash
includes the plugin filename and timestamp to be unique enough.
This also adds an API for moving plugins in and out of the foreground
group, which is relevant for Unixes where direct terminal control
depends on that.
TODO:
- [x] Generate local socket path according to OS conventions
- [x] Add support for passing `--local-socket` to the plugin executable
instead of `--stdio`, and communicating over that instead
- [x] Test plugins that were broken, including
[amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore)
- [x] Automatically upgrade to using local sockets when supported,
falling back if it doesn't work, transparently to the user without any
visible error messages
- Added protocol feature: `LocalSocket`
- [x] Reset preferred mode to `None` on `register`
- [x] Allow plugins to detect whether they're running on a local socket
and can use stdio freely, so that TUI plugins can just produce an error
message otherwise
- Implemented via `EngineInterface::is_using_stdio()`
- [x] Clean up foreground state when plugin command exits on the engine
side too, not just whole plugin
- [x] Make sure tests for failure cases work as intended
- `nu_plugin_stress_internals` added
# User-Facing Changes
- TUI plugins work
- Non-Rust plugins could optionally choose to use this
- This might behave differently, so will need to test it carefully
across different operating systems
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
- [ ] Document local socket option in plugin contrib docs
- [ ] Document how to do a terminal UI plugin in plugin contrib docs
- [ ] Document: `EnterForeground` engine call
- [ ] Document: `LeaveForeground` engine call
- [ ] Document: `LocalSocket` protocol feature
2024-04-15 20:28:18 +02:00
|
|
|
}};
|
|
|
|
(cwd: $cwd:expr, envs: $envs:expr, plugin: ($plugin_name:expr), $command:expr) => {{
|
|
|
|
$crate::macros::nu_with_plugin_run_test($cwd, $envs, &[$plugin_name], $command)
|
2020-09-14 16:07:02 +02:00
|
|
|
}};
|
|
|
|
|
2023-09-21 20:11:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
use crate::{Outcome, NATIVE_PATH_ENV_VAR};
|
Local socket mode and foreground terminal control for plugins (#12448)
# Description
Adds support for running plugins using local socket communication
instead of stdio. This will be an optional thing that not all plugins
have to support.
This frees up stdio for use to make plugins that use stdio to create
terminal UIs, cc @amtoine, @fdncred.
This uses the [`interprocess`](https://crates.io/crates/interprocess)
crate (298 stars, MIT license, actively maintained), which seems to be
the best option for cross-platform local socket support in Rust. On
Windows, a local socket name is provided. On Unixes, it's a path. The
socket name is kept to a relatively small size because some operating
systems have pretty strict limits on the whole path (~100 chars), so on
macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash
includes the plugin filename and timestamp to be unique enough.
This also adds an API for moving plugins in and out of the foreground
group, which is relevant for Unixes where direct terminal control
depends on that.
TODO:
- [x] Generate local socket path according to OS conventions
- [x] Add support for passing `--local-socket` to the plugin executable
instead of `--stdio`, and communicating over that instead
- [x] Test plugins that were broken, including
[amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore)
- [x] Automatically upgrade to using local sockets when supported,
falling back if it doesn't work, transparently to the user without any
visible error messages
- Added protocol feature: `LocalSocket`
- [x] Reset preferred mode to `None` on `register`
- [x] Allow plugins to detect whether they're running on a local socket
and can use stdio freely, so that TUI plugins can just produce an error
message otherwise
- Implemented via `EngineInterface::is_using_stdio()`
- [x] Clean up foreground state when plugin command exits on the engine
side too, not just whole plugin
- [x] Make sure tests for failure cases work as intended
- `nu_plugin_stress_internals` added
# User-Facing Changes
- TUI plugins work
- Non-Rust plugins could optionally choose to use this
- This might behave differently, so will need to test it carefully
across different operating systems
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
- [ ] Document local socket option in plugin contrib docs
- [ ] Document how to do a terminal UI plugin in plugin contrib docs
- [ ] Document: `EnterForeground` engine call
- [ ] Document: `LeaveForeground` engine call
- [ ] Document: `LocalSocket` protocol feature
2024-04-15 20:28:18 +02:00
|
|
|
use std::ffi::OsStr;
|
2023-09-21 20:11:56 +02:00
|
|
|
use std::{
|
|
|
|
path::Path,
|
|
|
|
process::{Command, Stdio},
|
|
|
|
};
|
|
|
|
use tempfile::tempdir;
|
|
|
|
|
|
|
|
#[derive(Default)]
|
|
|
|
pub struct NuOpts {
|
|
|
|
pub cwd: Option<String>,
|
|
|
|
pub locale: Option<String>,
|
2024-04-26 13:23:16 +02:00
|
|
|
pub collapse_output: Option<bool>,
|
2023-09-21 20:11:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn nu_run_test(opts: NuOpts, commands: impl AsRef<str>, with_std: bool) -> Outcome {
|
|
|
|
let test_bins = crate::fs::binaries();
|
|
|
|
|
|
|
|
let cwd = std::env::current_dir().expect("Could not get current working directory.");
|
|
|
|
let test_bins = nu_path::canonicalize_with(&test_bins, cwd).unwrap_or_else(|e| {
|
|
|
|
panic!(
|
|
|
|
"Couldn't canonicalize dummy binaries path {}: {:?}",
|
|
|
|
test_bins.display(),
|
|
|
|
e
|
|
|
|
)
|
|
|
|
});
|
|
|
|
|
|
|
|
let mut paths = crate::shell_os_paths();
|
|
|
|
paths.insert(0, test_bins);
|
|
|
|
|
|
|
|
let commands = commands.as_ref().lines().collect::<Vec<_>>().join("; ");
|
|
|
|
|
|
|
|
let paths_joined = match std::env::join_paths(paths) {
|
|
|
|
Ok(all) => all,
|
|
|
|
Err(_) => panic!("Couldn't join paths for PATH var."),
|
|
|
|
};
|
|
|
|
|
|
|
|
let target_cwd = opts.cwd.unwrap_or(".".to_string());
|
|
|
|
let locale = opts.locale.unwrap_or("en_US.UTF-8".to_string());
|
|
|
|
let executable_path = crate::fs::executable_path();
|
|
|
|
|
|
|
|
let mut command = setup_command(&executable_path, &target_cwd);
|
|
|
|
command
|
|
|
|
.env(nu_utils::locale::LOCALE_OVERRIDE_ENV_VAR, locale)
|
|
|
|
.env(NATIVE_PATH_ENV_VAR, paths_joined);
|
2024-04-10 00:27:46 +02:00
|
|
|
// Ensure that the user's config doesn't interfere with the tests
|
|
|
|
command.arg("--no-config-file");
|
2023-09-21 20:11:56 +02:00
|
|
|
if !with_std {
|
|
|
|
command.arg("--no-std-lib");
|
|
|
|
}
|
2024-06-19 06:37:24 +02:00
|
|
|
// Use plain errors to help make error text matching more consistent
|
|
|
|
command.args(["--error-style", "plain"]);
|
2023-09-21 20:11:56 +02:00
|
|
|
command
|
2024-05-04 02:53:15 +02:00
|
|
|
.arg(format!("-c {}", escape_quote_string(&commands)))
|
2023-09-21 20:11:56 +02:00
|
|
|
.stdout(Stdio::piped())
|
|
|
|
.stderr(Stdio::piped());
|
|
|
|
|
2024-04-10 00:27:46 +02:00
|
|
|
// Uncomment to debug the command being run:
|
|
|
|
// println!("=== command\n{command:?}\n");
|
|
|
|
|
2023-09-21 20:11:56 +02:00
|
|
|
let process = match command.spawn() {
|
|
|
|
Ok(child) => child,
|
|
|
|
Err(why) => panic!("Can't run test {:?} {}", crate::fs::executable_path(), why),
|
|
|
|
};
|
|
|
|
|
|
|
|
let output = process
|
|
|
|
.wait_with_output()
|
|
|
|
.expect("couldn't read from stdout/stderr");
|
|
|
|
|
2024-04-26 13:23:16 +02:00
|
|
|
let out = String::from_utf8_lossy(&output.stdout);
|
2023-09-21 20:11:56 +02:00
|
|
|
let err = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
2024-04-26 13:23:16 +02:00
|
|
|
let out = if opts.collapse_output.unwrap_or(true) {
|
|
|
|
collapse_output(&out)
|
|
|
|
} else {
|
|
|
|
out.into_owned()
|
|
|
|
};
|
|
|
|
|
2023-09-21 20:11:56 +02:00
|
|
|
println!("=== stderr\n{}", err);
|
|
|
|
|
2023-11-15 23:50:43 +01:00
|
|
|
Outcome::new(out, err.into_owned(), output.status)
|
2023-09-21 20:11:56 +02:00
|
|
|
}
|
|
|
|
|
Local socket mode and foreground terminal control for plugins (#12448)
# Description
Adds support for running plugins using local socket communication
instead of stdio. This will be an optional thing that not all plugins
have to support.
This frees up stdio for use to make plugins that use stdio to create
terminal UIs, cc @amtoine, @fdncred.
This uses the [`interprocess`](https://crates.io/crates/interprocess)
crate (298 stars, MIT license, actively maintained), which seems to be
the best option for cross-platform local socket support in Rust. On
Windows, a local socket name is provided. On Unixes, it's a path. The
socket name is kept to a relatively small size because some operating
systems have pretty strict limits on the whole path (~100 chars), so on
macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash
includes the plugin filename and timestamp to be unique enough.
This also adds an API for moving plugins in and out of the foreground
group, which is relevant for Unixes where direct terminal control
depends on that.
TODO:
- [x] Generate local socket path according to OS conventions
- [x] Add support for passing `--local-socket` to the plugin executable
instead of `--stdio`, and communicating over that instead
- [x] Test plugins that were broken, including
[amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore)
- [x] Automatically upgrade to using local sockets when supported,
falling back if it doesn't work, transparently to the user without any
visible error messages
- Added protocol feature: `LocalSocket`
- [x] Reset preferred mode to `None` on `register`
- [x] Allow plugins to detect whether they're running on a local socket
and can use stdio freely, so that TUI plugins can just produce an error
message otherwise
- Implemented via `EngineInterface::is_using_stdio()`
- [x] Clean up foreground state when plugin command exits on the engine
side too, not just whole plugin
- [x] Make sure tests for failure cases work as intended
- `nu_plugin_stress_internals` added
# User-Facing Changes
- TUI plugins work
- Non-Rust plugins could optionally choose to use this
- This might behave differently, so will need to test it carefully
across different operating systems
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
- [ ] Document local socket option in plugin contrib docs
- [ ] Document how to do a terminal UI plugin in plugin contrib docs
- [ ] Document: `EnterForeground` engine call
- [ ] Document: `LeaveForeground` engine call
- [ ] Document: `LocalSocket` protocol feature
2024-04-15 20:28:18 +02:00
|
|
|
pub fn nu_with_plugin_run_test<E, K, V>(
|
|
|
|
cwd: impl AsRef<Path>,
|
|
|
|
envs: E,
|
|
|
|
plugins: &[&str],
|
|
|
|
command: &str,
|
|
|
|
) -> Outcome
|
|
|
|
where
|
|
|
|
E: IntoIterator<Item = (K, V)>,
|
|
|
|
K: AsRef<OsStr>,
|
|
|
|
V: AsRef<OsStr>,
|
|
|
|
{
|
2023-09-21 20:11:56 +02:00
|
|
|
let test_bins = crate::fs::binaries();
|
|
|
|
let test_bins = nu_path::canonicalize_with(&test_bins, ".").unwrap_or_else(|e| {
|
|
|
|
panic!(
|
|
|
|
"Couldn't canonicalize dummy binaries path {}: {:?}",
|
|
|
|
test_bins.display(),
|
|
|
|
e
|
|
|
|
)
|
|
|
|
});
|
|
|
|
|
|
|
|
let temp = tempdir().expect("couldn't create a temporary directory");
|
2024-04-21 14:36:26 +02:00
|
|
|
let [temp_config_file, temp_env_config_file] = ["config.nu", "env.nu"].map(|name| {
|
|
|
|
let temp_file = temp.path().join(name);
|
|
|
|
std::fs::File::create(&temp_file).expect("couldn't create temporary config file");
|
|
|
|
temp_file
|
|
|
|
});
|
|
|
|
|
2024-04-25 00:40:39 +02:00
|
|
|
// We don't have to write the plugin registry file, it's ok for it to not exist
|
2024-04-21 14:36:26 +02:00
|
|
|
let temp_plugin_file = temp.path().join("plugin.msgpackz");
|
2023-09-21 20:11:56 +02:00
|
|
|
|
|
|
|
crate::commands::ensure_plugins_built();
|
|
|
|
|
2024-04-23 13:37:50 +02:00
|
|
|
let plugin_paths_quoted: Vec<String> = plugins
|
2023-09-21 20:11:56 +02:00
|
|
|
.iter()
|
2024-04-23 13:37:50 +02:00
|
|
|
.map(|plugin_name| {
|
2023-09-21 20:11:56 +02:00
|
|
|
let plugin = with_exe(plugin_name);
|
|
|
|
let plugin_path = nu_path::canonicalize_with(&plugin, &test_bins)
|
|
|
|
.unwrap_or_else(|_| panic!("failed to canonicalize plugin {} path", &plugin));
|
|
|
|
let plugin_path = plugin_path.to_string_lossy();
|
2024-05-04 02:53:15 +02:00
|
|
|
escape_quote_string(&plugin_path)
|
2024-04-23 13:37:50 +02:00
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
let plugins_arg = format!("[{}]", plugin_paths_quoted.join(","));
|
2023-09-21 20:11:56 +02:00
|
|
|
|
|
|
|
let target_cwd = crate::fs::in_directory(&cwd);
|
|
|
|
// In plugin testing, we need to use installed nushell to drive
|
|
|
|
// plugin commands.
|
|
|
|
let mut executable_path = crate::fs::executable_path();
|
|
|
|
if !executable_path.exists() {
|
|
|
|
executable_path = crate::fs::installed_nu_path();
|
|
|
|
}
|
|
|
|
let process = match setup_command(&executable_path, &target_cwd)
|
Local socket mode and foreground terminal control for plugins (#12448)
# Description
Adds support for running plugins using local socket communication
instead of stdio. This will be an optional thing that not all plugins
have to support.
This frees up stdio for use to make plugins that use stdio to create
terminal UIs, cc @amtoine, @fdncred.
This uses the [`interprocess`](https://crates.io/crates/interprocess)
crate (298 stars, MIT license, actively maintained), which seems to be
the best option for cross-platform local socket support in Rust. On
Windows, a local socket name is provided. On Unixes, it's a path. The
socket name is kept to a relatively small size because some operating
systems have pretty strict limits on the whole path (~100 chars), so on
macOS for example we prefer `/tmp/nu.{pid}.{hash64}.sock` where the hash
includes the plugin filename and timestamp to be unique enough.
This also adds an API for moving plugins in and out of the foreground
group, which is relevant for Unixes where direct terminal control
depends on that.
TODO:
- [x] Generate local socket path according to OS conventions
- [x] Add support for passing `--local-socket` to the plugin executable
instead of `--stdio`, and communicating over that instead
- [x] Test plugins that were broken, including
[amtoine/nu_plugin_explore](https://github.com/amtoine/nu_plugin_explore)
- [x] Automatically upgrade to using local sockets when supported,
falling back if it doesn't work, transparently to the user without any
visible error messages
- Added protocol feature: `LocalSocket`
- [x] Reset preferred mode to `None` on `register`
- [x] Allow plugins to detect whether they're running on a local socket
and can use stdio freely, so that TUI plugins can just produce an error
message otherwise
- Implemented via `EngineInterface::is_using_stdio()`
- [x] Clean up foreground state when plugin command exits on the engine
side too, not just whole plugin
- [x] Make sure tests for failure cases work as intended
- `nu_plugin_stress_internals` added
# User-Facing Changes
- TUI plugins work
- Non-Rust plugins could optionally choose to use this
- This might behave differently, so will need to test it carefully
across different operating systems
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
# After Submitting
- [ ] Document local socket option in plugin contrib docs
- [ ] Document how to do a terminal UI plugin in plugin contrib docs
- [ ] Document: `EnterForeground` engine call
- [ ] Document: `LeaveForeground` engine call
- [ ] Document: `LocalSocket` protocol feature
2024-04-15 20:28:18 +02:00
|
|
|
.envs(envs)
|
2023-09-21 20:11:56 +02:00
|
|
|
.arg("--commands")
|
2024-04-23 13:37:50 +02:00
|
|
|
.arg(command)
|
2024-06-19 06:37:24 +02:00
|
|
|
// Use plain errors to help make error text matching more consistent
|
|
|
|
.args(["--error-style", "plain"])
|
2024-04-10 00:27:46 +02:00
|
|
|
.arg("--config")
|
|
|
|
.arg(temp_config_file)
|
|
|
|
.arg("--env-config")
|
|
|
|
.arg(temp_env_config_file)
|
2023-09-21 20:11:56 +02:00
|
|
|
.arg("--plugin-config")
|
|
|
|
.arg(temp_plugin_file)
|
2024-04-23 13:37:50 +02:00
|
|
|
.arg("--plugins")
|
|
|
|
.arg(plugins_arg)
|
2023-09-21 20:11:56 +02:00
|
|
|
.stdout(Stdio::piped())
|
|
|
|
.stderr(Stdio::piped())
|
|
|
|
.spawn()
|
|
|
|
{
|
|
|
|
Ok(child) => child,
|
|
|
|
Err(why) => panic!("Can't run test {}", why),
|
|
|
|
};
|
|
|
|
|
|
|
|
let output = process
|
|
|
|
.wait_with_output()
|
|
|
|
.expect("couldn't read from stdout/stderr");
|
|
|
|
|
2024-04-26 13:23:16 +02:00
|
|
|
let out = collapse_output(&String::from_utf8_lossy(&output.stdout));
|
2023-09-21 20:11:56 +02:00
|
|
|
let err = String::from_utf8_lossy(&output.stderr);
|
|
|
|
|
|
|
|
println!("=== stderr\n{}", err);
|
|
|
|
|
2023-11-15 23:50:43 +01:00
|
|
|
Outcome::new(out, err.into_owned(), output.status)
|
2023-09-21 20:11:56 +02:00
|
|
|
}
|
|
|
|
|
2024-05-04 02:53:15 +02:00
|
|
|
fn escape_quote_string(input: &str) -> String {
|
2023-09-21 20:11:56 +02:00
|
|
|
let mut output = String::with_capacity(input.len() + 2);
|
|
|
|
output.push('"');
|
|
|
|
|
|
|
|
for c in input.chars() {
|
|
|
|
if c == '"' || c == '\\' {
|
|
|
|
output.push('\\');
|
2023-02-13 13:42:08 +01:00
|
|
|
}
|
2023-09-21 20:11:56 +02:00
|
|
|
output.push(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
output.push('"');
|
|
|
|
output
|
2019-12-15 17:15:06 +01:00
|
|
|
}
|
|
|
|
|
2023-09-21 20:11:56 +02:00
|
|
|
fn with_exe(name: &str) -> String {
|
|
|
|
#[cfg(windows)]
|
|
|
|
{
|
|
|
|
name.to_string() + ".exe"
|
|
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
{
|
|
|
|
name.to_string()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-04-26 13:23:16 +02:00
|
|
|
fn collapse_output(out: &str) -> String {
|
2021-03-27 06:08:03 +01:00
|
|
|
let out = out.lines().collect::<Vec<_>>().join("\n");
|
Restructure and streamline token expansion (#1123)
Restructure and streamline token expansion
The purpose of this commit is to streamline the token expansion code, by
removing aspects of the code that are no longer relevant, removing
pointless duplication, and eliminating the need to pass the same
arguments to `expand_syntax`.
The first big-picture change in this commit is that instead of a handful
of `expand_` functions, which take a TokensIterator and ExpandContext, a
smaller number of methods on the `TokensIterator` do the same job.
The second big-picture change in this commit is fully eliminating the
coloring traits, making coloring a responsibility of the base expansion
implementations. This also means that the coloring tracer is merged into
the expansion tracer, so you can follow a single expansion and see how
the expansion process produced colored tokens.
One side effect of this change is that the expander itself is marginally
more error-correcting. The error correction works by switching from
structured expansion to `BackoffColoringMode` when an unexpected token
is found, which guarantees that all spans of the source are colored, but
may not be the most optimal error recovery strategy.
That said, because `BackoffColoringMode` only extends as far as a
closing delimiter (`)`, `]`, `}`) or pipe (`|`), it does result in
fairly granular correction strategy.
The current code still produces an `Err` (plus a complete list of
colored shapes) from the parsing process if any errors are encountered,
but this could easily be addressed now that the underlying expansion is
error-correcting.
This commit also colors any spans that are syntax errors in red, and
causes the parser to include some additional information about what
tokens were expected at any given point where an error was encountered,
so that completions and hinting could be more robust in the future.
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
Co-authored-by: Andrés N. Robalino <andres@androbtech.com>
2020-01-21 23:45:03 +01:00
|
|
|
let out = out.replace("\r\n", "");
|
2022-02-24 20:02:28 +01:00
|
|
|
out.replace('\n', "")
|
Restructure and streamline token expansion (#1123)
Restructure and streamline token expansion
The purpose of this commit is to streamline the token expansion code, by
removing aspects of the code that are no longer relevant, removing
pointless duplication, and eliminating the need to pass the same
arguments to `expand_syntax`.
The first big-picture change in this commit is that instead of a handful
of `expand_` functions, which take a TokensIterator and ExpandContext, a
smaller number of methods on the `TokensIterator` do the same job.
The second big-picture change in this commit is fully eliminating the
coloring traits, making coloring a responsibility of the base expansion
implementations. This also means that the coloring tracer is merged into
the expansion tracer, so you can follow a single expansion and see how
the expansion process produced colored tokens.
One side effect of this change is that the expander itself is marginally
more error-correcting. The error correction works by switching from
structured expansion to `BackoffColoringMode` when an unexpected token
is found, which guarantees that all spans of the source are colored, but
may not be the most optimal error recovery strategy.
That said, because `BackoffColoringMode` only extends as far as a
closing delimiter (`)`, `]`, `}`) or pipe (`|`), it does result in
fairly granular correction strategy.
The current code still produces an `Err` (plus a complete list of
colored shapes) from the parsing process if any errors are encountered,
but this could easily be addressed now that the underlying expansion is
error-correcting.
This commit also colors any spans that are syntax errors in red, and
causes the parser to include some additional information about what
tokens were expected at any given point where an error was encountered,
so that completions and hinting could be more robust in the future.
Co-authored-by: Jonathan Turner <jonathandturner@users.noreply.github.com>
Co-authored-by: Andrés N. Robalino <andres@androbtech.com>
2020-01-21 23:45:03 +01:00
|
|
|
}
|
2023-08-14 12:49:55 +02:00
|
|
|
|
2023-09-21 20:11:56 +02:00
|
|
|
fn setup_command(executable_path: &Path, target_cwd: &str) -> Command {
|
2023-08-14 12:49:55 +02:00
|
|
|
let mut command = Command::new(executable_path);
|
|
|
|
|
|
|
|
command
|
|
|
|
.current_dir(target_cwd)
|
|
|
|
.env_remove("FILE_PWD")
|
|
|
|
.env("PWD", target_cwd); // setting PWD is enough to set cwd;
|
|
|
|
|
|
|
|
command
|
|
|
|
}
|