Skip to content

Commit f4dc840

Browse files
committed
misc: Changes
1 parent e717b90 commit f4dc840

File tree

4 files changed

+28
-16
lines changed

4 files changed

+28
-16
lines changed

docs/reference.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Reference
2+
3+
## Environment Variables
4+
5+
### `TRACE_BASH_OBJECT_TRAVERSE`
6+
7+
### `TRACE_BASH_OBJECT_PARSE`

pkg/lib/traverse-get.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ bash_object.traverse-get() {
2828
local key="${REPLIES[$i]}"
2929
filter_stack+=("$key")
3030

31+
# TODO: redo filter_stack string, and use stdlib.arrayprint TODO
3132
local oldIFS="$IFS"
3233
IFS='_'
3334
local filter_stack_string="${filter_stack[*]}"
@@ -150,7 +151,7 @@ bash_object.traverse-get() {
150151
# object/array, but got string
151152
# TODO
152153
echo "mu '$key_value'" >&3
153-
return 2
154+
# return 2
154155
elif ((i+1 == ${#REPLIES[@]})); then
155156
local value="${current_object["$key"]}"
156157
if [ "$final_value_type" = object ]; then

tests/e2e.bats

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ load './util/init.sh'
66
local subcmds=(get-string get-array get-object)
77

88
for subcmd in "${subcmds[@]}"; do
9-
declare -A OBJ=()
9+
declare -A OBJECT=()
1010

11-
run bobject "$subcmd" 'OBJ' '.zulu.yankee' 'invalid'
11+
run bobject "$subcmd" 'OBJECT' '.zulu.yankee' 'invalid'
1212

1313
assert_failure
1414
assert_line -p "Incorrect arguments for subcommand '$subcmd'"
@@ -19,7 +19,7 @@ load './util/init.sh'
1919
local subcmds=(get-string get-array get-object)
2020

2121
for subcmd in "${subcmds[@]}"; do
22-
declare -A OBJ=()
22+
declare -A OBJECT=()
2323

2424
run bobject "$subcmd" 'invalid'
2525

@@ -32,9 +32,9 @@ load './util/init.sh'
3232
local subcmds=(set-string set-array set-object)
3333

3434
for subcmd in "${subcmds[@]}"; do
35-
declare -A OBJ=()
35+
declare -A OBJECT=()
3636

37-
run bobject "$subcmd" 'OBJ' '.zulu.yankee' 'xray' 'invalid'
37+
run bobject "$subcmd" 'OBJECT' '.zulu.yankee' 'xray' 'invalid'
3838

3939
assert_failure
4040
assert_line -p "Incorrect arguments for subcommand '$subcmd'"
@@ -45,35 +45,39 @@ load './util/init.sh'
4545
local subcmds=(set-string set-array set-object)
4646

4747
for subcmd in "${subcmds[@]}"; do
48-
declare -A OBJ=()
48+
declare -A OBJECT=()
4949

50-
run bobject "$subcmd" 'OBJ' '.zulu'
50+
run bobject "$subcmd" 'OBJECT' '.zulu'
5151

5252
assert_failure
5353
assert_line -p "Incorrect arguments for subcommand '$subcmd'"
5454
done
5555
}
5656

5757
@test "get-string simple parser" {
58-
declare -A OBJ=()
58+
declare -A OBJECT=()
59+
declare -A subobj=()
5960

60-
bobject set-string 'OBJ' '.zulu.yankee' 'MEOW'
61-
bobject get-string 'OBJ' '.zulu.yankee'
61+
bobject set-object 'OBJECT' '.zulu' subobj
62+
bobject set-string 'OBJECT' '.zulu.yankee' 'MEOW'
63+
bobject get-string 'OBJECT' '.zulu.yankee'
6264

6365
assert [ "$REPLY" = 'MEOW' ]
6466
}
6567

6668
@test "get-string advanced parser" {
67-
declare -A OBJ=()
69+
declare -A OBJECT=()
70+
declare -A subobj=()
6871

69-
bobject set-string 'OBJ' '.["zulu"].["yankee"]' 'MEOW'
70-
bobject get-string 'OBJ' '.["zulu"].["yankee"]'
72+
bobject set-object 'OBJECT' '.zulu' subobj
73+
bobject set-string 'OBJECT' '.["zulu"].["yankee"]' 'MEOW'
74+
bobject get-string 'OBJECT' '.["zulu"].["yankee"]'
7175

7276
assert [ "$REPLY" = 'MEOW' ]
7377
}
7478

7579
@test "readme code works" {
76-
declare -A root_object=()
80+
declare -A root_object=([zulu=])
7781
declare -A zulu_object=([yankee]=)
7882
declare -A yankee_object=([xray]=)
7983
declare -A xray_object=([whiskey]=victor [foxtrot]=)

tests/set.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
load './util/init.sh'
44

55
@test "Error if random variable already exists" {
6-
declare -gA objj=()
6+
declare -A objj=()
77

88
bash_object.util.generate_vobject_name() {
99
REPLY="some_other_var"

0 commit comments

Comments
 (0)