remove format from globals

Author: Massimiliano Pippi

cli/cli.go

@@ -33,6 +33,7 @@ import (
 	"github.com/arduino/arduino-cli/cli/generatedocs"
 	"github.com/arduino/arduino-cli/cli/globals"
 	"github.com/arduino/arduino-cli/cli/lib"
+	"github.com/arduino/arduino-cli/cli/output"
 	"github.com/arduino/arduino-cli/cli/sketch"
 	"github.com/arduino/arduino-cli/cli/upload"
 	"github.com/arduino/arduino-cli/cli/version"
@@ -52,9 +53,10 @@ var (
 		PersistentPreRun: preRun,
 	}
 
-	verbose   bool
-	logFile   string
-	logFormat string
+	verbose      bool
+	logFile      string
+	logFormat    string
+	outputFormat string
 )
 
 const (
@@ -83,7 +85,7 @@ func createCliCommandTree(cmd *cobra.Command) {
 	cmd.PersistentFlags().StringVar(&globals.LogLevel, "log-level", defaultLogLevel, "Messages with this level and above will be logged (default: warn).")
 	cmd.PersistentFlags().StringVar(&logFile, "log-file", "", "Path to the file where logs will be written.")
 	cmd.PersistentFlags().StringVar(&logFormat, "log-format", "text", "The output format for the logs, can be [text|json].")
-	cmd.PersistentFlags().StringVar(&globals.OutputFormat, "format", "text", "The output format, can be [text|json].")
+	cmd.PersistentFlags().StringVar(&outputFormat, "format", "text", "The output format, can be [text|json].")
 	cmd.PersistentFlags().StringVar(&globals.YAMLConfigFile, "config-file", "", "The custom config file (if not specified the default will be used).")
 	cmd.PersistentFlags().StringSliceVar(&globals.AdditionalUrls, "additional-urls", []string{}, "Additional URLs for the board manager.")
 }
@@ -115,7 +117,9 @@ func parseFormatString(arg string) (feedback.OutputFormat, bool) {
 
 func preRun(cmd *cobra.Command, args []string) {
 	// normalize the format strings
-	globals.OutputFormat = strings.ToLower(globals.OutputFormat)
+	outputFormat = strings.ToLower(outputFormat)
+	// configure the output package
+	output.OutputFormat = outputFormat
 	logFormat = strings.ToLower(logFormat)
 
 	// should we log to file?
@@ -159,9 +163,9 @@ func preRun(cmd *cobra.Command, args []string) {
 	}
 
 	// check the right output format was passed
-	format, found := parseFormatString(globals.OutputFormat)
+	format, found := parseFormatString(outputFormat)
 	if !found {
-		feedback.Error("Invalid output format: " + globals.OutputFormat)
+		feedback.Error("Invalid output format: " + outputFormat)
 		os.Exit(errorcodes.ErrBadCall)
 	}
 
@@ -174,7 +178,7 @@ func preRun(cmd *cobra.Command, args []string) {
 	logrus.Info("Starting root command preparation (`arduino`)")
 
 	logrus.Info("Formatter set")
-	if globals.OutputFormat != "text" {
+	if outputFormat != "text" {
 		cmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
 			logrus.Warn("Calling help on JSON format")
 			feedback.Error("Invalid Call : should show Help, but it is available only in TEXT mode.")

cli/config/init.go

@@ -40,8 +40,6 @@ func initInitCommand() *cobra.Command {
 		Args: cobra.NoArgs,
 		Run:  runInitCommand,
 	}
-	initCommand.Flags().BoolVar(&initFlags._default, "default", false,
-		"If omitted, ask questions to the user about setting configuration properties, otherwise use default configuration.")
 	initCommand.Flags().StringVar(&initFlags.location, "save-as", "",
 		"Sets where to save the configuration file [default is ./arduino-cli.yaml].")
 	return initCommand
@@ -55,13 +53,6 @@ var initFlags struct {
 func runInitCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino config init`")
 
-	if !initFlags._default {
-		if globals.OutputFormat != "text" {
-			feedback.Error("The interactive mode is supported only in text mode.")
-			os.Exit(errorcodes.ErrBadCall)
-		}
-	}
-
 	filepath := initFlags.location
 	if filepath == "" {
 		filepath = globals.Config.ConfigFile.String()

cli/core/search.go

@@ -25,7 +25,6 @@ import (
 
 	"github.com/arduino/arduino-cli/cli/errorcodes"
 	"github.com/arduino/arduino-cli/cli/feedback"
-	"github.com/arduino/arduino-cli/cli/globals"
 	"github.com/arduino/arduino-cli/cli/instance"
 	"github.com/arduino/arduino-cli/commands/core"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
@@ -51,11 +50,6 @@ func runSearchCommand(cmd *cobra.Command, args []string) {
 	logrus.Info("Executing `arduino core search`")
 
 	arguments := strings.ToLower(strings.Join(args, " "))
-
-	if globals.OutputFormat != "json" {
-		feedback.Printf("Searching for platforms matching '%s'", arguments)
-	}
-
 	resp, err := core.PlatformSearch(context.Background(), &rpc.PlatformSearchReq{
 		Instance:   instance,
 		SearchArgs: arguments,

cli/feedback/exported.go

@@ -68,12 +68,6 @@ func Error(v ...interface{}) {
 	fb.Error(v...)
 }
 
-// PrintJSON is a convenient wrapper to provide feedback by printing the
-// desired output in a pretty JSON format. It adds a newline to the output.
-func PrintJSON(v interface{}) {
-	fb.PrintJSON(v)
-}
-
 // PrintResult is a convenient wrapper to provide feedback for complex data,
 // where the contents can't be just serialized to JSON but requires more
 // structure.

cli/feedback/feedback.go

@@ -88,7 +88,7 @@ func (fb *Feedback) Printf(format string, v ...interface{}) {
 // Print behaves like fmt.Print but writes on the out writer and adds a newline.
 func (fb *Feedback) Print(v interface{}) {
 	if fb.format == JSON {
-		fb.PrintJSON(v)
+		fb.printJSON(v)
 	} else {
 		fmt.Fprintln(fb.out, v)
 	}
@@ -107,9 +107,9 @@ func (fb *Feedback) Error(v ...interface{}) {
 	logrus.Error(fmt.Sprint(v...))
 }
 
-// PrintJSON is a convenient wrapper to provide feedback by printing the
+// printJSON is a convenient wrapper to provide feedback by printing the
 // desired output in a pretty JSON format. It adds a newline to the output.
-func (fb *Feedback) PrintJSON(v interface{}) {
+func (fb *Feedback) printJSON(v interface{}) {
 	if d, err := json.MarshalIndent(v, "", "  "); err != nil {
 		fb.Errorf("Error during JSON encoding of the output: %v", err)
 	} else {
@@ -122,7 +122,7 @@ func (fb *Feedback) PrintJSON(v interface{}) {
 // structure.
 func (fb *Feedback) PrintResult(res Result) {
 	if fb.format == JSON {
-		fb.PrintJSON(res.Data())
+		fb.printJSON(res.Data())
 	} else {
 		fb.Print(fmt.Sprintf("%s", res))
 	}

cli/globals/globals.go

@@ -29,8 +29,6 @@ import (
 var (
 	// Debug determines whether to dump debug output to stderr or not
 	Debug bool
-	// OutputFormat can be "text" or "json"
-	OutputFormat string
 	// HTTPClientHeader is the object that will be propagated to configure the clients inside the downloaders
 	HTTPClientHeader = getHTTPClientHeader()
 	// VersionInfo contains all info injected during build

cli/output/rpc_progress.go

@@ -20,16 +20,18 @@ package output
 import (
 	"fmt"
 
-	"github.com/arduino/arduino-cli/cli/globals"
 	"github.com/arduino/arduino-cli/commands"
 	rpc "github.com/arduino/arduino-cli/rpc/commands"
 	"github.com/cmaglie/pb"
 )
 
+// OutputFormat can be "text" or "json"
+var OutputFormat string
+
 // ProgressBar returns a DownloadProgressCB that prints a progress bar.
 // If JSON output format has been selected, the callback outputs nothing.
 func ProgressBar() commands.DownloadProgressCB {
-	if globals.OutputFormat != "json" {
+	if OutputFormat != "json" {
 		return NewDownloadProgressBarCB()
 	}
 	return func(curr *rpc.DownloadProgress) {
@@ -40,7 +42,7 @@ func ProgressBar() commands.DownloadProgressCB {
 // TaskProgress returns a TaskProgressCB that prints the task progress.
 // If JSON output format has been selected, the callback outputs nothing.
 func TaskProgress() commands.TaskProgressCB {
-	if globals.OutputFormat != "json" {
+	if OutputFormat != "json" {
 		return NewTaskProgressCB()
 	}
 	return func(curr *rpc.TaskProgress) {