holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make utouch the new touch (#14721)

Browse Source 
# Description

This PR removes the old `touch` command in favor of the uutils/coreutils
implementation of `touch`, which we integrated in 0.101 (#11817).

It turns out that in `utouch`, the `--no-deref`/`-s` wasn't working, and
the issue had gone undetected because I accidentally made the test for
that use `touch` rather than `utouch`. This has been fixed now.

# User-Facing Changes

Our old `touch` command didn't have anything that the new uutils-based
command doesn't, and the uutils-based command actually has a little more
functionality. So nothing using `touch` should break.

Scripts using `utouch` will have to use `touch` now, but given that
`utouch` has been around for less than 2 months, I assume people haven't
really been using it.

# Tests + Formatting

The utouch tests seem to have everything from the old touch tests, so I
deleted the old touch tests.

# After Submitting

This will need to be mentioned in the release notes.
This commit is contained in:
Yash Thakur
2025-01-02 07:26:46 -05:00
committed by GitHub
parent c46ca36bcd
commit 80788636ee
7 changed files with 50 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
crates/nu-command/tests/commands/utouch.rs
View File

@ -59,7 +59,7 @@ fn creates_a_file_when_it_doesnt_exist() {
Playground::setup("create_test_1", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"utouch i_will_be_created.txt"
"touch i_will_be_created.txt"
);
let path = dirs.test().join("i_will_be_created.txt");
@ -72,7 +72,7 @@ fn creates_two_files() {
Playground::setup("create_test_2", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"utouch a b"
"touch a b"
);
let path = dirs.test().join("a");
@ -91,7 +91,7 @@ fn creates_a_file_when_glob_is_quoted() {
Playground::setup("create_test_glob", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"utouch '*.txt'"
"touch '*.txt'"
);
let path = dirs.test().join("*.txt");
@ -104,7 +104,7 @@ fn fails_when_glob_has_no_matches() {
Playground::setup("create_test_glob_no_matches", |dirs, _sandbox| {
let actual = nu!(
cwd: dirs.test(),
"utouch *.txt"
"touch *.txt"
);
assert!(actual.err.contains("No matches found for glob *.txt"));
@ -117,12 +117,12 @@ fn change_modified_time_of_file_to_today() {
sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
let path = dirs.test().join("file.txt");
// Set file.txt's times to the past before the test to make sure `utouch` actually changes the mtime to today
// Set file.txt's times to the past before the test to make sure `touch` actually changes the mtime to today
filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
nu!(
cwd: dirs.test(),
"utouch -m file.txt"
"touch -m file.txt"
);
let metadata = path.metadata().unwrap();
@ -147,12 +147,12 @@ fn change_access_time_of_file_to_today() {
sandbox.with_files(&[Stub::EmptyFile("file.txt")]);
let path = dirs.test().join("file.txt");
// Set file.txt's times to the past before the test to make sure `utouch` actually changes the atime to today
// Set file.txt's times to the past before the test to make sure `touch` actually changes the atime to today
filetime::set_file_times(&path, TIME_ONE, TIME_ONE).unwrap();
nu!(
cwd: dirs.test(),
"utouch -a file.txt"
"touch -a file.txt"
);
let metadata = path.metadata().unwrap();
@ -181,7 +181,7 @@ fn change_modified_and_access_time_of_file_to_today() {
nu!(
cwd: dirs.test(),
"utouch -a -m file.txt"
"touch -a -m file.txt"
);
let metadata = path.metadata().unwrap();
@ -206,7 +206,7 @@ fn change_modified_and_access_time_of_files_matching_glob_to_today() {
nu!(
cwd: dirs.test(),
"utouch *.txt"
"touch *.txt"
);
let metadata = path.metadata().unwrap();
@ -226,14 +226,14 @@ fn not_create_file_if_it_not_exists() {
Playground::setup("change_time_test_28", |dirs, _sandbox| {
let outcome = nu!(
cwd: dirs.test(),
"utouch -c file.txt"
"touch -c file.txt"
);
let path = dirs.test().join("file.txt");
assert!(!path.exists());
// If --no-create is improperly handled `utouch` may error when trying to change the times of a nonexistent file
// If --no-create is improperly handled `touch` may error when trying to change the times of a nonexistent file
assert!(outcome.status.success())
})
}
@ -250,7 +250,7 @@ fn change_file_times_if_exists_with_no_create() {
nu!(
cwd: dirs.test(),
"utouch -c file.txt"
"touch -c file.txt"
);
let metadata = path.metadata().unwrap();
@ -271,7 +271,7 @@ fn creates_file_three_dots() {
Playground::setup("create_test_1", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"utouch file..."
"touch file..."
);
let path = dirs.test().join("file...");
@ -284,7 +284,7 @@ fn creates_file_four_dots() {
Playground::setup("create_test_1", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"utouch file...."
"touch file...."
);
let path = dirs.test().join("file....");
@ -297,7 +297,7 @@ fn creates_file_four_dots_quotation_marks() {
Playground::setup("create_test_1", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"utouch 'file....'"
"touch 'file....'"
);
let path = dirs.test().join("file....");
@ -331,7 +331,7 @@ fn change_file_times_to_reference_file() {
nu!(
cwd: dirs.test(),
"utouch -r reference_file target_file"
"touch -r reference_file target_file"
);
assert_eq!(
@ -367,7 +367,7 @@ fn change_file_mtime_to_reference() {
nu!(
cwd: dirs.test(),
"utouch -mr reference_file target_file"
"touch -mr reference_file target_file"
);
assert_eq!(
@ -416,7 +416,7 @@ fn change_file_times_to_reference_file_with_date() {
nu!(
cwd: dirs.test(),
r#"utouch -r reference_file -d "yesterday" target_file"#
r#"touch -r reference_file -d "yesterday" target_file"#
);
let (got_atime, got_mtime) = file_times(target);
@ -445,7 +445,7 @@ fn change_file_times_to_timestamp() {
.unwrap()
.to_rfc3339();
nu!(cwd: dirs.test(), format!("utouch --timestamp {} target_file", timestamp));
nu!(cwd: dirs.test(), format!("touch --timestamp {} target_file", timestamp));
assert_eq!((TIME_ONE, TIME_ONE), file_times(target));
})
@ -461,7 +461,7 @@ fn change_modified_time_of_dir_to_today() {
nu!(
cwd: dirs.test(),
"utouch -m test_dir"
"touch -m test_dir"
);
// Check only the date since the time may not match exactly
@ -483,7 +483,7 @@ fn change_access_time_of_dir_to_today() {
nu!(
cwd: dirs.test(),
"utouch -a test_dir"
"touch -a test_dir"
);
// Check only the date since the time may not match exactly
@ -505,7 +505,7 @@ fn change_modified_and_access_time_of_dir_to_today() {
nu!(
cwd: dirs.test(),
"utouch -a -m test_dir"
"touch -a -m test_dir"
);
let metadata = path.metadata().unwrap();
@ -529,7 +529,7 @@ fn change_file_times_to_date() {
sandbox.with_files(&[Stub::EmptyFile("target_file")]);
let expected = Utc::now().checked_sub_signed(TimeDelta::hours(2)).unwrap();
nu!(cwd: dirs.test(), "utouch -d '-2 hours' target_file");
nu!(cwd: dirs.test(), "touch -d '-2 hours' target_file");
let (got_atime, got_mtime) = file_times(dirs.test().join("target_file"));
let got_atime =
@ -559,7 +559,7 @@ fn change_dir_three_dots_times() {
nu!(
cwd: dirs.test(),
"utouch test_dir..."
"touch test_dir..."
);
let metadata = path.metadata().unwrap();
@ -598,7 +598,7 @@ fn change_dir_times_to_reference_dir() {
nu!(
cwd: dirs.test(),
"utouch -r reference_dir target_dir"
"touch -r reference_dir target_dir"
);
assert_eq!(
@ -639,7 +639,7 @@ fn change_dir_atime_to_reference() {
nu!(
cwd: dirs.test(),
"utouch -ar reference_dir target_dir"
"touch -ar reference_dir target_dir"
);
assert_eq!(
@ -659,13 +659,13 @@ fn change_dir_atime_to_reference() {
#[test]
fn create_a_file_with_tilde() {
Playground::setup("utouch with tilde", |dirs, _| {
let actual = nu!(cwd: dirs.test(), "utouch '~tilde'");
Playground::setup("touch with tilde", |dirs, _| {
let actual = nu!(cwd: dirs.test(), "touch '~tilde'");
assert!(actual.err.is_empty());
assert!(files_exist_at(&[Path::new("~tilde")], dirs.test()));
// pass variable
let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; utouch $f");
let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; touch $f");
assert!(actual.err.is_empty());
assert!(files_exist_at(&[Path::new("~tilde2")], dirs.test()));
})
@ -673,10 +673,10 @@ fn create_a_file_with_tilde() {
#[test]
fn respects_cwd() {
Playground::setup("utouch_respects_cwd", |dirs, _sandbox| {
Playground::setup("touch_respects_cwd", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"mkdir 'dir'; cd 'dir'; utouch 'i_will_be_created.txt'"
"mkdir 'dir'; cd 'dir'; touch 'i_will_be_created.txt'"
);
let path = dirs.test().join("dir/i_will_be_created.txt");
@ -686,10 +686,10 @@ fn respects_cwd() {
#[test]
fn reference_respects_cwd() {
Playground::setup("utouch_reference_respects_cwd", |dirs, _sandbox| {
Playground::setup("touch_reference_respects_cwd", |dirs, _sandbox| {
nu!(
cwd: dirs.test(),
"mkdir 'dir'; cd 'dir'; utouch 'ref.txt'; utouch --reference 'ref.txt' 'foo.txt'"
"mkdir 'dir'; cd 'dir'; touch 'ref.txt'; touch --reference 'ref.txt' 'foo.txt'"
);
let path = dirs.test().join("dir/foo.txt");
@ -699,8 +699,8 @@ fn reference_respects_cwd() {
#[test]
fn recognizes_stdout() {
Playground::setup("utouch_recognizes_stdout", |dirs, _sandbox| {
nu!(cwd: dirs.test(), "utouch -");
Playground::setup("touch_recognizes_stdout", |dirs, _sandbox| {
nu!(cwd: dirs.test(), "touch -");
assert!(!dirs.test().join("-").exists());
})
}