refactoring

cmd/check/check.go

@@ -1,6 +1,7 @@
 package check
 
 import (
+	"cx/pkg/output"
 	"fmt"
 	"github.com/spf13/cobra"
 )
@@ -11,7 +12,9 @@ func NewCmdCheck() *cobra.Command {
 		Short: "check with sub commands",
 		Long:  `choose a check`,
 		Run: func(cmd *cobra.Command, args []string) {
-			fmt.Printf("use %s", cmd.Name())
+			message := fmt.Sprintf("use %s", cmd.Name())
+			output.PrintCliInfo(message)
+
 		},
 	}
 

cmd/check/ghprotection.go

@@ -13,7 +13,8 @@ func NewCmdCGhPtotection() *cobra.Command {
 		Short: "check github protection",
 		Long: `compliance check for github repository protection`,
 		Run: func(cmd *cobra.Command, args []string) {
-			output.PrintCliInfo(fmt.Sprintf("use %s", cmd.Name()))
+			message := fmt.Sprintf("use %s", cmd.Name())
+			output.PrintCliInfo(message)
 
 			compliantState := github.GHRepository{
 				Organisation:   "",

cmd/install.go

@@ -16,6 +16,7 @@ limitations under the License.
 package cmd
 
 import (
+	"cx/pkg/output"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -32,7 +33,9 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("install called")
+		message := fmt.Sprintf("use %s", cmd.Name())
+		output.PrintCliInfo(message)
+
 	},
 }
 

cmd/root.go

@@ -17,13 +17,14 @@ package cmd
 
 import (
 	"cx/cmd/check"
+	"cx/pkg/output"
 	"fmt"
+	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"k8s.io/component-base/logs"
 	"os"
 	"runtime"
-	"k8s.io/component-base/logs"
-	homedir "github.com/mitchellh/go-homedir"
-	"github.com/spf13/viper"
 )
 
 var cfgFile string
@@ -32,7 +33,7 @@ var cfgFile string
 var rootCmd = &cobra.Command{
 	Use:   "cx",
 	Short: "cx componenten installer",
-	Long: `....`,
+	Long:  `....`,
 	// Uncomment the following line if your bare application
 	// has an action associated with it:
 	Run: func(cmd *cobra.Command, args []string) {
@@ -44,7 +45,7 @@ var rootCmd = &cobra.Command{
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
 	if err := rootCmd.Execute(); err != nil {
-		fmt.Println(err)
+		output.PrintCliError(err)
 		os.Exit(1)
 	}
 }
@@ -77,7 +78,7 @@ func initConfig() {
 		// Find home directory.
 		home, err := homedir.Dir()
 		if err != nil {
-			fmt.Println(err)
+			output.PrintCliError(err)
 			os.Exit(1)
 		}
 
@@ -92,13 +93,16 @@ func initConfig() {
 
 	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err == nil {
-		fmt.Println("Using config file:", viper.ConfigFileUsed())
+		output.PrintCliInfo(fmt.Sprintf("Using config file:", viper.ConfigFileUsed()))
 	}
 }
 
 func printInfo() {
-	fmt.Printf("Operating System: %s\nArchitecture: %s\n", runtime.GOOS, runtime.GOARCH)
-	fmt.Println("Check our Sources at https://github.com/Continuous-X/cx")
-	fmt.Println("Get in contact via github issue.....")
-	fmt.Printf("Author: %s", viper.GetString("author"))
+	output.PrintCliInfo(fmt.Sprintf("%s\n%s\n%s\n%s",
+		fmt.Sprintf("Operating System: %s\nArchitecture: %s", runtime.GOOS, runtime.GOARCH),
+		fmt.Sprint("Check our Sources at https://github.com/Continuous-X/cx"),
+		fmt.Sprintf("Get in contact via github issue....."),
+		fmt.Sprintf("Author: %s", viper.GetString("author")),
+	))
+
 }

cmd/uninstall.go

@@ -16,6 +16,7 @@ limitations under the License.
 package cmd
 
 import (
+	"cx/pkg/output"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -32,7 +33,9 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("uninstall called")
+		message := fmt.Sprintf("use %s", cmd.Name())
+		output.PrintCliInfo(message)
+
 	},
 }
 

cmd/update.go

@@ -16,6 +16,7 @@ limitations under the License.
 package cmd
 
 import (
+	"cx/pkg/output"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -32,7 +33,9 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("update called")
+		message := fmt.Sprintf("use %s", cmd.Name())
+		output.PrintCliInfo(message)
+
 	},
 }
 

cmd/upgrade.go

@@ -16,6 +16,7 @@ limitations under the License.
 package cmd
 
 import (
+	"cx/pkg/output"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -32,7 +33,9 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("upgrade called")
+		message := fmt.Sprintf("use %s", cmd.Name())
+		output.PrintCliInfo(message)
+
 	},
 }
 

cmd/version.go

@@ -16,11 +16,13 @@ limitations under the License.
 package cmd
 
 import (
+	error2 "cx/pkg/error"
 	"cx/pkg/versions"
+	"encoding/json"
 	"fmt"
 	"github.com/spf13/cobra"
-	"runtime"
 	"k8s.io/apimachinery/pkg/version"
+	"runtime"
 )
 
 // versionCmd represents the versions command
@@ -34,7 +36,17 @@ Cobra is a CLI library for Go that empowers applications.
 This application is a tool to generate the needed files
 to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		printVersion()
+/*		message := fmt.Sprintf("use %s", cmd.Name())
+		output.PrintCliInfo(message)
+*/
+		versionInfo := get()
+		marshalled, err := json.MarshalIndent(&versionInfo, "", "  ")
+		if err != nil {
+			error2.FailHandleCommand(err)
+		}
+		fmt.Println(string(marshalled))
+
+		//printVersion()
 	},
 }
 
