Commands Infra (#21)

Author: bivas

README.md

@@ -14,17 +14,17 @@ With Rivi, developers can focus on the actual code base and less on administrati
 ## Usage
 Rivi can be run as a service which listens to incoming repository webhooks. This service must be internet facing to accept incoming requests (e.g. GitHub).
 ```
-Usage of rivi:
-  -config string
-    	Bot configuration file(s)
-  -port int
-    	Bot listening port (default 8080)
-  -uri string
-    	Bot URI path (default "/")
+Usage: rivi	server [options] CONFIGURATION_FILE(S)...
+
+	Starts rivi in server mode and listen to incoming webhooks
+
+Options:
+	-port=8080				Listen on port (default: 8080)
+	-uri=/					URI path (default: "/")
 ```
 ### Example
 ```
-$ rivi -port 9000 -config repo-x.yaml -config repo-y.yaml
+$ rivi server -port 9000 repo-x.yaml repo-y.yaml
 ```
 
 ### Docker

bot/bot.go

@@ -139,6 +139,6 @@ func New(configPaths ...string) (Bot, error) {
 	if len(b.configurations) == 0 {
 		return nil, fmt.Errorf("Bot has no readable configuration!")
 	}
-	log.Info("Bot is ready %+v", *b)
+	log.Debug("Bot is ready %+v", *b)
 	return b, nil
 }

commands/commands.go

@@ -0,0 +1,14 @@
+package commands
+
+import (
+	"github.com/mitchellh/cli"
+)
+
+var Commands map[string]cli.CommandFactory = map[string]cli.CommandFactory{
+	"server": func() (cli.Command, error) {
+		return &serverCommand{}, nil
+	},
+	"validate": func() (cli.Command, error) {
+		return &validateCommand{}, nil
+	},
+}

commands/server.go

@@ -0,0 +1,56 @@
+package commands
+
+import (
+	"flag"
+	"github.com/bivas/rivi/bot"
+	"github.com/bivas/rivi/server"
+	"github.com/bivas/rivi/util/log"
+
+	"github.com/mitchellh/cli"
+)
+
+type serverCommand struct {
+	port int
+	uri  string
+}
+
+func (s *serverCommand) Help() string {
+	return `
+Usage: rivi	server [options] CONFIGURATION_FILE(S)...
+
+	Starts rivi in server mode and listen to incoming webhooks
+
+Options:
+	-port=8080				Listen on port (default: 8080)
+	-uri=/					URI path (default: "/")
+`
+}
+
+func (s *serverCommand) Run(args []string) int {
+	flagSet := flag.NewFlagSet("server", flag.ContinueOnError)
+	flagSet.IntVar(&s.port, "port", 8080, "Bot listening port")
+	flagSet.StringVar(&s.uri, "uri", "/", "Bot URI path")
+	if err := flagSet.Parse(args); err != nil {
+		return cli.RunResultHelp
+	}
+	if len(flagSet.Args()) == 0 {
+		log.Error("missing configuration file")
+		return cli.RunResultHelp
+	}
+	run, err := bot.New(flagSet.Args()...)
+	if err != nil {
+		log.ErrorWith(log.MetaFields{log.E(err)}, "Unable to start bot handler")
+		return 1
+	}
+	log.Info("Rivi is ready")
+	srv := server.BotServer{Port: s.port, Uri: s.uri, Bot: run}
+	if err := srv.Run(); err != nil {
+		log.ErrorWith(log.MetaFields{log.E(err)}, "Bot exited with error")
+		return -1
+	}
+	return 0
+}
+
+func (s *serverCommand) Synopsis() string {
+	return "start rivi server"
+}

commands/validate.go

@@ -0,0 +1,48 @@
+package commands
+
+import (
+	"flag"
+	"github.com/bivas/rivi/bot"
+	"github.com/bivas/rivi/util/log"
+	"github.com/mitchellh/cli"
+)
+
+type validateCommand struct {
+}
+
+func (v *validateCommand) Help() string {
+	return `
+Usage: rivi	validate CONFIGURATION_FILE(S)...
+
+	Validate inputted configuration file(s)
+`
+}
+
+func (v *validateCommand) Run(args []string) int {
+	f := flag.NewFlagSet("validate", flag.ContinueOnError)
+	if err := f.Parse(args); err != nil {
+		return cli.RunResultHelp
+	}
+	if len(f.Args()) == 0 {
+		log.Error("Missing configuration files to validate")
+		return cli.RunResultHelp
+	}
+	hadError := false
+	for _, file := range f.Args() {
+		_, err := bot.New(file)
+		if err != nil {
+			log.ErrorWith(log.MetaFields{log.F("config", file), log.E(err)}, "Config file failed")
+			hadError = true
+		} else {
+			log.InfoWith(log.MetaFields{log.F("config", file)}, "Config file passed")
+		}
+	}
+	if hadError {
+		return -1
+	}
+	return 0
+}
+
+func (v *validateCommand) Synopsis() string {
+	return "validate configuration file"
+}

rivi.go

@@ -1,52 +1,23 @@
 package main
 
 import (
-	"flag"
-	"fmt"
 	"os"
 
-	"github.com/bivas/rivi/bot"
-	"github.com/bivas/rivi/server"
-	rivilog "github.com/bivas/rivi/util/log"
-)
-
-type configs []string
-
-func (c *configs) String() string {
-	return fmt.Sprintf("%s", *c)
-}
-
-func (c *configs) Set(value string) error {
-	*c = append(*c, value)
-	return nil
-}
+	"github.com/bivas/rivi/commands"
 
-type botSetup struct {
-	port   int
-	uri    string
-	config configs
-}
+	"github.com/mitchellh/cli"
+)
 
 func main() {
 	logSetup()
-	var setup botSetup
-	flag.IntVar(&setup.port, "port", 8080, "Bot listening port")
-	flag.StringVar(&setup.uri, "uri", "/", "Bot URI path")
-	flag.Var(&setup.config, "config", "Bot configuration file(s)")
-	flag.Parse()
-	if len(setup.config) == 0 {
-		rivilog.Error("missing configuration file")
-		flag.Usage()
-		os.Exit(1)
-	}
-	run, err := bot.New(setup.config...)
-	if err != nil {
-		rivilog.ErrorWith(rivilog.MetaFields{rivilog.E(err)}, "Unable to start bot handler")
-		os.Exit(-1)
-	}
-	s := server.BotServer{Port: setup.port, Uri: setup.uri, Bot: run}
-	if err := s.Run(); err != nil {
-		rivilog.ErrorWith(rivilog.MetaFields{rivilog.E(err)}, "Bot exited with error")
-		os.Exit(-1)
+	c := cli.CLI{
+		Name:         "rivi",
+		Autocomplete: true,
+		Args:         os.Args[1:],
+		Commands:     commands.Commands,
+		HelpFunc:     cli.BasicHelpFunc("rivi"),
+		HelpWriter:   os.Stdout,
 	}
+	exitCode, _ := c.Run()
+	os.Exit(exitCode)
 }