[#1041] cmd/*: factor out autocomplet command generation

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-01-11 15:24:06 +03:00 committed by Alex Vanin
parent fe29080ebb
commit efabffbfd0
4 changed files with 69 additions and 114 deletions

View file

@ -1,58 +0,0 @@
package modules
import (
"os"
"github.com/spf13/cobra"
)
var completionCmd = &cobra.Command{
Use: "completion [bash|zsh|fish|powershell]",
Short: "Generate completion script",
Long: `To load completions:
Bash:
$ source <(neofs-adm completion bash)
# To load completions for each session, execute once:
Linux:
$ neofs-adm completion bash > /etc/bash_completion.d/neofs-adm
MacOS:
$ neofs-adm completion bash > /usr/local/etc/bash_completion.d/neofs-adm
Zsh:
# If shell completion is not already enabled in your environment you will need
# to enable it. You can execute the following once:
$ echo "autoload -U compinit; compinit" >> ~/.zshrc
# To load completions for each session, execute once:
$ neofs-adm completion zsh > "${fpath[1]}/_neofs-adm"
# You will need to start a new shell for this setup to take effect.
Fish:
$ neofs-adm completion fish | source
# To load completions for each session, execute once:
$ neofs-adm completion fish > ~/.config/fish/completions/neofs-adm.fish
`,
DisableFlagsInUseLine: true,
ValidArgs: []string{"bash", "zsh", "fish", "powershell"},
Args: cobra.ExactValidArgs(1),
Run: func(cmd *cobra.Command, args []string) {
switch args[0] {
case "bash":
_ = cmd.Root().GenBashCompletion(os.Stdout)
case "zsh":
_ = cmd.Root().GenZshCompletion(os.Stdout)
case "fish":
_ = cmd.Root().GenFishCompletion(os.Stdout, true)
case "powershell":
_ = cmd.Root().GenPowerShellCompletion(os.Stdout)
}
},
}

View file

@ -6,6 +6,7 @@ import (
"github.com/nspcc-dev/neofs-node/cmd/neofs-adm/internal/modules/config"
"github.com/nspcc-dev/neofs-node/cmd/neofs-adm/internal/modules/morph"
"github.com/nspcc-dev/neofs-node/misc"
"github.com/nspcc-dev/neofs-node/pkg/util/autocomplete"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)
@ -34,7 +35,7 @@ func init() {
rootCmd.AddCommand(config.RootCmd)
rootCmd.AddCommand(morph.RootCmd)
rootCmd.AddCommand(completionCmd)
rootCmd.AddCommand(autocomplete.Command("neofs-adm"))
}
func Execute() error {

View file

@ -1,62 +1,9 @@
package cmd
import (
"os"
"github.com/spf13/cobra"
"github.com/nspcc-dev/neofs-node/pkg/util/autocomplete"
)
var completionCmd = &cobra.Command{
Use: "completion [bash|zsh|fish|powershell]",
Short: "Generate completion script",
Long: `To load completions:
Bash:
$ source <(neofs-cli completion bash)
# To load completions for each session, execute once:
Linux:
$ neofs-cli completion bash > /etc/bash_completion.d/neofs-cli
MacOS:
$ neofs-cli completion bash > /usr/local/etc/bash_completion.d/neofs-cli
Zsh:
# If shell completion is not already enabled in your environment you will need
# to enable it. You can execute the following once:
$ echo "autoload -U compinit; compinit" >> ~/.zshrc
# To load completions for each session, execute once:
$ neofs-cli completion zsh > "${fpath[1]}/_neofs-cli"
# You will need to start a new shell for this setup to take effect.
Fish:
$ neofs-cli completion fish | source
# To load completions for each session, execute once:
$ neofs-cli completion fish > ~/.config/fish/completions/neofs-cli.fish
`,
DisableFlagsInUseLine: true,
ValidArgs: []string{"bash", "zsh", "fish", "powershell"},
Args: cobra.ExactValidArgs(1),
Run: func(cmd *cobra.Command, args []string) {
switch args[0] {
case "bash":
_ = cmd.Root().GenBashCompletion(os.Stdout)
case "zsh":
_ = cmd.Root().GenZshCompletion(os.Stdout)
case "fish":
_ = cmd.Root().GenFishCompletion(os.Stdout, true)
case "powershell":
_ = cmd.Root().GenPowerShellCompletion(os.Stdout)
}
},
}
func init() {
rootCmd.AddCommand(completionCmd)
rootCmd.AddCommand(autocomplete.Command("neofs-cli"))
}

View file

@ -0,0 +1,65 @@
package autocomplete
import (
"fmt"
"os"
"github.com/spf13/cobra"
)
const longHelpTemplate = `To load completions:
Bash:
$ source <(%s completion bash)
# To load completions for each session, execute once:
Linux:
$ %s completion bash > /etc/bash_completion.d/%s
MacOS:
$ %s completion bash > /usr/local/etc/bash_completion.d/%s
Zsh:
# If shell completion is not already enabled in your environment you will need
# to enable it. You can execute the following once:
$ echo "autoload -U compinit; compinit" >> ~/.zshrc
# To load completions for each session, execute once:
$ %s completion zsh > "${fpath[1]}/_%s"
# You will need to start a new shell for this setup to take effect.
Fish:
$ %s completion fish | source
# To load completions for each session, execute once:
$ %s completion fish > ~/.config/fish/completions/%s.fish
`
// Command returns cobra command structure for autocomplete routine.
func Command(name string) *cobra.Command {
return &cobra.Command{
Use: "completion [bash|zsh|fish|powershell]",
Short: "Generate completion script",
Long: fmt.Sprintf(longHelpTemplate,
name, name, name, name, name, name, name, name, name, name),
DisableFlagsInUseLine: true,
ValidArgs: []string{"bash", "zsh", "fish", "powershell"},
Args: cobra.ExactValidArgs(1),
Run: func(cmd *cobra.Command, args []string) {
switch args[0] {
case "bash":
_ = cmd.Root().GenBashCompletion(os.Stdout)
case "zsh":
_ = cmd.Root().GenZshCompletion(os.Stdout)
case "fish":
_ = cmd.Root().GenFishCompletion(os.Stdout, true)
case "powershell":
_ = cmd.Root().GenPowerShellCompletion(os.Stdout)
}
},
}
}