mirror of
https://github.com/nushell/nushell.git
synced 2025-04-10 22:18:17 +02:00
* Add decimals to int when using `into string --decimals` * Add tests for `into string` when converting int with `--decimals` * Apply formatting * Merge `into_str` test files * Comment out unused code and add TODOs * Use decimal separator depending on system locale * Add test helper to run closure in different locale * Add tests for int-to-string conversion using different locales * Add utils function to get system locale * Add panic message when locking mutex fails * Catch and resume panic later to prevent Mutex poisoning when test fails * Move test to `nu-test-support` to keep `nu-utils` free of `nu-*` dependencies See https://github.com/nushell/nushell/pull/6085#issuecomment-1193131694 * Rename test support fn `with_fake_locale` to `with_locale_override` * Move `get_system_locale()` to `locale` module * Allow overriding locale with special env variable (when not in release) * Use special env var to override locale during testing * Allow callback to return a value in `with_locale_override()` * Allow multiple options in `nu!` macro * Allow to set locale as `nu!` macro option * Use new `locale` option of `nu!` macro instead of `with_locale_override` Using the `locale` options does not lock the `LOCALE_OVERRIDE_MUTEX` mutex in `nu-test-support::locale_override` but instead calls the `nu` command directly with the `NU_LOCALE_OVERRIDE` environment variable. This allows for parallel test excecution. * Fix: Add option identifier for `cwd` in usage of `nu!` macro * Rely on `Display` trait for formatting `nu!` macro command - Removed the `DisplayPath` trait - Implement `Display` for `AbsolutePath`, `RelativePath` and `AbsoluteFile` * Default to locale `en_US.UTF-8` for tests when using `nu!` macro * Add doc comment to `nu!` macro * Format code using `cargo fmt --all` * Pass function directly instead of wrapping the call in a closure https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure * Pass function to `or_else()` instead of calling it inside `or()` https://rust-lang.github.io/rust-clippy/master/index.html#or_fun_call * Fix: Add option identifier for `cwd` in usage of `nu!` macro
91 lines
1.9 KiB
Rust
91 lines
1.9 KiB
Rust
pub mod commands;
|
|
pub mod fs;
|
|
pub mod locale_override;
|
|
pub mod macros;
|
|
pub mod playground;
|
|
|
|
pub struct Outcome {
|
|
pub out: String,
|
|
pub err: String,
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
pub const NATIVE_PATH_ENV_VAR: &str = "Path";
|
|
#[cfg(not(windows))]
|
|
pub const NATIVE_PATH_ENV_VAR: &str = "PATH";
|
|
|
|
#[cfg(windows)]
|
|
pub const NATIVE_PATH_ENV_SEPARATOR: char = ';';
|
|
#[cfg(not(windows))]
|
|
pub const NATIVE_PATH_ENV_SEPARATOR: char = ':';
|
|
|
|
impl Outcome {
|
|
pub fn new(out: String, err: String) -> Outcome {
|
|
Outcome { out, err }
|
|
}
|
|
}
|
|
|
|
pub fn pipeline(commands: &str) -> String {
|
|
commands
|
|
.trim()
|
|
.lines()
|
|
.map(|line| line.trim())
|
|
.collect::<Vec<&str>>()
|
|
.join(" ")
|
|
.trim_end()
|
|
.to_string()
|
|
}
|
|
|
|
pub fn nu_repl_code(source_lines: &[&str]) -> String {
|
|
let mut out = String::from("nu --testbin=nu_repl [ ");
|
|
|
|
for line in source_lines.iter() {
|
|
// convert each "line" to really be a single line to prevent nu! macro joining the newlines
|
|
// with ';'
|
|
let line = pipeline(line);
|
|
|
|
out.push('`');
|
|
out.push_str(&line);
|
|
out.push('`');
|
|
out.push(' ');
|
|
}
|
|
|
|
out.push(']');
|
|
|
|
out
|
|
}
|
|
|
|
pub fn shell_os_paths() -> Vec<std::path::PathBuf> {
|
|
let mut original_paths = vec![];
|
|
|
|
if let Some(paths) = std::env::var_os(NATIVE_PATH_ENV_VAR) {
|
|
original_paths = std::env::split_paths(&paths).collect::<Vec<_>>();
|
|
}
|
|
|
|
original_paths
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::pipeline;
|
|
|
|
#[test]
|
|
fn constructs_a_pipeline() {
|
|
let actual = pipeline(
|
|
r#"
|
|
open los_tres_amigos.txt
|
|
| from-csv
|
|
| get rusty_luck
|
|
| into int
|
|
| math sum
|
|
| echo "$it"
|
|
"#,
|
|
);
|
|
|
|
assert_eq!(
|
|
actual,
|
|
r#"open los_tres_amigos.txt | from-csv | get rusty_luck | into int | math sum | echo "$it""#
|
|
);
|
|
}
|
|
}
|