Merge pull request #216 from hpe-container-platform-community/cli_k8sworker

autocompletion improvements

Author: snowch

.vscode/settings.json

@@ -26,10 +26,11 @@
     ],
     "python.linting.enabled": true,
     "python.formatting.provider": "black",
-    "python.pythonPath": "/bin/python3",
+    "python.formatting.blackPath": "/bin/black",
+    "python.pythonPath": "/usr/bin/python3.5",
     "python.envFile": "${workspaceFolder}/gitpod.env",
     "editor.formatOnSave": true,
     "files.insertFinalNewline": true,
     "git.alwaysSignOff": true,
     "autoDocstring.docstringFormat": "numpy"
-}
+}

README.md

@@ -9,7 +9,7 @@
 
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/hpe-container-platform-community/hpecp-python-library)
 [![Good first issues open](https://img.shields.io/github/issues/hpe-container-platform-community/hpecp-python-library/good%20first%20issue.svg?label=good%20first%20issue)](https://github.com/hpe-container-platform-community/hpecp-python-library/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
-
+ 
 
 
 ----

bin/cli.py

@@ -1647,36 +1647,120 @@ def bash(self,):
                 cur=${COMP_WORDS[COMP_CWORD]}
                 prev=${COMP_WORDS[COMP_CWORD-1]}
 
-                COMP_WORDS_AS_STRING=$(IFS=. ; echo "${COMP_WORDS[*]}")
+                MODULE=${COMP_WORDS[1]}
 
-                # if the last parameter was --*file
-                if echo "${prev}" | grep -q '\-\-.*file$'
-                then
-                    _filedir;
-                    return
-                fi
+                COMP_WORDS_AS_STRING=$(IFS=. ; echo "${COMP_WORDS[*]}")
 
+                # if last input was > for redirecting to a file
+                # perform file and directory autocompletion
                 if echo "${prev}" | grep -q '>'
                 then
                     _filedir;
                     return
                 fi
 
+                # from: https://stackoverflow.com/a/58221008/1033422
+
+                declare -A MODULE_COLUMNS=(
+                    {% for module_name in modules %}
+                        {% set column_names = " ".join(columns[module_name]) %}
+                        ['{{module_name}}']="{{column_names}}"
+                    {% endfor %}
+                )
+
                 {% raw %}
-                for (( idx=${#COMP_WORDS[@]}-1 ; idx>=0 ; idx-- )) ; do
-                    item="${COMP_WORDS[idx]}"
-                    if [[ "${item:0:2}" == "--" ]]; then
-                        if [[ "${item}" == "--columns" ]]
+                # list has uniform behaviour as it is implemented in BaseProxy
+                if [[ "${COMP_WORDS[2]}" == "list" ]];
+                then
+
+                    # if 'list' was the last word
+                    if [[ "${prev}" == "list" ]];
+                    then
+                        COMPREPLY=( $(compgen -W "--columns --query" -- $cur) )
+                        return
+                    fi
+
+                    # FIXME: https://unix.stackexchange.com/questions/124539/bash-completion-for-comma-separated-values
+
+                    # '--columns' was the last word and user is entering column names
+                    if [[ "${COMP_WORDS[3]}" == "--columns"* && ${#COMP_WORDS[@]} -le 5 ]];
+                    then
+                        declare -a COLUMNS=(${MODULE_COLUMNS[$MODULE]})
+
+                        local realcur prefix
+                        realcur=${cur##*,} # everything after the last comma, e.g. a,b,c,d -> d
+                        prefix=${cur%,*}   # everything before the lat comma, e.g. a,b,c,d -> a,b,c
+
+                        if [[ "$cur" == *,* ]];
+                        then
+                            IFS=',' ENTERED_COLUMNS_LIST=($prefix)
+                            unset IFS
+                        else
+                            IFS=',' ENTERED_COLUMNS_LIST=($prev)
+                            unset IFS
+                        fi
+
+                        for COLUMN in ${COLUMNS[@]}; do
+                            for ENTERED_COLUMN in ${ENTERED_COLUMNS_LIST[@]}; do
+                                if [[ "${ENTERED_COLUMN}" == "${COLUMN}" ]]
+                                then
+                                    # remove columns already entered by user
+                                    COLUMNS=(${COLUMNS[*]//$ENTERED_COLUMN/})
+                                fi
+                            done
+                        done
+
+                        if [[ "$cur" == *,* ]];
                         then
-                            LAST_PARAM_IS_COLUMNS=1
+                            COMPREPLY=( $(compgen -W "${COLUMNS[*]}" -P "${prefix}," -S "," -- ${realcur}) )
+                            compopt -o nospace
+                            return
                         else
-                            LAST_PARAM_IS_COLUMNS=0
+                            COMPREPLY=( $(compgen -W "${COLUMNS[*]}" -S "," -- ${realcur}) )
+                            compopt -o nospace
+                            return
                         fi
-                        break
                     fi
-                done
+
+                    # user has finished entering column list or query
+                    if [[ ${#COMP_WORDS[@]} == 6 ]];
+                    then
+                        COMPREPLY=( $(compgen -W "--output" -- $cur) )
+                        return
+                    fi
+
+                    if [[ "${COMP_WORDS[5]}" == "--output"*  ]];
+                    then
+                        if [[ "${COMP_WORDS[3]}" == "--columns"*  ]];
+                        then
+                            COMPREPLY=( $(compgen -W "table text" -- $cur) )
+                            return
+                        else
+                            COMPREPLY=( $(compgen -W "json json-pp text" -- $cur) )
+                            return
+                        fi
+                    fi
+
+                    return
+                fi
                 {% endraw %}
 
+                # if the last parameter was --*file perform
+                # file and directory autocompletion
+                if echo "${prev}" | grep -q '\-\-.*file$'
+                then
+                    _filedir;
+                    return
+                fi
+
+                # if last input was > for redirecting to a file
+                # perform file and directory autocompletion
+                if echo "${prev}" | grep -q '>'
+                then
+                    _filedir;
+                    return
+                fi
+
                 case "$COMP_WORDS_AS_STRING" in
 
                 {% set module_names = " ".join(modules.keys()) %}
@@ -1685,27 +1769,7 @@ def bash(self,):
                     {% for function_name in modules[module_name] %}
                         {% set param_names = " ".join(modules[module_name][function_name]).replace('_', '-') %}
                         {% if function_name == "list" %}
-                    *"hpecp.{{module_name}}.{{function_name.replace('_', '-')}}."*)
-                        PARAM_NAMES="{{param_names}}"
-                        for PARAM in ${PARAM_NAMES[@]}; do
-                            PARAM="${PARAM//'\'}"
-                            for WORD in ${COMP_WORDS[@]}; do
-                                if [[ "${WORD}" == "${PARAM}" ]]
-                                then
-                                    # remove parameters already entered by user
-                                    PARAM_NAMES=${PARAM_NAMES//$WORD/}
-                                fi
-                            done
-                        done
-                        if [[ $LAST_PARAM_IS_COLUMNS == 1 ]]
-                        then
-                            {% set column_names = " ".join(columns[module_name]) %}
-                            COMPREPLY=( $(compgen -W "{{column_names}}" -- $cur) )
-                            COMPREPLY+=( $(compgen -W "$PARAM_NAMES" -- $cur) )
-                        else
-                            COMPREPLY=( $(compgen -W "$PARAM_NAMES" -- $cur) )
-                        fi
-                        ;;
+                            # do nothing - already handled above
                         {% else %}
                     *"hpecp.{{module_name}}.{{function_name.replace('_', '-')}}."*)
                         PARAM_NAMES="{{param_names}}"