This repository has been archived by the owner on May 18, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 224
Provide autocompletion in bash and zsh #117
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,242 @@ | ||
package cmd | ||
|
||
import ( | ||
"bufio" | ||
"bytes" | ||
"os" | ||
|
||
"github.com/spf13/cobra" | ||
) | ||
|
||
func init() { | ||
autocompleteCmd.AddCommand(bashAutocompleteCmd) | ||
autocompleteCmd.AddCommand(zshAutocompleteCmd) | ||
|
||
RootCmd.AddCommand(autocompleteCmd) | ||
} | ||
|
||
var autocompleteCmd = &cobra.Command{ | ||
Use: "completion", | ||
Short: "Output shell completion code for the given shell (bash or zsh)", | ||
Long: ` | ||
Output shell completion code for bash or zsh | ||
This command prints shell code which must be evaluated to provide interactive | ||
completion of aws-okta commands. | ||
|
||
Bash | ||
$ source <(aws-okta completion bash) | ||
will load the aws-okta completion code for bash. Note that this depends on the | ||
bash-completion framework. It must be sourced before sourcing the aws-okta | ||
completion, e.g. on macOS: | ||
$ brew install bash-completion | ||
$ source $(brew --prefix)/etc/bash_completion | ||
$ source <(aws-okta completion bash) | ||
(or, if you want to preserve completion within new terminal sessions) | ||
$ echo 'source <(aws-okta completion bash)' >> ~/.bashrc | ||
|
||
Zsh | ||
$ source <(aws-okta completion zsh) | ||
(or, if you want to preserve completion within new terminal sessions) | ||
$ echo 'source <(aws-okta completion zsh)' >> ~/.zshrc`, | ||
} | ||
|
||
var bashAutocompleteCmd = &cobra.Command{ | ||
Use: "bash", | ||
Short: "Output shell completion code for bash", | ||
Long: ` | ||
Output shell completion code for bash. | ||
This command prints shell code which must be evaluated to provide interactive | ||
completion of aws-okta commands. | ||
$ source <(aws-okta completion bash) | ||
will load the aws-okta completion code for bash. Note that this depends on the | ||
bash-completion framework. It must be sourced before sourcing the aws-okta | ||
completion, e.g. on macOS: | ||
$ brew install bash-completion | ||
$ source $(brew --prefix)/etc/bash_completion | ||
$ source <(aws-okta completion bash) | ||
(or, if you want to preserve completion within new terminal sessions) | ||
$ echo 'source <(aws-okta completion bash)' >> ~/.bashrc`, | ||
RunE: runCompletionBash, | ||
} | ||
|
||
var zshAutocompleteCmd = &cobra.Command{ | ||
Use: "zsh", | ||
Short: "Output shell completion code for zsh", | ||
Long: ` | ||
Output shell completion code for zsh. | ||
This command prints shell code which must be evaluated to provide interactive | ||
completion of aws-okta commands. | ||
$ source <(aws-okta completion zsh) | ||
(or, if you want to preserve completion within new terminal sessions) | ||
$ echo 'source <(aws-okta completion zsh)' >> ~/.zshrc | ||
zsh completions are only supported in versions of zsh >= 5.2`, | ||
RunE: runCompletionZsh, | ||
} | ||
|
||
func runCompletionBash(cmd *cobra.Command, args []string) error { | ||
out := bufio.NewWriter(os.Stdout) | ||
defer out.Flush() | ||
return RootCmd.GenBashCompletion(out) | ||
} | ||
|
||
// Copyright 2016 The Kubernetes Authors. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
func runCompletionZsh(cmd *cobra.Command, args []string) error { | ||
out := bufio.NewWriter(os.Stdout) | ||
defer out.Flush() | ||
zshInitialization := ` | ||
__aws-okta_bash_source() { | ||
nickatsegment marked this conversation as resolved.
Show resolved
Hide resolved
|
||
alias shopt=':' | ||
alias _expand=_bash_expand | ||
alias _complete=_bash_comp | ||
emulate -L sh | ||
setopt kshglob noshglob braceexpand | ||
source "$@" | ||
} | ||
__aws-okta_type() { | ||
# -t is not supported by zsh | ||
if [ "$1" == "-t" ]; then | ||
shift | ||
# fake Bash 4 to disable "complete -o nospace". Instead | ||
# "compopt +-o nospace" is used in the code to toggle trailing | ||
# spaces. We don't support that, but leave trailing spaces on | ||
# all the time | ||
if [ "$1" = "__aws-okta_compopt" ]; then | ||
echo builtin | ||
return 0 | ||
fi | ||
fi | ||
type "$@" | ||
} | ||
__aws-okta_compgen() { | ||
local completions w | ||
completions=( $(compgen "$@") ) || return $? | ||
# filter by given word as prefix | ||
while [[ "$1" = -* && "$1" != -- ]]; do | ||
shift | ||
shift | ||
done | ||
if [[ "$1" == -- ]]; then | ||
shift | ||
fi | ||
for w in "${completions[@]}"; do | ||
if [[ "${w}" = "$1"* ]]; then | ||
echo "${w}" | ||
fi | ||
done | ||
} | ||
__aws-okta_compopt() { | ||
true # don't do anything. Not supported by bashcompinit in zsh | ||
} | ||
__aws-okta_declare() { | ||
if [ "$1" == "-F" ]; then | ||
whence -w "$@" | ||
else | ||
builtin declare "$@" | ||
fi | ||
} | ||
__aws-okta_ltrim_colon_completions() | ||
{ | ||
if [[ "$1" == *:* && "$COMP_WORDBREAKS" == *:* ]]; then | ||
# Remove colon-word prefix from COMPREPLY items | ||
local colon_word=${1%${1##*:}} | ||
local i=${#COMPREPLY[*]} | ||
while [[ $((--i)) -ge 0 ]]; do | ||
COMPREPLY[$i]=${COMPREPLY[$i]#"$colon_word"} | ||
done | ||
fi | ||
} | ||
__aws-okta_get_comp_words_by_ref() { | ||
cur="${COMP_WORDS[COMP_CWORD]}" | ||
prev="${COMP_WORDS[${COMP_CWORD}-1]}" | ||
words=("${COMP_WORDS[@]}") | ||
cword=("${COMP_CWORD[@]}") | ||
} | ||
__aws-okta_filedir() { | ||
local RET OLD_IFS w qw | ||
__debug "_filedir $@ cur=$cur" | ||
if [[ "$1" = \~* ]]; then | ||
# somehow does not work. Maybe, zsh does not call this at all | ||
eval echo "$1" | ||
return 0 | ||
fi | ||
OLD_IFS="$IFS" | ||
IFS=$'\n' | ||
if [ "$1" = "-d" ]; then | ||
shift | ||
RET=( $(compgen -d) ) | ||
else | ||
RET=( $(compgen -f) ) | ||
fi | ||
IFS="$OLD_IFS" | ||
IFS="," __debug "RET=${RET[@]} len=${#RET[@]}" | ||
for w in ${RET[@]}; do | ||
if [[ ! "${w}" = "${cur}"* ]]; then | ||
continue | ||
fi | ||
if eval "[[ \"\${w}\" = *.$1 || -d \"\${w}\" ]]"; then | ||
qw="$(__aws-okta_quote "${w}")" | ||
if [ -d "${w}" ]; then | ||
COMPREPLY+=("${qw}/") | ||
else | ||
COMPREPLY+=("${qw}") | ||
fi | ||
fi | ||
done | ||
} | ||
__aws-okta_quote() { | ||
if [[ $1 == \'* || $1 == \"* ]]; then | ||
# Leave out first character | ||
printf %q "${1:1}" | ||
else | ||
printf %q "$1" | ||
fi | ||
} | ||
autoload -U +X bashcompinit && bashcompinit | ||
# use word boundary patterns for BSD or GNU sed | ||
LWORD='[[:<:]]' | ||
RWORD='[[:>:]]' | ||
if sed --help 2>&1 | grep -q GNU; then | ||
LWORD='\<' | ||
RWORD='\>' | ||
fi | ||
__aws-okta_convert_bash_to_zsh() { | ||
sed \ | ||
-e 's/declare -F/whence -w/' \ | ||
-e 's/local \([a-zA-Z0-9_]*\)=/local \1; \1=/' \ | ||
-e 's/flags+=("\(--.*\)=")/flags+=("\1"); two_word_flags+=("\1")/' \ | ||
-e 's/must_have_one_flag+=("\(--.*\)=")/must_have_one_flag+=("\1")/' \ | ||
-e "s/${LWORD}_filedir${RWORD}/__aws-okta_filedir/g" \ | ||
-e "s/${LWORD}_get_comp_words_by_ref${RWORD}/__aws-okta_get_comp_words_by_ref/g" \ | ||
-e "s/${LWORD}__ltrim_colon_completions${RWORD}/__aws-okta_ltrim_colon_completions/g" \ | ||
-e "s/${LWORD}compgen${RWORD}/__aws-okta_compgen/g" \ | ||
-e "s/${LWORD}compopt${RWORD}/__aws-okta_compopt/g" \ | ||
-e "s/${LWORD}declare${RWORD}/__aws-okta_declare/g" \ | ||
-e "s/\\\$(type${RWORD}/\$(__aws-okta_type/g" \ | ||
<<'BASH_COMPLETION_EOF' | ||
` | ||
out.Write([]byte(zshInitialization)) | ||
|
||
buf := new(bytes.Buffer) | ||
RootCmd.GenBashCompletion(buf) | ||
out.Write(buf.Bytes()) | ||
|
||
zshTail := ` | ||
BASH_COMPLETION_EOF | ||
} | ||
__aws-okta_bash_source <(__aws-okta_convert_bash_to_zsh) | ||
` | ||
out.Write([]byte(zshTail)) | ||
return nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if instead of subcommands, we could do a parameter defaulting to
auto
(the current shell).bash -c 'aws-okta completion'
--> bashbash -c
aws-okta completion bash'` --> bashzsh -c 'aws-okta completion'
--> zshSeems a little bit nicer, but not at all a blocker.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know how you can check this, any suggestion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was thinking of just parsing
$SHELL
. I think that's pretty standard.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
$SHELL doesn't work if you change between shells, only for login shell. Maybe we can iterate it in another pr