mirror of
https://github.com/nushell/nushell.git
synced 2025-02-06 05:29:36 +01:00
24848a1e35
## Fix `nu-path` usage in `nu!` testing macro The `nu-path` crate needs to be properly re-exported so the generated code is valid if `nu-path` is not present among the dependencies of the using crate. Usage of crates in `macro_rules!` macros has to follow the `$crate::symbol_in_crate` path pattern (With an absolute path-spec also for macros defined in submodules) ## Move `nu-test-support` to devdeps in `nu-protocol` Also remove the now unnecessary direct dependency on `nu-path`. `nu!` macro had to be changed to make it a proper transitive dependency.
93 lines
2.0 KiB
Rust
93 lines
2.0 KiB
Rust
pub mod commands;
|
|
pub mod fs;
|
|
pub mod locale_override;
|
|
pub mod macros;
|
|
pub mod playground;
|
|
// Needs to be reexported for `nu!` macro
|
|
pub use nu_path;
|
|
|
|
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""#
|
|
);
|
|
}
|
|
}
|