@@ -59,7 +71,7 @@ func printVersion() {
 	fmt.Printf("SHA: %s\n", versions.CommitFromGit)
 }
 
-func Get() version.Info {
+func get() version.Info {
 	return version.Info{
 		Major:        versions.MajorFromGit,
 		Minor:        versions.MinorFromGit,

main.go

@@ -16,19 +16,27 @@ limitations under the License.
 package main
 
 import (
-	"cx/pkg/versions"
 	"cx/cmd"
+	"cx/pkg/versions"
+	"strings"
 )
 
 var (
 	sha1ver   string
 	buildTime string
-	version string
+	version   string
 )
 
 func main() {
 	versions.CommitFromGit = sha1ver
 	versions.VersionFromGit = version
+	versionArray := strings.Split(version, ".")
+	if len(version) > 0 {
+		versions.MajorFromGit = versionArray[0]
+	}
+	if len(version) > 1 {
+		versions.MinorFromGit = versionArray[1]
+	}
 	versions.BuildDate = buildTime
 	cmd.Execute()
 }

pkg/error/error.go

@@ -0,0 +1,9 @@
+package error
+
+import "cx/pkg/output"
+
+func FailHandleCommand(err error)  {
+	if err != nil {
+		output.PrintCliError(err)
+	}
+}

pkg/output/terminal.go

@@ -13,36 +13,34 @@ const (
 	MessageStateError   = "ERROR"
 )
 
-
-
-func PrintCliInfo(msg string)  {
-	PrintYellow(fmt.Sprintf("%s [INFO]: ",MessagePrefixCli))
+func PrintCliInfo(msg string) {
+	PrintYellow(fmt.Sprintf("%s [INFO]: ", MessagePrefixCli))
 	PrintWhite(msg)
 }
 
-func PrintCliWarning(msg string)  {
-	PrintYellow(fmt.Sprintf("%s [WARNING]: ",MessagePrefixCli))
+func PrintCliWarning(msg string) {
+	PrintYellow(fmt.Sprintf("%s [WARNING]: ", MessagePrefixCli))
 	PrintWhite(msg)
 }
 
-func PrintCliError(msg string)  {
-	PrintRed(fmt.Sprintf("%s [ERROR]: ",MessagePrefixCli))
-	PrintWhite(msg)
+func PrintCliError(err error) {
+	PrintRed(fmt.Sprintf("%s [ERROR]: ", MessagePrefixCli))
+	PrintWhite(fmt.Sprintf("%s", err))
 }
 
-func PrintCheckGhProtectionSuccess()  {
+func PrintCheckGhProtectionSuccess() {
 	PrintCommandSuccess(MessagePrefixCommandCheckGhProtection)
 }
 
-func PrintCheckGhProtectionError()  {
+func PrintCheckGhProtectionError() {
 	PrintCommandError(MessagePrefixCommandCheckGhProtection)
 }
 
-func PrintCommandSuccess(command string)  {
+func PrintCommandSuccess(command string) {
 	PrintGreen(fmt.Sprintf("%s: %s", command, MessageStateSuccess))
 }
 
-func PrintCommandError(command string)  {
+func PrintCommandError(command string) {
 	PrintRed(fmt.Sprintf("%s: %s", command, MessageStateError))
 }