Merge pull request #312 from DannyBen/fix/repeatable-arg-validation

Fix repeatable arg validation

Author: DannyBen

lib/bashly/views/command/parse_requirements_case_repeatable.gtx

@@ -2,9 +2,8 @@
 
 condition = "if"
 args.each do |arg|
+  = arg.render(:validations)
   > {{ condition }} [[ -z ${args[{{ arg.name }}]+x} ]]; then
-  = arg.render(:validations).indent 2
-
   if arg.repeatable
     >   args[{{ arg.name }}]="\"$1\""
     >   shift

spec/approvals/fixtures/repeatable-arg-validations

@@ -0,0 +1,29 @@
++ bundle exec bashly generate
+creating user files in src
+created src/initialize.sh
+created src/root_command.sh
+created ./cli
+run ./cli --help to test your bash script
++ ./cli
+# this file is located in 'src/root_command.sh'
+# you can edit it freely and regenerate (it will not be overwritten)
+args: none
++ ./cli 1
+# this file is located in 'src/root_command.sh'
+# you can edit it freely and regenerate (it will not be overwritten)
+args:
+- ${args[number]} = "1"
++ ./cli 1 2
+# this file is located in 'src/root_command.sh'
+# you can edit it freely and regenerate (it will not be overwritten)
+args:
+- ${args[number]} = "1" "2"
++ ./cli 1.1
+validation error in NUMBER:
+must be an integer
++ ./cli 1.1 2
+validation error in NUMBER:
+must be an integer
++ ./cli 1 2.2
+validation error in NUMBER:
+must be an integer

spec/fixtures/workspaces/repeatable-arg-validations/.gitignore

@@ -0,0 +1,2 @@
+cli
+src/*.sh

spec/fixtures/workspaces/repeatable-arg-validations/README.md

@@ -0,0 +1,3 @@
+This fixture tests that validations on repeatable args validate all arguments
+**regardless of order**.
+Reference issue: https://github.com/DannyBen/bashly/issues/311

spec/fixtures/workspaces/repeatable-arg-validations/src/bashly.yml

@@ -0,0 +1,7 @@
+name: cli
+help: all arguments must be integers
+
+args:
+- name: number
+  repeatable: true
+  validate: integer

spec/fixtures/workspaces/repeatable-arg-validations/src/lib/validate_integer.sh

@@ -0,0 +1,3 @@
+validate_integer() {
+  [[ "$1" =~ ^[0-9]+$ ]] || echo "must be an integer"
+}

spec/fixtures/workspaces/repeatable-arg-validations/test.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+rm -f ./cli
+rm -f ./src/initialize.sh
+rm -f ./src/root_command.sh
+
+set -x
+
+bundle exec bashly generate
+
+./cli
+./cli 1
+./cli 1 2
+./cli 1.1
+./cli 1.1 2
+./cli 1 2.2