Merge pull request #389 from erizocosmico/fix/version-cmd

cmd/gitbase: fix version and build info

Author: ajnavarro

cmd/gitbase/command/server.go

@@ -47,6 +47,8 @@ type Server struct {
 	ReadOnly      bool     `short:"r" long:"readonly" description:"Only allow read queries. This disables creating and deleting indexes as well." env:"GITBASE_READONLY"`
 	// SkipGitErrors disables failing when Git errors are found.
 	SkipGitErrors bool
+	// Version of the application.
+	Version string
 
 	engine *sqle.Engine
 	pool   *gitbase.RepositoryPool
@@ -137,7 +139,7 @@ func (c *Server) buildDatabase() error {
 			ab = ab.ReadOnly()
 		}
 		a := ab.Build()
-		c.engine = sqle.New(catalog, a, version)
+		c.engine = sqle.New(catalog, a, c.Version)
 	}
 
 	c.pool = gitbase.NewRepositoryPool()

cmd/gitbase/command/version.go

@@ -7,20 +7,19 @@ const (
 	VersionHelp        = VersionDescription
 )
 
-var (
-	version = "undefined"
-	build   = "undefined"
-)
-
 // Version represents the `version` command of gitbase cli tool.
 type Version struct {
 	// Name of the cli binary
 	Name string
+	// Version of the cli binary
+	Version string
+	// Build of the cli binary
+	Build string
 }
 
 // Execute prints the build information provided by the compilation tools, it
 // honors the go-flags.Commander interface.
 func (c *Version) Execute(args []string) error {
-	fmt.Printf("%s (%s) - build %s\n", c.Name, version, build)
+	fmt.Printf("%s (%s) - build %s\n", c.Name, c.Version, c.Build)
 	return nil
 }

cmd/gitbase/main.go

@@ -10,7 +10,9 @@ import (
 )
 
 const (
-	name = "gitbase"
+	name    = "gitbase"
+	version = "undefined"
+	build   = "undefined"
 )
 
 func main() {
@@ -19,14 +21,17 @@ func main() {
 	_, err := parser.AddCommand("server", command.ServerDescription, command.ServerHelp,
 		&command.Server{
 			SkipGitErrors: os.Getenv("GITBASE_SKIP_GIT_ERRORS") != "",
+			Version:       version,
 		})
 	if err != nil {
 		logrus.Fatal(err)
 	}
 
 	_, err = parser.AddCommand("version", command.VersionDescription, command.VersionHelp,
 		&command.Version{
-			Name: name,
+			Name:    name,
+			Version: version,
+			Build:   build,
 		})
 	if err != nil {
 		logrus.Fatal(err)