Adding basic version command

Makefile

@@ -20,7 +20,6 @@ updatedeps: deps
 	@go get -d -f -u ./... $(DEPS)
 
 test: deps
-	@./scripts/verify_no_uuid.sh
 	@./scripts/test.sh
 	@$(MAKE) vet
 
@@ -28,7 +27,6 @@ integ:
 	go list ./... | INTEG_TESTS=yes xargs -n1 go test
 
 cover: deps
-	./scripts/verify_no_uuid.sh
 	go list ./... | xargs -n1 go test --cover
 
 format: deps

command/meta.go

@@ -0,0 +1,57 @@
+package command
+
+import (
+	"bufio"
+	"flag"
+	"io"
+
+	"github.com/mitchellh/cli"
+)
+
+// FlagSetFlags is an enum to define what flags are present in the
+// default FlagSet returned by Meta.FlagSet.
+type FlagSetFlags uint
+
+const (
+	FlagSetNone    FlagSetFlags = 0
+	FlagSetServer  FlagSetFlags = 1 << iota
+	FlagSetDefault              = FlagSetServer
+)
+
+// Meta contains the meta-options and functionality that nearly every
+// Nomad command inherits.
+type Meta struct {
+	Ui cli.Ui
+
+	// These are set by the command line flags.
+	flagAddress string
+}
+
+// FlagSet returns a FlagSet with the common flags that every
+// command implements. The exact behavior of FlagSet can be configured
+// using the flags as the second parameter, for example to disable
+// server settings on the commands that don't talk to a server.
+func (m *Meta) FlagSet(n string, fs FlagSetFlags) *flag.FlagSet {
+	f := flag.NewFlagSet(n, flag.ContinueOnError)
+
+	// FlagSetServer tells us to enable the settings for selecting
+	// the server information.
+	if fs&FlagSetServer != 0 {
+		f.StringVar(&m.flagAddress, "address", "", "")
+	}
+
+	// Create an io.Writer that writes to our Ui properly for errors.
+	// This is kind of a hack, but it does the job. Basically: create
+	// a pipe, use a scanner to break it into lines, and output each line
+	// to the UI. Do this forever.
+	errR, errW := io.Pipe()
+	errScanner := bufio.NewScanner(errR)
+	go func() {
+		for errScanner.Scan() {
+			m.Ui.Error(errScanner.Text())
+		}
+	}()
+	f.SetOutput(errW)
+
+	return f
+}

command/meta_test.go

@@ -0,0 +1,41 @@
+package command
+
+import (
+	"flag"
+	"reflect"
+	"sort"
+	"testing"
+)
+
+func TestFlagSet(t *testing.T) {
+	cases := []struct {
+		Flags    FlagSetFlags
+		Expected []string
+	}{
+		{
+			FlagSetNone,
+			[]string{},
+		},
+		{
+			FlagSetServer,
+			[]string{"address"},
+		},
+	}
+
+	for i, tc := range cases {
+		var m Meta
+		fs := m.FlagSet("foo", tc.Flags)
+
+		actual := make([]string, 0, 0)
+		fs.VisitAll(func(f *flag.Flag) {
+			actual = append(actual, f.Name)
+		})
+		sort.Strings(actual)
+		sort.Strings(tc.Expected)
+
+		if !reflect.DeepEqual(actual, tc.Expected) {
+			t.Fatalf("%d: flags: %#v\n\nExpected: %#v\nGot: %#v",
+				i, tc.Flags, tc.Expected, actual)
+		}
+	}
+}

command/version.go

@@ -0,0 +1,40 @@
+package command
+
+import (
+	"bytes"
+	"fmt"
+
+	"github.com/mitchellh/cli"
+)
+
+// VersionCommand is a Command implementation prints the version.
+type VersionCommand struct {
+	Revision          string
+	Version           string
+	VersionPrerelease string
+	Ui                cli.Ui
+}
+
+func (c *VersionCommand) Help() string {
+	return ""
+}
+
+func (c *VersionCommand) Run(_ []string) int {
+	var versionString bytes.Buffer
+
+	fmt.Fprintf(&versionString, "Nomad v%s", c.Version)
+	if c.VersionPrerelease != "" {
+		fmt.Fprintf(&versionString, "-%s", c.VersionPrerelease)
+
+		if c.Revision != "" {
+			fmt.Fprintf(&versionString, " (%s)", c.Revision)
+		}
+	}
+
+	c.Ui.Output(versionString.String())
+	return 0
+}
+
+func (c *VersionCommand) Synopsis() string {
+	return "Prints the Nomad version"
+}

command/version_test.go

@@ -0,0 +1,11 @@
+package command
+
+import (
+	"testing"
+
+	"github.com/mitchellh/cli"
+)
+
+func TestVersionCommand_implements(t *testing.T) {
+	var _ cli.Command = &VersionCommand{}
+}

commands.go

@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/hashicorp/vault/command"
+	"github.com/hashicorp/nomad/command"
 	"github.com/mitchellh/cli"
 )
 

scripts/test.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+# Create a temp dir and clean it up on exit
+TEMPDIR=`mktemp -d -t nomad-test.XXX`
+trap "rm -rf $TEMPDIR" EXIT HUP INT QUIT TERM
+
+# Build the Nomad binary for the API tests
+echo "--> Building nomad"
+go build -o $TEMPDIR/nomad || exit 1
+
+# Run the tests
+echo "--> Running tests"
+go list ./... | PATH=$TEMPDIR:$PATH xargs -n1 go test