Refactored 'version' command (scaleway#80)

Author: moul

pkg/cli/version.go

@@ -5,10 +5,8 @@
 package cli
 
 import (
-	"fmt"
-	"runtime"
-
-	"github.com/scaleway/scaleway-cli/pkg/scwversion"
+	"github.com/scaleway/scaleway-cli/pkg/commands"
+	"github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 )
 
 var cmdVersion = &Command{
@@ -25,17 +23,18 @@ func init() {
 // Flags
 var versionHelp bool // -h, --help flag
 
-func runVersion(cmd *Command, args []string) {
+func runVersion(cmd *Command, rawArgs []string) {
 	if versionHelp {
 		cmd.PrintUsage()
 	}
-	if len(args) != 0 {
+	if len(rawArgs) != 0 {
 		cmd.PrintShortUsage()
 	}
 
-	fmt.Printf("Client version: %s\n", scwversion.VERSION)
-	fmt.Printf("Go version (client): %s\n", runtime.Version())
-	fmt.Printf("Git commit (client): %s\n", scwversion.GITCOMMIT)
-	fmt.Printf("OS/Arch (client): %s/%s\n", runtime.GOOS, runtime.GOARCH)
-	// FIXME: API version information
+	args := commands.VersionArgs{}
+	ctx := cmd.GetContext(rawArgs)
+	err := commands.RunVersion(ctx, args)
+	if err != nil {
+		logrus.Fatalf("Cannot execute 'version': %v", err)
+	}
 }

pkg/commands/version.go

@@ -0,0 +1,26 @@
+// 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"
+	"runtime"
+
+	"github.com/scaleway/scaleway-cli/pkg/scwversion"
+)
+
+// VersionArgs are flags for the `RunVersion` function
+type VersionArgs struct{}
+
+// RunVersion is the handler for 'scw version'
+func RunVersion(ctx CommandContext, args VersionArgs) error {
+	fmt.Fprintf(ctx.Stdout, "Client version: %s\n", scwversion.VERSION)
+	fmt.Fprintf(ctx.Stdout, "Go version (client): %s\n", runtime.Version())
+	fmt.Fprintf(ctx.Stdout, "Git commit (client): %s\n", scwversion.GITCOMMIT)
+	fmt.Fprintf(ctx.Stdout, "OS/Arch (client): %s/%s\n", runtime.GOOS, runtime.GOARCH)
+	// FIXME: API version information
+
+	return nil
+}