Merge pull request #378 from carlosms/go-cli

Use go-cli lib

Author: carlosms

Gopkg.lock

@@ -8,18 +8,24 @@ import (
 	"github.com/src-d/lookout/dummy"
 	"github.com/src-d/lookout/util/cli"
 	"github.com/src-d/lookout/util/grpchelper"
+
 	"google.golang.org/grpc"
+	gocli "gopkg.in/src-d/go-cli.v0"
 	log "gopkg.in/src-d/go-log.v1"
 	"gopkg.in/src-d/lookout-sdk.v0/pb"
 )
 
 var (
-	version = "local_build_1"
-	app     = cli.New("dummy")
+	name    = "dummy"
+	version = "undefined"
+	build   = "undefined"
 )
 
+var app = gocli.New(name, version, build, "Dummy analyzer for testing")
+
 type ServeCommand struct {
-	cli.CommonOptions
+	gocli.PlainCommand `name:"serve" short-description:"serve the analyzer" long-description:"serve the analyzer"`
+	cli.LogOptions
 	Analyzer         string `long:"analyzer" default:"ipv4://0.0.0.0:9930" env:"LOOKOUT_ANALYZER" description:"gRPC URL to bind the analyzer to"`
 	DataServer       string `long:"data-server" default:"ipv4://localhost:10301" env:"LOOKOUT_DATA_SERVER" description:"gRPC URL of the data server"`
 	RequestUAST      bool   `long:"uast" env:"LOOKOUT_REQUEST_UAST" description:"analyzer will request UAST from the data server"`
@@ -93,10 +99,7 @@ func (c *ServeCommand) initHealthProbes() {
 }
 
 func main() {
-	if _, err := app.AddCommand("serve", "", "",
-		&ServeCommand{}); err != nil {
-		panic(err)
-	}
+	app.AddCommand(&ServeCommand{})
 
 	app.RunMain()
 }

cmd/dummy/main.go

@@ -25,7 +25,7 @@ import (
 )
 
 type EventCommand struct {
-	cli.CommonOptions
+	cli.LogOptions
 	DataServer string `long:"data-server" default:"ipv4://localhost:10301" env:"LOOKOUT_DATA_SERVER" description:"gRPC URL to bind the data server to"`
 	Bblfshd    string `long:"bblfshd" default:"ipv4://localhost:9432" env:"LOOKOUT_BBLFSHD" description:"gRPC URL of the Bblfshd server"`
 	GitDir     string `long:"git-dir" default:"." env:"GIT_DIR" description:"path to the .git directory to analyze"`

cmd/lookout-sdk/event.go

@@ -1,14 +1,14 @@
 package main
 
-import "github.com/src-d/lookout/util/cli"
+import "gopkg.in/src-d/go-cli.v0"
 
 var (
 	name    = "lookout-sdk"
 	version = "undefined"
 	build   = "undefined"
 )
 
-var app = cli.New(name)
+var app = cli.New(name, version, build, "Simplified version of the lookout server that works with a local git repository and does not need access to GitHub")
 
 func main() {
 	app.RunMain()

cmd/lookout-sdk/main.go

@@ -6,23 +6,23 @@ import (
 	"io"
 	"time"
 
-	uuid "github.com/satori/go.uuid"
 	"github.com/src-d/lookout"
 	"github.com/src-d/lookout/server"
 	"github.com/src-d/lookout/store"
+
+	uuid "github.com/satori/go.uuid"
+	gocli "gopkg.in/src-d/go-cli.v0"
 	gogit "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	log "gopkg.in/src-d/go-log.v1"
 )
 
 func init() {
-	if _, err := app.AddCommand("push", "provides simple data server and triggers analyzer", "",
-		&PushCommand{}); err != nil {
-		panic(err)
-	}
+	app.AddCommand(&PushCommand{})
 }
 
 type PushCommand struct {
+	gocli.PlainCommand `name:"push" short-description:"trigger a push event" long-description:"Provides a simple data server and triggers an analyzer push event"`
 	EventCommand
 }
 

cmd/lookout-sdk/push.go

@@ -4,22 +4,21 @@ import (
 	"context"
 	"time"
 
-	uuid "github.com/satori/go.uuid"
-
 	"github.com/src-d/lookout"
 	"github.com/src-d/lookout/server"
 	"github.com/src-d/lookout/store"
+
+	uuid "github.com/satori/go.uuid"
+	gocli "gopkg.in/src-d/go-cli.v0"
 	log "gopkg.in/src-d/go-log.v1"
 )
 
 func init() {
-	if _, err := app.AddCommand("review", "provides simple data server and triggers analyzer", "",
-		&ReviewCommand{}); err != nil {
-		panic(err)
-	}
+	app.AddCommand(&ReviewCommand{})
 }
 
 type ReviewCommand struct {
+	gocli.PlainCommand `name:"review" short-description:"trigger a review event" long-description:"Provides a simple data server and triggers an analyzer review event"`
 	EventCommand
 }
 

cmd/lookout-sdk/review.go

@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-	"os/signal"
 	"runtime"
 	"time"
 
@@ -24,14 +23,14 @@ import (
 	"github.com/src-d/lookout/store/models"
 	"github.com/src-d/lookout/util/cache"
 	"github.com/src-d/lookout/util/cli"
-	"github.com/src-d/lookout/util/ctxlog"
 	"github.com/src-d/lookout/util/grpchelper"
 
 	"github.com/gregjones/httpcache/diskcache"
 	"github.com/jinzhu/copier"
 	"github.com/sanity-io/litter"
 	"google.golang.org/grpc"
 	"gopkg.in/src-d/go-billy.v4/osfs"
+	gocli "gopkg.in/src-d/go-cli.v0"
 	"gopkg.in/src-d/go-log.v1"
 	"gopkg.in/src-d/lookout-sdk.v0/pb"
 	yaml "gopkg.in/yaml.v2"
@@ -42,7 +41,7 @@ type stopFunc func()
 
 // lookoutdCommand represents the common options for serve, watch, work
 type lookoutdCommand struct {
-	cli.CommonOptions
+	cli.LogOptions
 	ConfigFile  string `long:"config" short:"c" default:"config.yml" env:"LOOKOUT_CONFIG_FILE" description:"path to configuration file"`
 	GithubUser  string `long:"github-user" env:"GITHUB_USER" description:"user for the GitHub API"`
 	GithubToken string `long:"github-token" env:"GITHUB_TOKEN" description:"access token for the GitHub API"`
@@ -51,6 +50,17 @@ type lookoutdCommand struct {
 
 	pool           *github.ClientPool
 	probeReadiness bool
+	conf           Config
+}
+
+// Init implements the go-cli initializer interface. Initializes logs
+// and Config file based on the cli options
+func (c *lookoutdCommand) Init(a *gocli.App) error {
+	c.LogOptions.Init(a)
+
+	var err error
+	c.conf, err = c.initConfig()
+	return err
 }
 
 // queueConsumerCommand represents the common options for serve, work
@@ -460,13 +470,3 @@ func (c *queueConsumerCommand) runEventDequeuer(ctx context.Context, qOpt cli.Qu
 
 	return queue_util.RunEventDequeuer(ctx, qOpt.Q, server.HandleEvent, c.Workers)
 }
-
-func stopOnSignal(ctx context.Context) error {
-	var stopSignalChan = make(chan os.Signal)
-	signal.Notify(stopSignalChan, os.Interrupt)
-	sig := <-stopSignalChan
-
-	ctxlog.Get(ctx).Infof("Signal %s received. Stopping server...", sig)
-
-	return nil
-}

cmd/lookout-sdk/version.go

@@ -1,14 +1,14 @@
 package main
 
-import "github.com/src-d/lookout/util/cli"
+import "gopkg.in/src-d/go-cli.v0"
 
 var (
 	name    = "lookoutd"
 	version = "undefined"
 	build   = "undefined"
 )
 
-var app = cli.New(name)
+var app = cli.New(name, version, build, "A service for assisted code review")
 
 func main() {
 	app.RunMain()

cmd/lookoutd/common.go

@@ -5,17 +5,16 @@ import (
 	"github.com/src-d/lookout/util/cli"
 
 	"github.com/golang-migrate/migrate"
+	gocli "gopkg.in/src-d/go-cli.v0"
 	log "gopkg.in/src-d/go-log.v1"
 )
 
 func init() {
-	if _, err := app.AddCommand("migrate", "performs a DB migration up to the latest version", "",
-		&MigrateCommand{}); err != nil {
-		panic(err)
-	}
+	app.AddCommand(&MigrateCommand{})
 }
 
 type MigrateCommand struct {
+	gocli.PlainCommand `name:"migrate" short-description:"performs a DB migration up to the latest version" long-description:"Performs a DB migration up to the latest version"`
 	cli.LogOptions
 	cli.DBOptions
 }