Refactored 'info' command (scaleway#80)

Author: moul

pkg/cli/info.go

@@ -5,13 +5,8 @@
 package cli
 
 import (
-	"fmt"
-	"os"
-	"runtime"
-
-	"github.com/scaleway/scaleway-cli/vendor/github.com/kardianos/osext"
-
-	"github.com/scaleway/scaleway-cli/pkg/utils"
+	"github.com/scaleway/scaleway-cli/pkg/commands"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 )
 
 var cmdInfo = &Command{
@@ -28,34 +23,18 @@ func init() {
 // Flags
 var infoHelp bool // -h, --help flag
 
-func runInfo(cmd *Command, args []string) {
+func runInfo(cmd *Command, rawArgs []string) {
 	if infoHelp {
 		cmd.PrintUsage()
 	}
-	if len(args) != 0 {
+	if len(rawArgs) != 0 {
 		cmd.PrintShortUsage()
 	}
 
-	// FIXME: fmt.Printf("Servers: %s\n", "quantity")
-	// FIXME: fmt.Printf("Images: %s\n", "quantity")
-	fmt.Printf("Debug mode (client): %v\n", os.Getenv("DEBUG") != "")
-
-	fmt.Printf("Organization: %s\n", cmd.API.Organization)
-	// FIXME: add partially-masked token
-	fmt.Printf("API Endpoint: %s\n", os.Getenv("scaleway_api_endpoint"))
-	configPath, _ := utils.GetConfigFilePath()
-	fmt.Printf("RC file: %s\n", configPath)
-	fmt.Printf("User: %s\n", os.Getenv("USER"))
-	fmt.Printf("CPUs: %d\n", runtime.NumCPU())
-	hostname, _ := os.Hostname()
-	fmt.Printf("Hostname: %s\n", hostname)
-	cliPath, _ := osext.Executable()
-	fmt.Printf("CLI Path: %s\n", cliPath)
-
-	fmt.Printf("Cache: %s\n", cmd.API.Cache.Path)
-	fmt.Printf("  Servers: %d\n", cmd.API.Cache.GetNbServers())
-	fmt.Printf("  Images: %d\n", cmd.API.Cache.GetNbImages())
-	fmt.Printf("  Snapshots: %d\n", cmd.API.Cache.GetNbSnapshots())
-	fmt.Printf("  Volumes: %d\n", cmd.API.Cache.GetNbVolumes())
-	fmt.Printf("  Bootscripts: %d\n", cmd.API.Cache.GetNbBootscripts())
+	args := commands.InfoArgs{}
+	ctx := cmd.GetContext(rawArgs)
+	err := commands.RunInfo(ctx, args)
+	if err != nil {
+		logrus.Fatalf("Cannot execute 'info': %v", err)
+	}
 }

pkg/commands/info.go

@@ -0,0 +1,45 @@
+// Copyright (C) 2015 Scaleway. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE.md file.
+
+package commands
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+
+	"github.com/scaleway/scaleway-cli/vendor/github.com/kardianos/osext"
+
+	"github.com/scaleway/scaleway-cli/pkg/utils"
+)
+
+// InfoArgs are flags for the `RunInfo` function
+type InfoArgs struct{}
+
+// RunInfo is the handler for 'scw info'
+func RunInfo(ctx CommandContext, args InfoArgs) error {
+	// FIXME: fmt.Fprintf(ctx.Stdout, "Servers: %s\n", "quantity")
+	// FIXME: fmt.Fprintf(ctx.Stdout, "Images: %s\n", "quantity")
+	fmt.Fprintf(ctx.Stdout, "Debug mode (client): %v\n", ctx.Getenv("DEBUG") != "")
+
+	fmt.Fprintf(ctx.Stdout, "Organization: %s\n", ctx.API.Organization)
+	// FIXME: add partially-masked token
+	fmt.Fprintf(ctx.Stdout, "API Endpoint: %s\n", ctx.Getenv("scaleway_api_endpoint"))
+	configPath, _ := utils.GetConfigFilePath()
+	fmt.Fprintf(ctx.Stdout, "RC file: %s\n", configPath)
+	fmt.Fprintf(ctx.Stdout, "User: %s\n", ctx.Getenv("USER"))
+	fmt.Fprintf(ctx.Stdout, "CPUs: %d\n", runtime.NumCPU())
+	hostname, _ := os.Hostname()
+	fmt.Fprintf(ctx.Stdout, "Hostname: %s\n", hostname)
+	cliPath, _ := osext.Executable()
+	fmt.Fprintf(ctx.Stdout, "CLI Path: %s\n", cliPath)
+
+	fmt.Fprintf(ctx.Stdout, "Cache: %s\n", ctx.API.Cache.Path)
+	fmt.Fprintf(ctx.Stdout, "  Servers: %d\n", ctx.API.Cache.GetNbServers())
+	fmt.Fprintf(ctx.Stdout, "  Images: %d\n", ctx.API.Cache.GetNbImages())
+	fmt.Fprintf(ctx.Stdout, "  Snapshots: %d\n", ctx.API.Cache.GetNbSnapshots())
+	fmt.Fprintf(ctx.Stdout, "  Volumes: %d\n", ctx.API.Cache.GetNbVolumes())
+	fmt.Fprintf(ctx.Stdout, "  Bootscripts: %d\n", ctx.API.Cache.GetNbBootscripts())
+	return nil
+}