From b4e82b788e817a13ebfb2e329beb3045361dd9d9 Mon Sep 17 00:00:00 2001
From: Sebastien Binet <binet@cern.ch>
Date: Thu, 19 Dec 2013 14:19:22 +0100
Subject: [PATCH] all: updates for new gonuts/commander api

---
 gobot/generate.go | 11 ++++++-----
 gobot/main.go     | 23 ++++++++---------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/gobot/generate.go b/gobot/generate.go
index ed92f48b..bcaa310a 100644
--- a/gobot/generate.go
+++ b/gobot/generate.go
@@ -2,11 +2,12 @@ package main
 
 import (
 	"fmt"
-	"github.com/gonuts/commander"
-	"github.com/gonuts/flag"
 	"os"
 	"text/template"
 	"unicode"
+
+	"github.com/gonuts/commander"
+	"github.com/gonuts/flag"
 )
 
 func generate() *commander.Command {
@@ -29,10 +30,10 @@ type Generate struct {
 	Name string
 }
 
-func doGenerate(cmd *commander.Command, args []string) {
+func doGenerate(cmd *commander.Command, args []string) error {
 	if len(args) == 0 {
 		fmt.Println(cmd.Long)
-		return
+		return nil
 	}
 	pwd, _ := os.Getwd()
 	dir := fmt.Sprintf("%s/gobot-%s", pwd, args[0])
@@ -69,7 +70,7 @@ func doGenerate(cmd *commander.Command, args []string) {
 	}
 	driver, _ := template.New("").Parse(driver())
 	driver.Execute(f, name)
-	f.Close()
+	return f.Close()
 }
 
 func adaptor() string {
diff --git a/gobot/main.go b/gobot/main.go
index 5174585c..59d82696 100644
--- a/gobot/main.go
+++ b/gobot/main.go
@@ -2,36 +2,29 @@ package main
 
 import (
 	"fmt"
+	"os"
+
 	"github.com/gonuts/commander"
 	"github.com/gonuts/flag"
-	"os"
 )
 
-var g_cmd *commander.Commander
+var g_cmd *commander.Command
 
 func init() {
-	g_cmd = &commander.Commander{
-		Name: os.Args[0],
-		Commands: []*commander.Command{
+	g_cmd = &commander.Command{
+		UsageLine: "gobot <command>",
+		Subcommands: []*commander.Command{
 			generate(),
 		},
-		Flag: flag.NewFlagSet("gobot", flag.ExitOnError),
+		Flag: *flag.NewFlagSet("gobot", flag.ExitOnError),
 	}
 }
 
 func main() {
-	err := g_cmd.Flag.Parse(os.Args[1:])
+	err := g_cmd.Dispatch(os.Args[1:])
 	if err != nil {
 		fmt.Printf("**err**: %v\n", err)
 		os.Exit(1)
 	}
-
-	args := g_cmd.Flag.Args()
-	err = g_cmd.Run(args)
-	if err != nil {
-		fmt.Printf("**err**: %v\n", err)
-		os.Exit(1)
-	}
-
 	return
 }