refac(cmd): mergeing, ordering and outsourcing cmd subcommands

cmd/convert/convert.go

@@ -1,8 +1,6 @@
 package convert
 
 import (
-	"log"
-
 	"github.com/go-flucky/flucky/pkg/storage"
 	"github.com/go-flucky/flucky/pkg/storage/logfile"
 
@@ -11,45 +9,47 @@ import (
 
 var (
 	compression bool
-	configFile  *string
 	round       float64
 )
 
-var convertCmd = &cobra.Command{
-	Use:     "convert",
-	Short:   "Convert logfiles into other markup language",
-	Args:    cobra.ExactArgs(2),
-	Example: "flucky convert /var/log/flucky/logfile.json /var/log/flucky/logfile.csv",
-	Run: func(cmd *cobra.Command, args []string) {
+// InitCmd initialize all convert subcommands
+func InitCmd(cmd *cobra.Command) error {
 
-		logfileInput := logfile.New(args[0])
-		measuredValues, err := logfileInput.Read()
-		if err != nil {
-			log.Fatalln(err)
-		}
+	convertCmd := &cobra.Command{
+		Use:     "convert",
+		Short:   "Convert logfiles into other markup language",
+		Args:    cobra.ExactArgs(2),
+		Example: "flucky convert /var/log/flucky/logfile.json /var/log/flucky/logfile.csv",
+		RunE:    run,
+	}
 
-		if round != 0 {
-			storage.Round(measuredValues, round)
-		}
-
-		if compression {
-			measuredValues = storage.Compression(measuredValues)
-		}
-
-		logfileOutput := logfile.New(args[1])
-		err = logfileOutput.Write(measuredValues)
-		if err != nil {
-			log.Fatalln(err)
-		}
-	},
-}
-
-// InitCmd ...
-func InitCmd(cmd *cobra.Command, cnfFile *string) {
-	configFile = cnfFile
-
-	cmd.AddCommand(convertCmd)
 	convertCmd.Flags().BoolVar(&compression, "compression", false, "Compress measured values")
 	convertCmd.Flags().Float64Var(&round, "round", 0, "Round values. The value 0 deactivates the function")
+	cmd.AddCommand(convertCmd)
 
+	return nil
+}
+
+func run(cmd *cobra.Command, args []string) error {
+	logfileInput := logfile.New(args[0])
+	measuredValues, err := logfileInput.Read()
+	if err != nil {
+		return err
+	}
+
+	if round != 0 {
+		storage.Round(measuredValues, round)
+	}
+
+	if compression {
+		measuredValues = storage.Compression(measuredValues)
+	}
+
+	logfileOutput := logfile.New(args[1])
+	err = logfileOutput.Write(measuredValues)
+	if err != nil {
+		return err
+	}
+
+	return nil
 }