Allow users to use different directories based of an env var (#11)

Co-authored-by: JButler <[email protected]>

.gitignore

@@ -0,0 +1,2 @@
+testing_dirA/
+testing_dirB/

kv-bash

@@ -37,7 +37,7 @@
 # CONSTANTS
 ########################
 
-KV_USER_DIR="$HOME/.kv-bash"
+default_kv_user_dir="$HOME/.kv-bash"
 
 ########################
 # LOCAL FUNCTIONS
@@ -50,9 +50,11 @@ kv_echo_err() {
 
 # Usage: kv_echo_err_box <err-msg> <function-name>
 kv_echo_err_box() {
+	kv_user_dir=${KV_USER_DIR:-$default_kv_user_dir}
 	kv_echo_err "  +-------------------------------+"
 	kv_echo_err "  | ERROR: $1"
 	kv_echo_err "  | function: $2"
+	kv_echo_err "  | dir: $kv_user_dir"
 	kv_echo_err "  +-------------------------------+"
 }
 
@@ -101,7 +103,8 @@ kvget() {
 		kv_echo_err_box 'invalid param "key"' 'kvget()'
 		return 1
 	}
-	VALUE="$([ -f "$KV_USER_DIR/$key" ] && cat "$KV_USER_DIR/$key")"
+	kv_user_dir=${KV_USER_DIR:-$default_kv_user_dir}
+	VALUE="$([ -f "$kv_user_dir/$key" ] && cat "$kv_user_dir/$key")"
 	echo "$VALUE"
 
 	[ "$VALUE" != "" ]
@@ -115,8 +118,9 @@ kvset() {
 		kv_echo_err_box 'invalid param "key"' 'kvset()'
 		return 1
 	}
-	test -d "$KV_USER_DIR" || mkdir "$KV_USER_DIR"
-	echo "$value" > "$KV_USER_DIR/$key"
+	kv_user_dir=${KV_USER_DIR:-$default_kv_user_dir}
+	test -d "$kv_user_dir" || mkdir "$kv_user_dir"
+	echo "$value" > "$kv_user_dir/$key"
 }
 
 # Usage: kvdel <key>
@@ -126,13 +130,15 @@ kvdel() {
 		kv_echo_err_box 'invalid param "key"' 'kvdel()'
 		return 1
 	}
-	test -f "$KV_USER_DIR/$key" && rm -f "$KV_USER_DIR/$key"
+	kv_user_dir=${KV_USER_DIR:-$default_kv_user_dir}
+	test -f "$kv_user_dir/$key" && rm -f "$kv_user_dir/$key"
 }
 
 # list all key/value pairs to stdout
 # Usage: kvlist
 kvlist() {
-	for i in "$KV_USER_DIR/"*; do
+	kv_user_dir=${KV_USER_DIR:-$default_kv_user_dir}
+	for i in "$kv_user_dir/"*; do
 		if [ -f "$i" ]; then
 			key="$(basename "$i")"
 			echo "$key" "$(kvget "$key")"

kv-test

@@ -8,14 +8,17 @@ FAILED()  { echo -e "[\e[01;31mFAILED\e[0m]"; }
 RESULT()  { [ $? == 0 ] && OK || FAILED; }
 
 TEST_COUNT=0
+test_dirA="./testingdirA"
+test_dirB="./testingdirB"
+KV_USER_DIR="$test_dirA"
 
 # Usage: TESTCASE [description string]
 function TESTCASE() {
     ((TEST_COUNT++))
 	printf "%3s %-50s" "$TEST_COUNT" "$1"
 }
 
-rm -rf "$KV_USER_DIR"
+rm -rf "$test_dirA" "$test_dirB"
 
 echo
 echo RUN ALL TEST CASES:
@@ -92,6 +95,23 @@ TESTCASE 'spaces in value'
 	[ "$(kvget name)" == '  phat  dam  ' ]
 	RESULT
 	kvdel name
+
+TESTCASE 'can change user dir'
+	kvclear
+	kvset Foo Bar
+	KV_USER_DIR="$test_dirB"
+	kvset var1 value1
+	kvset var2 value2
+	kvset var3 value3
+	[ $(kvlist | wc -l) == 3 ]
+	RESULT
+	kvclear
+
+TESTCASE 'can return to old user dir'
+	KV_USER_DIR="$test_dirA"
+	[ $(kvlist | wc -l) == 1 ]
+	RESULT
+	kvclear
 
 #more testcase here