version: Remove Viper (#6628)
* version: remove viper * Remove home flag gets * fix: tests
This commit is contained in:
+33
-32
@@ -2,49 +2,50 @@ package version
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/viper"
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
|
||||
"github.com/tendermint/tendermint/libs/cli"
|
||||
yaml "gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
const flagLong = "long"
|
||||
|
||||
func init() {
|
||||
Cmd.Flags().Bool(flagLong, false, "Print long version information")
|
||||
}
|
||||
func NewVersionCommand() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "version",
|
||||
Short: "Print the application binary version information",
|
||||
RunE: func(cmd *cobra.Command, _ []string) error {
|
||||
verInfo := NewInfo()
|
||||
|
||||
// Cmd prints out the application's version information passed via build flags.
|
||||
var Cmd = &cobra.Command{
|
||||
Use: "version",
|
||||
Short: "Print the app version",
|
||||
RunE: runVersionCmd,
|
||||
}
|
||||
if long, _ := cmd.Flags().GetBool(flagLong); !long {
|
||||
cmd.Println(verInfo.Version)
|
||||
return nil
|
||||
}
|
||||
|
||||
func runVersionCmd(cmd *cobra.Command, args []string) error {
|
||||
verInfo := NewInfo()
|
||||
var bz []byte
|
||||
var err error
|
||||
|
||||
if !viper.GetBool(flagLong) {
|
||||
cmd.Println(verInfo.Version)
|
||||
return nil
|
||||
output, _ := cmd.Flags().GetString(cli.OutputFlag)
|
||||
switch strings.ToLower(output) {
|
||||
case "json":
|
||||
bz, err = json.Marshal(verInfo)
|
||||
|
||||
default:
|
||||
bz, err = yaml.Marshal(&verInfo)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
cmd.Println(string(bz))
|
||||
return nil
|
||||
},
|
||||
}
|
||||
|
||||
var bz []byte
|
||||
var err error
|
||||
cmd.Flags().Bool(flagLong, false, "Print long version information")
|
||||
cmd.Flags().StringP(cli.OutputFlag, "o", "text", "Output format (text|json)")
|
||||
|
||||
switch viper.GetString(cli.OutputFlag) {
|
||||
case "json":
|
||||
bz, err = json.Marshal(verInfo)
|
||||
default:
|
||||
bz, err = yaml.Marshal(&verInfo)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
cmd.Println(string(bz))
|
||||
return nil
|
||||
return cmd
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user