0.1.3

Author: lixiaojun629

Makefile

@@ -1,8 +1,8 @@
-export VERSION=0.1.3beta
+export VERSION=0.1.3
 
 .PHONY : build
 build: 
-	go install && mv ../../../../bin/ucloud-cli ../../../../bin/ucloud
+	go install && mv ../../../../bin/ucloud-cli /usr/local/bin/ucloud
 
 .PHONY : build_mac
 build_mac:

cmd/completion.go

@@ -15,9 +15,7 @@
 package cmd
 
 import (
-	"bytes"
 	"fmt"
-	"io"
 	"os"
 	"os/exec"
 	"regexp"
@@ -30,31 +28,10 @@ import (
 
 // NewCmdCompletion ucloud completion
 func NewCmdCompletion() *cobra.Command {
-	var desc = `Description:
-  On macOS, using bash
-
-  On macOS, you will need to install bash-completion support via Homebrew first:
-  $ ucloud completion
-  $ brew install bash-completion
-  Follow the “caveats” section of brew’s output to add the appropriate bash completion path to your local .bash_profile.
-  and then generate bash completion scripts for ucloud 
-  
-  On Linux, using bash
-  
-  On Linux, you may need to install the bash-completion package which is not installed by default.
-  $ ucloud completion
-  $ yum install bash-completion or apt-get install bash-completion
-  and then genreate bash completion scripts for ucloud 
-  
-  Using zsh
-  > ucloud completion
-  
-  Restart session after auto completion
-`
 	var completionCmd = &cobra.Command{
 		Use:   "completion",
-		Short: "Generates bash/zsh completion scripts",
-		Long:  desc,
+		Short: "Turn on auto completion according to the prompt",
+		Long:  "Turn on auto completion according to the prompt",
 		Run: func(cmd *cobra.Command, args []string) {
 			shell, ok := os.LookupEnv("SHELL")
 			if ok {
@@ -73,32 +50,43 @@ func NewCmdCompletion() *cobra.Command {
 	return completionCmd
 }
 
-var darwinBash = `
-Install bash-completion with command 'brew install bash-completion', and then append the following scripts to ~/.bash_profile
+func bashCompletion(cmd *cobra.Command) {
+	platform := runtime.GOOS
+	if platform == "darwin" {
+		fmt.Println(`Please append 'complete -C /usr/local/bin/ucloud ucloud' to file '~/.bash_profile'
+If the following scripts are included in '~/.bash_profile', please remove it. Those scripts used to auto complete words before ucloud cli v0.1.3"
 
 if [ -f $(brew --prefix)/etc/bash_completion ]; then
   . $(brew --prefix)/etc/bash_completion
 fi
+source ~/.ucloud/ucloud.sh`)
 
-source ~/.ucloud/ucloud.sh
-`
-
-var linuxBash = `
-Ensure your have installed bash-completion, and then append the following scripts to ~/.bashrc
+	} else if platform == "linux" {
+		fmt.Println(`Please append 'complete -C /usr/local/bin/ucloud ucloud' to file '~/.bashrc'
+If the following scripts are included in '~/.bashrc', please remove it. Those scripts used to auto complete words before ucloud cli v0.1.3"
 
 if [ -f /etc/bash_completion ]; then
   . /etc/bash_completion
 fi
 
-source ~/.ucloud/ucloud.sh
-`
+source ~/.ucloud/ucloud.sh`)
+	}
+}
+
+func zshCompletion(cmd *cobra.Command) {
+	fmt.Println(`Please append the following scripts to file '~/.zshrc'.
+autoload -U +X bashcompinit && bashcompinit
+complete -F /usr/local/bin/ucloud ucloud`)
+	fmt.Println("If the following scripts are included in '~/.bash_profile' or '~/.bashrc', please remove it. The scripts used to auto complete words before ucloud cli v0.1.3")
+	fmt.Printf("fpath=(~/%s $fpath)\n", ConfigPath)
+	fmt.Println("autoload -U +X compinit && compinit")
+}
 
 func getBashVersion() (version string, err error) {
 	lookupBashVersion := exec.Command("bash", "-version")
 	out, err := lookupBashVersion.Output()
 	if err != nil {
 		Cxt.PrintErr(err)
-		fmt.Println(err)
 	}
 
 	// Example
@@ -119,201 +107,3 @@ func getBashVersion() (version string, err error) {
 	}
 	return
 }
-
-func bashCompletion(cmd *cobra.Command) {
-	home := GetHomePath()
-	shellPath := home + "/" + ConfigPath + "/ucloud.sh"
-	cmd.GenBashCompletionFile(shellPath)
-	fmt.Printf("Completion scripts has been written to '~/%s/ucloud.sh'\n", ConfigPath)
-
-	platform := runtime.GOOS
-
-	if platform == "darwin" {
-		fmt.Println(darwinBash)
-	} else if platform == "linux" {
-		fmt.Println(linuxBash)
-	}
-}
-
-func zshCompletion(cmd *cobra.Command) {
-	home := GetHomePath()
-	shellPath := home + "/" + ConfigPath + "/_ucloud"
-	file, err := os.Create(shellPath)
-	if err != nil {
-		Cxt.PrintErr(err)
-		return
-	}
-	defer file.Close()
-
-	runCompletionZsh(file, cmd)
-	fmt.Printf("Completion scripts was written to '~/%s/_ucloud'\n", ConfigPath)
-
-	scripts := fmt.Sprintf("fpath=(~/%s $fpath)\n", ConfigPath)
-	scripts += "autoload -U +X compinit && compinit"
-	fmt.Printf("Please append the following scripts to your ~/.zshrc\n%s\n", scripts)
-}
-
-//参考自 k8s.io/kubernetes/pkg/kubectl/cmd/completion.go
-func runCompletionZsh(out io.Writer, cmd *cobra.Command) error {
-	zsh_head := "#compdef ucloud\n"
-
-	out.Write([]byte(zsh_head))
-
-	zsh_initialization := `
-__ucloud_bash_source() {
-	alias shopt=':'
-	alias _expand=_bash_expand
-	alias _complete=_bash_comp
-	emulate -L sh
-	setopt kshglob noshglob braceexpand
-
-	source "$@"
-}
-
-__ucloud_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" = "__ucloud_compopt" ]; then
-			echo builtin
-			return 0
-		fi
-	fi
-	type "$@"
-}
-
-__ucloud_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
-}
-
-__ucloud_compopt() {
-	true # don't do anything. Not supported by bashcompinit in zsh
-}
-
-__ucloud_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
-}
-
-__ucloud_get_comp_words_by_ref() {
-	cur="${COMP_WORDS[COMP_CWORD]}"
-	prev="${COMP_WORDS[${COMP_CWORD}-1]}"
-	words=("${COMP_WORDS[@]}")
-	cword=("${COMP_CWORD[@]}")
-}
-
-__ucloud_filedir() {
-	local RET OLD_IFS w qw
-
-	__ucloud_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="," __ucloud_debug "RET=${RET[@]} len=${#RET[@]}"
-
-	for w in ${RET[@]}; do
-		if [[ ! "${w}" = "${cur}"* ]]; then
-			continue
-		fi
-		if eval "[[ \"\${w}\" = *.$1 || -d \"\${w}\" ]]"; then
-			qw="$(__ucloud_quote "${w}")"
-			if [ -d "${w}" ]; then
-				COMPREPLY+=("${qw}/")
-			else
-				COMPREPLY+=("${qw}")
-			fi
-		fi
-	done
-}
-
-__ucloud_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
-
-__ucloud_convert_bash_to_zsh() {
-	sed \
-	-e 's/declare -F/whence -w/' \
-	-e 's/_get_comp_words_by_ref "\$@"/_get_comp_words_by_ref "\$*"/' \
-	-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}/__ucloud_filedir/g" \
-	-e "s/${LWORD}_get_comp_words_by_ref${RWORD}/__ucloud_get_comp_words_by_ref/g" \
-	-e "s/${LWORD}__ltrim_colon_completions${RWORD}/__ucloud_ltrim_colon_completions/g" \
-	-e "s/${LWORD}compgen${RWORD}/__ucloud_compgen/g" \
-	-e "s/${LWORD}compopt${RWORD}/__ucloud_compopt/g" \
-	-e "s/${LWORD}declare${RWORD}/builtin declare/g" \
-	-e "s/\\\$(type${RWORD}/\$(__ucloud_type/g" \
-	<<'BASH_COMPLETION_EOF'
-`
-	out.Write([]byte(zsh_initialization))
-
-	buf := new(bytes.Buffer)
-	cmd.GenBashCompletion(buf)
-	out.Write(buf.Bytes())
-
-	zsh_tail := `
-BASH_COMPLETION_EOF
-}
-
-__ucloud_bash_source <(__ucloud_convert_bash_to_zsh)
-_complete ucloud 2>/dev/null
-`
-	out.Write([]byte(zsh_tail))
-	return nil
-}

cmd/configure.go

@@ -43,7 +43,6 @@ func NewCmdInit() *cobra.Command {
 		Use:   "init",
 		Short: "Initialize UCloud CLI options",
 		Long:  `Initialize UCloud CLI options such as private-key,public-key,default region,zone and project.`,
-		// Example: "ucloud ; ucloud config set region cn-bj2; ucloud config set project org-xxx",
 		Run: func(cmd *cobra.Command, args []string) {
 			Cxt.Println(configDesc)
 			if len(config.PrivateKey) != 0 && len(config.PublicKey) != 0 {
@@ -113,12 +112,18 @@ func NewCmdConfig() *cobra.Command {
 		Run: func(cmd *cobra.Command, args []string) {
 			tmpCfgVal := reflect.ValueOf(cfg)
 			configVal := reflect.ValueOf(config).Elem()
+			changed := false
 			for i := 0; i < tmpCfgVal.NumField(); i++ {
 				if fieldVal := tmpCfgVal.Field(i).String(); fieldVal != "" {
 					configVal.Field(i).SetString(fieldVal)
+					changed = true
 				}
 			}
-			config.SaveConfig()
+			if changed {
+				config.SaveConfig()
+			} else {
+				cmd.HelpFunc()(cmd, args)
+			}
 		},
 	}
 	flags := cmd.Flags()
@@ -132,14 +137,6 @@ func NewCmdConfig() *cobra.Command {
 	cmd.AddCommand(NewCmdConfigList())
 	cmd.AddCommand(NewCmdConfigClear())
 
-	// originHelpFunc := cmd.HelpFunc()
-
-	// cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
-	// 	rootCmd := cmd.Parent()
-	// 	rootCmd.Flags().MarkHidden("region")
-	// 	rootCmd.Flags().MarkHidden("project-id")
-	// 	originHelpFunc(cmd, args)
-	// })
 	return cmd
 }