From 11480c77be135bbec041006ca32cca873d1fe77f Mon Sep 17 00:00:00 2001
From: Hofer-Julian <30049909+Hofer-Julian@users.noreply.github.com>
Date: Thu, 19 Oct 2023 22:07:01 +0200
Subject: [PATCH] Add long options for path (#10775)

---
 crates/nu-command/src/path/basename.rs            |  4 ++--
 crates/nu-command/src/path/dirname.rs             |  9 +++++----
 crates/nu-command/src/path/parse.rs               |  8 ++++----
 crates/nu-command/tests/commands/path/basename.rs |  6 +++---
 crates/nu-command/tests/commands/path/dirname.rs  | 14 +++++++-------
 crates/nu-command/tests/commands/path/parse.rs    |  8 ++++----
 scripts/build-all.nu                              |  2 +-
 scripts/coverage-local.nu                         |  2 +-
 8 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/crates/nu-command/src/path/basename.rs b/crates/nu-command/src/path/basename.rs
index b069c6b17..58b7a50eb 100644
--- a/crates/nu-command/src/path/basename.rs
+++ b/crates/nu-command/src/path/basename.rs
@@ -110,7 +110,7 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Replace basename of a path",
-                example: "'C:\\Users\\joe\\test.txt' | path basename -r 'spam.png'",
+                example: "'C:\\Users\\joe\\test.txt' | path basename --replace 'spam.png'",
                 result: Some(Value::test_string("C:\\Users\\joe\\spam.png")),
             },
         ]
@@ -134,7 +134,7 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Replace basename of a path",
-                example: "'/home/joe/test.txt' | path basename -r 'spam.png'",
+                example: "'/home/joe/test.txt' | path basename --replace 'spam.png'",
                 result: Some(Value::test_string("/home/joe/spam.png")),
             },
         ]
diff --git a/crates/nu-command/src/path/dirname.rs b/crates/nu-command/src/path/dirname.rs
index fbbf91bf8..39cf79539 100644
--- a/crates/nu-command/src/path/dirname.rs
+++ b/crates/nu-command/src/path/dirname.rs
@@ -120,13 +120,13 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Walk up two levels",
-                example: "'C:\\Users\\joe\\code\\test.txt' | path dirname -n 2",
+                example: "'C:\\Users\\joe\\code\\test.txt' | path dirname --num-levels 2",
                 result: Some(Value::test_string("C:\\Users\\joe")),
             },
             Example {
                 description: "Replace the part that would be returned with a custom path",
                 example:
-                    "'C:\\Users\\joe\\code\\test.txt' | path dirname -n 2 -r C:\\Users\\viking",
+                    "'C:\\Users\\joe\\code\\test.txt' | path dirname --num-levels 2 --replace C:\\Users\\viking",
                 result: Some(Value::test_string("C:\\Users\\viking\\code\\test.txt")),
             },
         ]
@@ -150,12 +150,13 @@ impl Command for SubCommand {
             },
             Example {
                 description: "Walk up two levels",
-                example: "'/home/joe/code/test.txt' | path dirname -n 2",
+                example: "'/home/joe/code/test.txt' | path dirname --num-levels 2",
                 result: Some(Value::test_string("/home/joe")),
             },
             Example {
                 description: "Replace the part that would be returned with a custom path",
-                example: "'/home/joe/code/test.txt' | path dirname -n 2 -r /home/viking",
+                example:
+                    "'/home/joe/code/test.txt' | path dirname --num-levels 2 --replace /home/viking",
                 result: Some(Value::test_string("/home/viking/code/test.txt")),
             },
         ]
