mirror of
https://github.com/hybridgroup/gobot.git
synced 2025-04-27 13:48:56 +08:00
all: updates for new gonuts/commander api
This commit is contained in:
parent
7aa11042f1
commit
b4e82b788e
@ -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 {
|
||||
|
@ -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
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user