mirror of
https://github.com/nushell/nushell
synced 2024-12-29 06:23:11 +00:00
ee74ec7423
# Description fixed #11678 The sub-commands of from command (`from {csv, tsv, ssv}`) name columns starting from index 0. This behaviour is inconsistent with other commands such as `detect columns`. This PR makes the subcommands index 0-based. # User-Facing Changes The subcommands (`from {csv, tsv, ssv}`) return a table with the columns starting at index 0 if no header data is passed. ``` ~/Development/nushell> "foo bar baz" | from ssv -n -m 1 ╭───┬─────────┬─────────┬─────────╮ │ # │ column0 │ column1 │ column2 │ ├───┼─────────┼─────────┼─────────┤ │ 0 │ foo │ bar │ baz │ ╰───┴─────────┴─────────┴─────────╯ ~/Development/nushell> "foo,bar,baz" | from csv -n ╭───┬─────────┬─────────┬─────────╮ │ # │ column0 │ column1 │ column2 │ ├───┼─────────┼─────────┼─────────┤ │ 0 │ foo │ bar │ baz │ ╰───┴─────────┴─────────┴─────────╯ ~/Development/nushell> "foo\tbar\tbaz" | from tsv -n ╭───┬─────────┬─────────┬─────────╮ │ # │ column0 │ column1 │ column2 │ ├───┼─────────┼─────────┼─────────┤ │ 0 │ foo │ bar │ baz │ ╰───┴─────────┴─────────┴─────────╯ ``` # Tests + Formatting When I ran tests, `commands::touch::change_file_mtime_to_reference` failed with the following error. The error also occurs in the master branch, so it's probably unrelated to these changes. (maybe a problem with my dev environment) ``` $ toolkit check pr ~~~~~~~~ failures: ---- commands::touch::change_file_mtime_to_reference stdout ---- === stderr thread 'commands::touch::change_file_mtime_to_reference' panicked at crates/nu-command/tests/commands/touch.rs:298:9: assertion `left == right` failed left: SystemTime { tv_sec: 1719149697, tv_nsec: 57576929 } right: SystemTime { tv_sec: 1719149697, tv_nsec: 78219489 } failures: commands::touch::change_file_mtime_to_reference test result: FAILED. 1533 passed; 1 failed; 32 ignored; 0 measured; 0 filtered out; finished in 10.87s error: test failed, to rerun pass `-p nu-command --test main` - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🔴 `toolkit test` - ⚫ `toolkit test stdlib` ``` # After Submitting nothing
95 lines
3.4 KiB
Rust
95 lines
3.4 KiB
Rust
use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
|
|
use nu_test_support::playground::Playground;
|
|
use nu_test_support::{nu, pipeline};
|
|
|
|
#[test]
|
|
fn from_ssv_text_to_table() {
|
|
Playground::setup("filter_from_ssv_test_1", |dirs, sandbox| {
|
|
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
|
"oc_get_svc.txt",
|
|
r#"
|
|
NAME LABELS SELECTOR IP PORT(S)
|
|
docker-registry docker-registry=default docker-registry=default 172.30.78.158 5000/TCP
|
|
kubernetes component=apiserver,provider=kubernetes <none> 172.30.0.2 443/TCP
|
|
kubernetes-ro component=apiserver,provider=kubernetes <none> 172.30.0.1 80/TCP
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
open oc_get_svc.txt
|
|
| from ssv
|
|
| get 0
|
|
| get IP
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "172.30.78.158");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn from_ssv_text_to_table_with_separator_specified() {
|
|
Playground::setup("filter_from_ssv_test_1", |dirs, sandbox| {
|
|
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
|
"oc_get_svc.txt",
|
|
r#"
|
|
NAME LABELS SELECTOR IP PORT(S)
|
|
docker-registry docker-registry=default docker-registry=default 172.30.78.158 5000/TCP
|
|
kubernetes component=apiserver,provider=kubernetes <none> 172.30.0.2 443/TCP
|
|
kubernetes-ro component=apiserver,provider=kubernetes <none> 172.30.0.1 80/TCP
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
open oc_get_svc.txt
|
|
| from ssv --minimum-spaces 3
|
|
| get 0
|
|
| get IP
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "172.30.78.158");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn from_ssv_text_treating_first_line_as_data_with_flag() {
|
|
Playground::setup("filter_from_ssv_test_2", |dirs, sandbox| {
|
|
sandbox.with_files(&[FileWithContentToBeTrimmed(
|
|
"oc_get_svc.txt",
|
|
r#"
|
|
docker-registry docker-registry=default docker-registry=default 172.30.78.158 5000/TCP
|
|
kubernetes component=apiserver,provider=kubernetes <none> 172.30.0.2 443/TCP
|
|
kubernetes-ro component=apiserver,provider=kubernetes <none> 172.30.0.1 80/TCP
|
|
"#,
|
|
)]);
|
|
|
|
let aligned_columns = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
open oc_get_svc.txt
|
|
| from ssv --noheaders -a
|
|
| first
|
|
| get column0
|
|
"#
|
|
));
|
|
|
|
let separator_based = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
open oc_get_svc.txt
|
|
| from ssv --noheaders
|
|
| first
|
|
| get column0
|
|
|
|
"#
|
|
));
|
|
|
|
assert_eq!(aligned_columns.out, separator_based.out);
|
|
assert_eq!(separator_based.out, "docker-registry");
|
|
})
|
|
}
|