[kvstore] wrap string with spaces (#594)

* [kvstore] wrap string with spaces

lib/kvstore.sh

@@ -19,6 +19,7 @@ kv_set() {
   fi
 }
 
+# get the value, but don't unwrap quotes
 kv_get() {
   if [[ $# -eq 2 ]]; then
     local f=$1
@@ -28,6 +29,15 @@ kv_get() {
   fi
 }
 
+kv_get_escaped() {
+  local value=$(kv_get $1 $2 $3)
+  if [[ $value =~ [[:space:]]+ ]]; then
+    echo "\"$value\""
+  else
+    echo $value
+  fi
+}
+
 kv_keys() {
   local f=$1
   local keys=()
@@ -47,7 +57,7 @@ kv_list() {
 
   kv_keys $f | tr ' ' '\n' | while read -r key; do
     if [[ -n $key ]]; then
-      echo "$key=$(kv_get $f $key)"
+      echo "$key=$(kv_get_escaped $f $key)"
     fi
   done
 }

test/unit

@@ -108,6 +108,16 @@ testKeyValue() {
   assertEquals "" "$(kv_list $store)"
 }
 
+testKeyValueEscaping() {
+  local store=$(mktemp)
+
+  kv_create $store
+
+  kv_set $store "key" "value with a space"
+  assertEquals "key=\"value with a space\"" "$(kv_list $store)"
+  assertEquals "value with a space" "$(kv_get $store "key")"
+}
+
 # if the file doesn't exist, everything should be a no-op
 testKeyValueNoFile() {
   # empty file argument