mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 16:33:37 +01:00
dfdb2b5d31
# Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Currently the parser and the documentation generation use the signature of the command, which means that it doesn't pick up on the changed name of the `main` block, and therefore shows the name of the command as "main" and doesn't find the subcommands. This PR changes the aforementioned places to use the block signature to fix these issues. This closes #13397. Incidentally it also causes input/output types to be shown in the help, which is kinda pointless for scripts since they don't operate on structured data but maybe not worth the effort to remove. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> ``` # example.nu export def main [] { help main } export def 'main sub' [] { print 'sub' } ``` Before: ![image](https://github.com/user-attachments/assets/49fdcf8d-e56a-4c27-b7c8-7d2902c2a807) ![image](https://github.com/user-attachments/assets/4d1f4faa-5928-4269-b0b5-fd654563bb8b) After: ![image](https://github.com/user-attachments/assets/a7232a1f-f997-4988-808c-8fa957e39bae) ![image](https://github.com/user-attachments/assets/c5628dc6-69b5-443a-b103-9e5faa9bb4ba) # Tests <!-- 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` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` to run the tests for the standard library > **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 > ``` --> Tests are still missing for the subcommands and the input/output types --------- Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
403 lines
12 KiB
Rust
403 lines
12 KiB
Rust
use nu_test_support::fs::Stub::{FileWithContent, FileWithContentToBeTrimmed};
|
|
use nu_test_support::playground::Playground;
|
|
use nu_test_support::{nu, nu_repl_code, pipeline};
|
|
use pretty_assertions::assert_eq;
|
|
|
|
mod environment;
|
|
mod pipeline;
|
|
mod repl;
|
|
|
|
//FIXME: jt: we need to focus some fixes on wix as the plugins will differ
|
|
#[ignore]
|
|
#[test]
|
|
fn plugins_are_declared_with_wix() {
|
|
let actual = nu!(pipeline(
|
|
r#"
|
|
open Cargo.toml
|
|
| get bin.name
|
|
| str replace "nu_plugin_(extra|core)_(.*)" "nu_plugin_$2"
|
|
| drop
|
|
| sort-by
|
|
| wrap cargo | merge {
|
|
open wix/main.wxs --raw | from xml
|
|
| get Wix.children.Product.children.0.Directory.children.0
|
|
| where Directory.attributes.Id == "$(var.PlatformProgramFilesFolder)"
|
|
| get Directory.children.Directory.children.0 | last
|
|
| get Directory.children.Component.children
|
|
| each { |it| echo $it | first }
|
|
| skip
|
|
| where File.attributes.Name =~ "nu_plugin"
|
|
| str substring [_, -4] File.attributes.Name
|
|
| get File.attributes.Name
|
|
| sort-by
|
|
| wrap wix
|
|
}
|
|
| default wix _
|
|
| each { |it| if $it.wix != $it.cargo { 1 } { 0 } }
|
|
| math sum
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "0");
|
|
}
|
|
|
|
#[test]
|
|
#[cfg(not(windows))]
|
|
fn do_not_panic_if_broken_pipe() {
|
|
// `nu -h | false`
|
|
// used to panic with a BrokenPipe error
|
|
let child_output = std::process::Command::new("sh")
|
|
.arg("-c")
|
|
.arg(format!(
|
|
"{:?} -h | false",
|
|
nu_test_support::fs::executable_path()
|
|
))
|
|
.output()
|
|
.expect("failed to execute process");
|
|
|
|
assert!(child_output.stderr.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn nu_lib_dirs_repl() {
|
|
Playground::setup("nu_lib_dirs_repl", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("scripts")
|
|
.with_files(&[FileWithContentToBeTrimmed(
|
|
"scripts/foo.nu",
|
|
r#"
|
|
$env.FOO = "foo"
|
|
"#,
|
|
)]);
|
|
|
|
let inp_lines = &[
|
|
"$env.NU_LIB_DIRS = [ ('scripts' | path expand) ]",
|
|
"source-env foo.nu",
|
|
"$env.FOO",
|
|
];
|
|
|
|
let actual_repl = nu!(cwd: dirs.test(), nu_repl_code(inp_lines));
|
|
|
|
assert!(actual_repl.err.is_empty());
|
|
assert_eq!(actual_repl.out, "foo");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn nu_lib_dirs_script() {
|
|
Playground::setup("nu_lib_dirs_script", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("scripts")
|
|
.with_files(&[FileWithContentToBeTrimmed(
|
|
"scripts/foo.nu",
|
|
r#"
|
|
$env.FOO = "foo"
|
|
"#,
|
|
)])
|
|
.with_files(&[FileWithContentToBeTrimmed(
|
|
"main.nu",
|
|
"
|
|
source-env foo.nu
|
|
",
|
|
)]);
|
|
|
|
let inp_lines = &[
|
|
"$env.NU_LIB_DIRS = [ ('scripts' | path expand) ]",
|
|
"source-env main.nu",
|
|
"$env.FOO",
|
|
];
|
|
|
|
let actual_repl = nu!(cwd: dirs.test(), nu_repl_code(inp_lines));
|
|
|
|
assert!(actual_repl.err.is_empty());
|
|
assert_eq!(actual_repl.out, "foo");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn nu_lib_dirs_relative_repl() {
|
|
Playground::setup("nu_lib_dirs_relative_repl", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("scripts")
|
|
.with_files(&[FileWithContentToBeTrimmed(
|
|
"scripts/foo.nu",
|
|
r#"
|
|
$env.FOO = "foo"
|
|
"#,
|
|
)]);
|
|
|
|
let inp_lines = &[
|
|
"$env.NU_LIB_DIRS = [ 'scripts' ]",
|
|
"source-env foo.nu",
|
|
"$env.FOO",
|
|
];
|
|
|
|
let actual_repl = nu!(cwd: dirs.test(), nu_repl_code(inp_lines));
|
|
|
|
assert!(actual_repl.err.is_empty());
|
|
assert_eq!(actual_repl.out, "foo");
|
|
})
|
|
}
|
|
|
|
// TODO: add absolute path tests after we expand const capabilities (see #8310)
|
|
#[test]
|
|
fn const_nu_lib_dirs_relative() {
|
|
Playground::setup("const_nu_lib_dirs_relative", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("scripts")
|
|
.with_files(&[FileWithContentToBeTrimmed(
|
|
"scripts/foo.nu",
|
|
r#"
|
|
$env.FOO = "foo"
|
|
"#,
|
|
)])
|
|
.with_files(&[FileWithContentToBeTrimmed(
|
|
"main.nu",
|
|
"
|
|
const NU_LIB_DIRS = [ 'scripts' ]
|
|
source-env foo.nu
|
|
$env.FOO
|
|
",
|
|
)]);
|
|
|
|
let outcome = nu!(cwd: dirs.test(), "source main.nu");
|
|
|
|
assert!(outcome.err.is_empty());
|
|
assert_eq!(outcome.out, "foo");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn nu_lib_dirs_relative_script() {
|
|
Playground::setup("nu_lib_dirs_relative_script", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("scripts")
|
|
.with_files(&[FileWithContentToBeTrimmed(
|
|
"scripts/main.nu",
|
|
"
|
|
source-env ../foo.nu
|
|
",
|
|
)])
|
|
.with_files(&[FileWithContentToBeTrimmed(
|
|
"foo.nu",
|
|
r#"
|
|
$env.FOO = "foo"
|
|
"#,
|
|
)]);
|
|
|
|
let inp_lines = &[
|
|
"$env.NU_LIB_DIRS = [ 'scripts' ]",
|
|
"source-env scripts/main.nu",
|
|
"$env.FOO",
|
|
];
|
|
|
|
let actual_repl = nu!(cwd: dirs.test(), nu_repl_code(inp_lines));
|
|
|
|
assert!(actual_repl.err.is_empty());
|
|
assert_eq!(actual_repl.out, "foo");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn run_script_that_looks_like_module() {
|
|
Playground::setup("run_script_that_looks_like_module", |dirs, _| {
|
|
let inp_lines = &[
|
|
"module spam { export def eggs [] { 'eggs' } }",
|
|
"export use spam eggs",
|
|
"export def foo [] { eggs }",
|
|
"export alias bar = foo",
|
|
"export def --env baz [] { bar }",
|
|
"baz",
|
|
];
|
|
|
|
let actual = nu!(cwd: dirs.test(), inp_lines.join("; "));
|
|
|
|
assert_eq!(actual.out, "eggs");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn run_export_extern() {
|
|
Playground::setup("run_script_that_looks_like_module", |dirs, _| {
|
|
let inp_lines = &["export extern foo []", "help foo"];
|
|
|
|
let actual = nu!(cwd: dirs.test(), inp_lines.join("; "));
|
|
|
|
assert!(actual.out.contains("Usage"));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn run_in_login_mode() {
|
|
let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
|
|
.args(["-n", "-l", "-c", "echo $nu.is-login"])
|
|
.output()
|
|
.expect("failed to run nu");
|
|
|
|
assert_eq!("true\n", String::from_utf8_lossy(&child_output.stdout));
|
|
assert!(child_output.stderr.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn run_in_not_login_mode() {
|
|
let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
|
|
.args(["-n", "-c", "echo $nu.is-login"])
|
|
.output()
|
|
.expect("failed to run nu");
|
|
|
|
assert_eq!("false\n", String::from_utf8_lossy(&child_output.stdout));
|
|
assert!(child_output.stderr.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn run_in_interactive_mode() {
|
|
let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
|
|
.args(["-n", "-i", "-c", "echo $nu.is-interactive"])
|
|
.output()
|
|
.expect("failed to run nu");
|
|
|
|
assert_eq!("true\n", String::from_utf8_lossy(&child_output.stdout));
|
|
assert!(child_output.stderr.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn run_in_noninteractive_mode() {
|
|
let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
|
|
.args(["-n", "-c", "echo $nu.is-interactive"])
|
|
.output()
|
|
.expect("failed to run nu");
|
|
|
|
assert_eq!("false\n", String::from_utf8_lossy(&child_output.stdout));
|
|
assert!(child_output.stderr.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn run_with_no_newline() {
|
|
let child_output = std::process::Command::new(nu_test_support::fs::executable_path())
|
|
.args(["--no-newline", "-c", "\"hello world\""])
|
|
.output()
|
|
.expect("failed to run nu");
|
|
|
|
assert_eq!("hello world", String::from_utf8_lossy(&child_output.stdout)); // with no newline
|
|
assert!(child_output.stderr.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn main_script_can_have_subcommands1() {
|
|
Playground::setup("main_subcommands", |dirs, sandbox| {
|
|
sandbox.mkdir("main_subcommands");
|
|
sandbox.with_files(&[FileWithContent(
|
|
"script.nu",
|
|
r#"def "main foo" [x: int] {
|
|
print ($x + 100)
|
|
}
|
|
|
|
def "main" [] {
|
|
print "usage: script.nu <command name>"
|
|
}"#,
|
|
)]);
|
|
|
|
let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu foo 123"));
|
|
|
|
assert_eq!(actual.out, "223");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn main_script_can_have_subcommands2() {
|
|
Playground::setup("main_subcommands", |dirs, sandbox| {
|
|
sandbox.mkdir("main_subcommands");
|
|
sandbox.with_files(&[FileWithContent(
|
|
"script.nu",
|
|
r#"def "main foo" [x: int] {
|
|
print ($x + 100)
|
|
}
|
|
|
|
def "main" [] {
|
|
print "usage: script.nu <command name>"
|
|
}"#,
|
|
)]);
|
|
|
|
let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu"));
|
|
|
|
assert!(actual.out.contains("usage: script.nu"));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn source_empty_file() {
|
|
Playground::setup("source_empty_file", |dirs, sandbox| {
|
|
sandbox.mkdir("source_empty_file");
|
|
sandbox.with_files(&[FileWithContent("empty.nu", "")]);
|
|
|
|
let actual = nu!(cwd: dirs.test(), pipeline("nu empty.nu"));
|
|
assert!(actual.out.is_empty());
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn main_script_help_uses_script_name1() {
|
|
// Note: this test is somewhat fragile and might need to be adapted if the usage help message changes
|
|
Playground::setup("main_filename", |dirs, sandbox| {
|
|
sandbox.mkdir("main_filename");
|
|
sandbox.with_files(&[FileWithContent(
|
|
"script.nu",
|
|
r#"def main [] {}
|
|
"#,
|
|
)]);
|
|
let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu --help"));
|
|
assert!(actual.out.contains("> script.nu"));
|
|
assert!(!actual.out.contains("> main"));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn main_script_help_uses_script_name2() {
|
|
// Note: this test is somewhat fragile and might need to be adapted if the usage help message changes
|
|
Playground::setup("main_filename", |dirs, sandbox| {
|
|
sandbox.mkdir("main_filename");
|
|
sandbox.with_files(&[FileWithContent(
|
|
"script.nu",
|
|
r#"def main [foo: string] {}
|
|
"#,
|
|
)]);
|
|
let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu"));
|
|
assert!(actual.err.contains("Usage: script.nu"));
|
|
assert!(!actual.err.contains("Usage: main"));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn main_script_subcommand_help_uses_script_name1() {
|
|
// Note: this test is somewhat fragile and might need to be adapted if the usage help message changes
|
|
Playground::setup("main_filename", |dirs, sandbox| {
|
|
sandbox.mkdir("main_filename");
|
|
sandbox.with_files(&[FileWithContent(
|
|
"script.nu",
|
|
r#"def main [] {}
|
|
def 'main foo' [] {}
|
|
"#,
|
|
)]);
|
|
let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu foo --help"));
|
|
assert!(actual.out.contains("> script.nu foo"));
|
|
assert!(!actual.out.contains("> main foo"));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn main_script_subcommand_help_uses_script_name2() {
|
|
// Note: this test is somewhat fragile and might need to be adapted if the usage help message changes
|
|
Playground::setup("main_filename", |dirs, sandbox| {
|
|
sandbox.mkdir("main_filename");
|
|
sandbox.with_files(&[FileWithContent(
|
|
"script.nu",
|
|
r#"def main [] {}
|
|
def 'main foo' [bar: string] {}
|
|
"#,
|
|
)]);
|
|
let actual = nu!(cwd: dirs.test(), pipeline("nu script.nu foo"));
|
|
assert!(actual.err.contains("Usage: script.nu foo"));
|
|
assert!(!actual.err.contains("Usage: main foo"));
|
|
})
|
|
}
|