- Add support for unique in repeatable args

DannyBen · Dec 7, 2023 · 4486788 · 4486788
1 parent 220150d
commit 4486788
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/examples/repeatable-arg/README.md b/examples/repeatable-arg/README.md
@@ -34,6 +34,9 @@ args:
   # needs to be converted to an array with `eval "data=(${args[file]})"`
   repeatable: true
 
+  # Setting unique to true will ignore non-unique repeating values
+  unique: true
+
 examples:
 - upcase README.md LICENSE
 - upcase *.md
@@ -125,5 +128,23 @@ args:
 
 ````
 
+### `$ ./upcase file1 file2 file1`
+
+````shell
+
+files:
+  path: file1:
+  content: content of file1
+  upcase: CONTENT OF FILE1
+  path: file2:
+  content: content of file2
+  upcase: CONTENT OF FILE2
+
+args:
+- ${args[file]} = "file1" "file2"
+
+
+````
+
 
 
diff --git a/examples/repeatable-arg/src/bashly.yml b/examples/repeatable-arg/src/bashly.yml
@@ -13,6 +13,9 @@ args:
   # needs to be converted to an array with `eval "data=(${args[file]})"`
   repeatable: true
 
+  # Setting unique to true will ignore non-unique repeating values
+  unique: true
+
 examples:
 - upcase README.md LICENSE
 - upcase *.md
diff --git a/examples/repeatable-arg/test.sh b/examples/repeatable-arg/test.sh
@@ -9,3 +9,4 @@ bashly generate
 ./upcase -h
 ./upcase file1
 ./upcase file*
+./upcase file1 file2 file1
diff --git a/lib/bashly/script/argument.rb b/lib/bashly/script/argument.rb
@@ -4,7 +4,7 @@ class Argument < Base
       class << self
         def option_keys
           @option_keys ||= %i[
-            allowed default help name repeatable required validate
+            allowed default help name repeatable required unique validate
           ]
         end
       end

diff --git a/lib/bashly/views/command/parse_requirements_case_repeatable.gtx b/lib/bashly/views/command/parse_requirements_case_repeatable.gtx
@@ -7,9 +7,17 @@ args.each do |arg|
   if arg.repeatable
     >   args['{{ arg.name }}']="\"$1\""
     >   shift
-    > else
-    >   args['{{ arg.name }}']="${args[{{ arg.name }}]} \"$1\""
-    >   shift
+    if arg.unique
+      > elif [[ ! "${args['{{ arg.name }}']}" =~ \"$1\" ]]; then
+      >   args['{{ arg.name }}']="${args[{{ arg.name }}]} \"$1\""
+      >   shift
+      > else
+      >   shift
+    else
+      > else
+      >   args['{{ arg.name }}']="${args[{{ arg.name }}]} \"$1\""
+      >   shift
+    end
 
   else
     >   args['{{ arg.name }}']=$1

diff --git a/spec/approvals/examples/repeatable-arg b/spec/approvals/examples/repeatable-arg
@@ -47,3 +47,15 @@ files:
 
 args:
 - ${args[file]} = "file1" "file2"
++ ./upcase file1 file2 file1
+
+files:
+  path: file1:
+  content: content of file1
+  upcase: CONTENT OF FILE1
+  path: file2:
+  content: content of file2
+  upcase: CONTENT OF FILE2
+
+args:
+- ${args[file]} = "file1" "file2"