From ec2e35ad81d2212b49bc6df0ab1a52d61ba23e67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20N=2E=20Robalino?= <andres@androbtech.com>
Date: Tue, 15 Oct 2019 05:41:34 -0500
Subject: [PATCH] 'last' gets last row if no amount desired given.

---
 src/commands/last.rs   | 18 +++++++++++-------
 tests/commands_test.rs | 43 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/src/commands/last.rs b/src/commands/last.rs
index 321506846b..04db0f4c48 100644
--- a/src/commands/last.rs
+++ b/src/commands/last.rs
@@ -7,7 +7,7 @@ pub struct Last;
 
 #[derive(Deserialize)]
 pub struct LastArgs {
-    amount: Tagged<u64>,
+    rows: Option<Tagged<u64>>,
 }
 
 impl WholeStreamCommand for Last {
@@ -16,7 +16,7 @@ impl WholeStreamCommand for Last {
     }
 
     fn signature(&self) -> Signature {
-        Signature::build("last").required("amount", SyntaxShape::Number)
+        Signature::build("last").optional("rows", SyntaxShape::Number)
     }
 
     fn usage(&self) -> &str {
@@ -32,13 +32,17 @@ impl WholeStreamCommand for Last {
     }
 }
 
-fn last(
-    LastArgs { amount }: LastArgs,
-    context: RunnableContext,
-) -> Result<OutputStream, ShellError> {
+fn last(LastArgs { rows }: LastArgs, context: RunnableContext) -> Result<OutputStream, ShellError> {
     let stream = async_stream! {
         let v: Vec<_> = context.input.into_vec().await;
-        let count = (*amount as usize);
+
+        let rows_desired = if let Some(quantity) = rows {
+            *quantity
+        } else {
+         1
+        };
+
+        let count = (rows_desired as usize);
         if count < v.len() {
             let k = v.len() - count;
             for x in v[k..].iter() {
diff --git a/tests/commands_test.rs b/tests/commands_test.rs
index 6544042f66..4d6fa84a65 100644
--- a/tests/commands_test.rs
+++ b/tests/commands_test.rs
@@ -70,6 +70,49 @@ fn first_gets_first_row_when_no_amount_given() {
     })
 }
 
+#[test]
+fn last_gets_last_rows_by_amount() {
+    Playground::setup("last_test_1", |dirs, sandbox| {
+        sandbox.with_files(vec![
+            EmptyFile("los.txt"),
+            EmptyFile("tres.txt"),
+            EmptyFile("amigos.txt"),
+            EmptyFile("arepas.clu"),
+        ]);
+
+        let actual = nu!(
+            cwd: dirs.test(), h::pipeline(
+            r#"
+                ls
+                | last 3
+                | count
+                | echo $it
+            "#
+        ));
+
+        assert_eq!(actual, "3");
+    })
+}
+
+#[test]
+fn last_gets_last_row_when_no_amount_given() {
+    Playground::setup("last_test_2", |dirs, sandbox| {
+        sandbox.with_files(vec![EmptyFile("caballeros.txt"), EmptyFile("arepas.clu")]);
+
+        let actual = nu!(
+            cwd: dirs.test(), h::pipeline(
+            r#"
+                ls
+                | last
+                | count
+                | echo $it
+            "#
+        ));
+
+        assert_eq!(actual, "1");
+    })
+}
+
 #[test]
 fn get() {
     Playground::setup("get_test_1", |dirs, sandbox| {