andrew/cmdarg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some broken longopt and helpers related tests

Browse Source
This commit is contained in:
Andrew Kesterson
2014-06-07 22:39:58 -07:00
parent 77bf69ee69
commit aede1cefbe
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmdarg.sh
View File

@@ -169,7 +169,7 @@ function cmdarg_usage
echo "${CMDARG_INFO['header']}" echo "${CMDARG_INFO['header']}"
echo echo
local key local key
if [[ "${#CMDARG_REQUIRED[@]}" -eq 0 ]]; then if [[ "${#CMDARG_REQUIRED[@]}" -ne 0 ]]; then
echo "Required Arguments:" echo "Required Arguments:"
for key in "${CMDARG_REQUIRED[@]}" for key in "${CMDARG_REQUIRED[@]}"
do do
@@ -177,7 +177,7 @@ function cmdarg_usage
done done
echo echo
fi fi
if [[ "${#CMDARG_OPTIONAL[@]}" -eq 0 ]]; then if [[ "${#CMDARG_OPTIONAL[@]}" -ne 0 ]]; then
echo "Optional Arguments": echo "Optional Arguments":
for key in "${CMDARG_OPTIONAL[@]}" for key in "${CMDARG_OPTIONAL[@]}"
do do
@@ -417,11 +417,13 @@ function cmdarg_purge
local arr local arr
arrays="cmdarg_cfg CMDARG CMDARG_REV CMDARG_OPTIONAL CMDARG_REQUIRED" arrays="cmdarg_cfg CMDARG CMDARG_REV CMDARG_OPTIONAL CMDARG_REQUIRED"
arrays="$arrays CMDARG_DESC CMDARG_DEFAULT CMDARG_VALIDATORS CMDARG_INFO" arrays="$arrays CMDARG_DESC CMDARG_DEFAULT CMDARG_VALIDATORS CMDARG_INFO"
arrays="$arrays CMDARG_FLAGS CMDARG_TYPES" arrays="$arrays CMDARG_FLAGS CMDARG_TYPES cmdarg_argv cmdarg_helpers"
for arr in $arrays for arr in $arrays
do do
eval "$arr=()" eval "$arr=()"
done done
cmdarg_helpers['describe']=cmdarg_describe_default
cmdarg_helpers['usage']=cmdarg_usage
CMDARG_GETOPTLIST="h" CMDARG_GETOPTLIST="h"
} }

7
tests/test_helpers.sh
View File

@@ -39,12 +39,12 @@ function shunittest_test_describe_helper
echo "${opt}:${longopt}:${argtype}:${description}:${default}:${flags}:${validator}" echo "${opt}:${longopt}:${argtype}:${description}:${default}:${flags}:${validator}"
} }
cmdarg_helpers['describe']=describe
function parser function parser
{ {
declare -a array declare -a array
declare -A hash declare -A hash
cmdarg_purge cmdarg_purge
cmdarg_helpers['describe']=describe
cmdarg 's:' 'string' 'some string' '12345' always_succeed cmdarg 's:' 'string' 'some string' '12345' always_succeed
cmdarg 'b' 'boolean' 'some boolean' cmdarg 'b' 'boolean' 'some boolean'
cmdarg 'a?[]' 'array' 'some array' cmdarg 'a?[]' 'array' 'some array'
@@ -101,14 +101,13 @@ function shunittest_test_describe_and_usage_helper
done done
} }
cmdarg_helpers['describe']=describe
cmdarg_helpers['usage']=usage
function parser function parser
{ {
declare -a array declare -a array
declare -A hash declare -A hash
cmdarg_purge cmdarg_purge
cmdarg_helpers['describe']=describe
cmdarg_helpers['usage']=usage
cmdarg 's:' 'string' 'some string' '12345' always_succeed cmdarg 's:' 'string' 'some string' '12345' always_succeed
cmdarg 'b' 'boolean' 'some boolean' cmdarg 'b' 'boolean' 'some boolean'
cmdarg 'a?[]' 'array' 'some array' cmdarg 'a?[]' 'array' 'some array'