Merge pull request #1027 from scop/feat/dict-nounset

fix(dict): nounset error when host/port not set

Author: scop

bash_completion

@@ -925,6 +925,9 @@ _comp_get_words()
         upargs+=(-v "$vprev" "${words[cword - 1]}")
     }
     [[ $vwords ]] && {
+        # Note: bash < 4.4 has a bug that all the elements are connected with
+        # ${v+"$@"} when IFS does not contain whitespace.
+        local IFS=$' \t\n'
         upvars+=("$vwords")
         upargs+=(-a"${#words[@]}" "$vwords" ${words+"${words[@]}"})
     }
@@ -1073,7 +1076,7 @@ _comp_compgen_filedir()
     fi
 
     # Note: bash < 4.4 has a bug that all the elements are connected with
-    # ${v-"${a[@]}"} when IFS does not contain whitespace.
+    # ${v+"${a[@]}"} when IFS does not contain whitespace.
     local IFS=$' \t\n'
     local -a _tmp=(${toks[@]+"${toks[@]}"})
     _comp_unlocal toks

completions/dict

@@ -3,8 +3,7 @@
 # TODO:API: rename per conventions, rework to use vars rather than outputting
 _dictdata()
 {
-    # shellcheck disable=SC2086
-    dict $host $port $1 2>/dev/null | command sed -ne \
+    dict "$@" 2>/dev/null | command sed -ne \
         's/^[[:blank:]]\{1,\}\([^[:blank:]]*\).*$/\1/p'
 }
 
@@ -13,23 +12,24 @@ _comp_cmd_dict()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    local host port db i
+    local -a dict_options=()
+    local host="" port="" db i
 
     local noargopts='!(-*|*[hpdis]*)'
     for ((i = 1; i < cword; i++)); do
         # shellcheck disable=SC2254
         case ${words[i]} in
             --host | -${noargopts}h)
                 host=${words[++i]}
-                [[ $host ]] && host="-h $host"
+                [[ $host ]] && dict_options+=(-h "$host")
                 ;;
             --port | -${noargopts}p)
                 port=${words[++i]}
-                [[ $port ]] && port="-p $port"
+                [[ $port ]] && dict_options+=(-p "$port")
                 ;;
             --database | -${noargopts}d)
                 db=${words[++i]}
-                [[ $db ]] && host="-d $db"
+                [[ $db ]] && dict_options+=(-d "$db")
                 ;;
         esac
     done
@@ -42,11 +42,11 @@ _comp_cmd_dict()
     # shellcheck disable=SC2254
     case $prev in
         --database | -info | -${noargopts}[di])
-            _comp_compgen_split -- "$(_dictdata -D)"
+            _comp_compgen_split -- "$(_dictdata ${dict_options[@]+"${dict_options[@]}"} -D)"
             return
             ;;
         --strategy | -${noargopts}s)
-            _comp_compgen_split -- "$(_dictdata -S)"
+            _comp_compgen_split -- "$(_dictdata ${dict_options[@]+"${dict_options[@]}"} -S)"
             return
             ;;
     esac

test/t/test_dict.py

@@ -1,7 +1,31 @@
+import os
+
 import pytest
 
 
 class TestDict:
     @pytest.mark.complete("dict -", require_cmd=True)
     def test_1(self, completion):
         assert completion
+
+    @pytest.mark.xfail(
+        os.environ.get("NETWORK") == "none",
+        reason="The database list is unavailable without network",
+    )
+    @pytest.mark.complete("dict --database ", require_cmd=True)
+    def test_database(self, completion):
+        # Ensure the directory name "__load_completion/" not generated because
+        # filenames in the current dictory (i.e., test/fixtures) are generated
+        # by "-o default" when "_comp_cmd_dict" fails to generate any
+        # completions.
+        assert completion and "__load_completion/" not in completion
+
+    @pytest.mark.xfail(
+        os.environ.get("NETWORK") == "none",
+        reason="The database list is unavailable without network",
+    )
+    @pytest.mark.complete(
+        "dict -h dict.org --database ", require_cmd=True, env=dict(IFS="")
+    )
+    def test_database_IFS(self, completion):
+        assert completion and "__load_completion/" not in completion