diff --git a/crates/nu-command/src/path/parse.rs b/crates/nu-command/src/path/parse.rs
index a4cd8f8fb..7482ed2d2 100644
--- a/crates/nu-command/src/path/parse.rs
+++ b/crates/nu-command/src/path/parse.rs
@@ -118,12 +118,12 @@ On Windows, an extra 'prefix' column is added."#
             },
             Example {
                 description: "Replace a complex extension",
-                example: r"'C:\Users\viking\spam.tar.gz' | path parse -e tar.gz | upsert extension { 'txt' }",
+                example: r"'C:\Users\viking\spam.tar.gz' | path parse --extension tar.gz | upsert extension { 'txt' }",
                 result: None,
             },
             Example {
                 description: "Ignore the extension",
-                example: r"'C:\Users\viking.d' | path parse -e ''",
+                example: r"'C:\Users\viking.d' | path parse --extension ''",
                 result: Some(Value::test_record(Record {
                     cols: vec![
                         "prefix".into(),
@@ -193,12 +193,12 @@ On Windows, an extra 'prefix' column is added."#
             },
             Example {
                 description: "Replace a complex extension",
-                example: r"'/home/viking/spam.tar.gz' | path parse -e tar.gz | upsert extension { 'txt' }",
+                example: r"'/home/viking/spam.tar.gz' | path parse --extension tar.gz | upsert extension { 'txt' }",
                 result: None,
             },
             Example {
                 description: "Ignore the extension",
-                example: r"'/etc/conf.d' | path parse -e ''",
+                example: r"'/etc/conf.d' | path parse --extension ''",
                 result: Some(Value::test_record(Record {
                     cols: vec!["parent".into(), "stem".into(), "extension".into()],
                     vals: vec![
diff --git a/crates/nu-command/tests/commands/path/basename.rs b/crates/nu-command/tests/commands/path/basename.rs
index 65ca7abdc..7cf5c3124 100644
--- a/crates/nu-command/tests/commands/path/basename.rs
+++ b/crates/nu-command/tests/commands/path/basename.rs
@@ -21,7 +21,7 @@ fn replaces_basename_of_empty_input() {
         cwd: "tests", pipeline(
         r#"
             echo ""
-            | path basename -r newname.txt
+            | path basename --replace newname.txt
         "#
     ));
 
@@ -47,7 +47,7 @@ fn replaces_basename_of_path_ending_with_dot() {
         cwd: "tests", pipeline(
         r#"
             echo "some/file.txt/."
-            | path basename -r viking.txt
+            | path basename --replace viking.txt
         "#
     ));
 
@@ -74,7 +74,7 @@ fn replaces_basename_of_path_ending_with_double_dot() {
         cwd: "tests", pipeline(
         r#"
             echo "some/file.txt/.."
-            | path basename -r eggs
+            | path basename --replace eggs
         "#
     ));
 
diff --git a/crates/nu-command/tests/commands/path/dirname.rs b/crates/nu-command/tests/commands/path/dirname.rs
index 5741238b7..5f99858bf 100644
--- a/crates/nu-command/tests/commands/path/dirname.rs
+++ b/crates/nu-command/tests/commands/path/dirname.rs
@@ -21,7 +21,7 @@ fn replaces_dirname_of_empty_input() {
         cwd: "tests", pipeline(
         r#"
             echo ""
-            | path dirname -r newdir
+            | path dirname --replace newdir
         "#
     ));
 
@@ -47,7 +47,7 @@ fn replaces_dirname_of_path_ending_with_dot() {
         cwd: "tests", pipeline(
         r#"
             echo "some/dir/."
-            | path dirname -r eggs
+            | path dirname --replace eggs
         "#
     ));
 
@@ -74,7 +74,7 @@ fn replaces_dirname_of_path_with_double_dot() {
         cwd: "tests", pipeline(
         r#"
             echo "some/dir/.."
-            | path dirname -r eggs
+            | path dirname --replace eggs
         "#
     ));
 
@@ -88,7 +88,7 @@ fn returns_dirname_of_zero_levels() {
         cwd: "tests", pipeline(
         r#"
             echo "some/dir/with/spam.txt"
-            | path dirname -n 0
+            | path dirname --num-levels 0
         "#
     ));
 
@@ -101,7 +101,7 @@ fn replaces_dirname_of_zero_levels_with_empty_string() {
         cwd: "tests", pipeline(
         r#"
             echo "some/dir/with/spam.txt"
-            | path dirname -n 0 -r ""
+            | path dirname --num-levels 0 --replace ""
         "#
     ));
 
@@ -114,7 +114,7 @@ fn replaces_dirname_of_more_levels() {
         cwd: "tests", pipeline(
         r#"
             echo "some/dir/with/spam.txt"
-            | path dirname -r eggs -n 2
+            | path dirname --replace eggs -n 2
         "#
     ));
 
@@ -128,7 +128,7 @@ fn replaces_dirname_of_way_too_many_levels() {
         cwd: "tests", pipeline(
         r#"
             echo "some/dir/with/spam.txt"
-            | path dirname -r eggs -n 999
+            | path dirname --replace eggs -n 999
         "#
     ));
 
diff --git a/crates/nu-command/tests/commands/path/parse.rs b/crates/nu-command/tests/commands/path/parse.rs
index 009cdbfce..4783a5885 100644
--- a/crates/nu-command/tests/commands/path/parse.rs
+++ b/crates/nu-command/tests/commands/path/parse.rs
@@ -49,7 +49,7 @@ fn parses_custom_extension_gets_extension() {
         cwd: "tests", pipeline(
         r#"
             echo 'home/viking/spam.tar.gz'
-            | path parse -e tar.gz
+            | path parse --extension tar.gz
             | get extension
         "#
     ));
@@ -63,7 +63,7 @@ fn parses_custom_extension_gets_stem() {
         cwd: "tests", pipeline(
         r#"
             echo 'home/viking/spam.tar.gz'
-            | path parse -e tar.gz
+            | path parse --extension tar.gz
             | get stem
         "#
     ));
@@ -77,7 +77,7 @@ fn parses_ignoring_extension_gets_extension() {
         cwd: "tests", pipeline(
         r#"
             echo 'home/viking/spam.tar.gz'
-            | path parse -e ''
+            | path parse --extension ''
             | get extension
         "#
     ));
@@ -91,7 +91,7 @@ fn parses_ignoring_extension_gets_stem() {
         cwd: "tests", pipeline(
         r#"
             echo 'home/viking/spam.tar.gz'
-            | path parse -e ""
+            | path parse --extension ""
             | get stem
         "#
     ));
diff --git a/scripts/build-all.nu b/scripts/build-all.nu
index bc94c2498..3f1d302f5 100644
--- a/scripts/build-all.nu
+++ b/scripts/build-all.nu
@@ -6,7 +6,7 @@ print '-------------------------------------------------------------------'
 
 warning "./scripts/build-all.nu will be deprecated, please use the `toolkit build` command instead"
 
-let repo_root = ($env.CURRENT_FILE | path dirname -n 2)
+let repo_root = ($env.CURRENT_FILE | path dirname --num-levels 2)
 
 def build-nushell [] {
     print $'(char nl)Building nushell'
diff --git a/scripts/coverage-local.nu b/scripts/coverage-local.nu
index 4c1aeb68e..0a2c017bd 100755
--- a/scripts/coverage-local.nu
+++ b/scripts/coverage-local.nu
@@ -4,7 +4,7 @@ use std log warning
 warning "./scripts/coverage-local.nu will be deprecated, please use the `toolkit cov` command instead"
 
 def compute-coverage [] {
-    cd ($env.CURRENT_FILE | path dirname -n 2)
+    cd ($env.CURRENT_FILE | path dirname --num-levels 2)
 
     print "Setting up environment variables for coverage"
     # Enable LLVM coverage tracking through environment variables