test: fix tests

Author: hyperupcall

bin/args-init

@@ -8,5 +8,5 @@ unset -v _args_readlink
 ARGS_ROOT_DIR="${ARGS_ROOT_DIR%/*}"
 ARGS_ROOT_DIR="${ARGS_ROOT_DIR%/*}"
 
-source "$ARGS_ROOT_DIR/lib/args-parse.sh"
 source "$ARGS_ROOT_DIR/lib/util/util.sh"
+source "$ARGS_ROOT_DIR/lib/args-parse.sh"

lib/args-parse.sh

@@ -282,6 +282,8 @@ args.parse() {
 	# use argsAllFlags to ensure no invalid arguments
 	for arg; do
 		case "$arg" in
+		-) ;;
+		--) break ;;
 		-*)
 			local isValidFlag=no
 			for flag in "${argsAllFlags[@]}"; do
@@ -292,11 +294,10 @@ args.parse() {
 			done
 
 			if [ "$isValidFlag" = no ]; then
-				die "args.parse: Flag '$arg' is not accepted"
+				args.util.die "args.parse: Flag '$arg' is not accepted"
 				return
 			fi
 		esac
-
 	done
 
 	# generate argsHelpText
@@ -307,7 +308,7 @@ args.parse() {
 
 	# TODO: description can wrap around incorrectly
 	local descriptionOutput=
-	if [ -n "$description" ]; then
+	if [ -n "${description:-}" ]; then
 		printf -v descriptionOutput "\nDescription:\n"
 	fi
 
@@ -322,6 +323,7 @@ args.parse() {
 		fi
 	fi
 
+	argumentOutput=
 	if [ "${#argsHelpArrayArgs[@]}" -gt 0 ]; then
 		printf -v argumentOutput "\nArguments:\n%s" "${argsHelpArrayArgs[*]}"
 	fi

test/args.bats

@@ -59,7 +59,7 @@ source ./bin/args-init
 @test "longOption and default" {
 	declare -A args=()
 
-	args.parse - <<-'EOF'
+	args.parse <<-'EOF'
 	@flag [port] {3000} - The port to open on
 	EOF
 
@@ -105,6 +105,7 @@ source ./bin/args-init
 	(
 		args.parse --port --something nother <<-'EOF'
 		@flag <port> - The port to open on
+		@flag <something> - something
 		EOF
 	)
 }

test/argsCommands.bats

@@ -21,8 +21,10 @@ source ./bin/args-init
 	declare -A args
 	declare -a argsCommands=()
 
-	args.parse --port 3005 serve --user admin now --enable-security <<-'EOF'
+	args.parse --port 3005 serve --user admin --enable-security now <<-'EOF'
 	@flag [port.p] {3000} - The port to open on
+	@flag [user] {} - User
+	@flag [enable-security] - Enable security
 	EOF
 
 	[[ "${#argsCommands[@]}" = 2 ]]