Merge pull request #24 from CircleCI-Public/version-command

Add version command

.goreleaser.yml

@@ -15,3 +15,9 @@ builds:
       - linux
     goarch:
       - amd64
+    ldflags:
+      # -s Omit the symbol table and debug information.
+      # -w Omit the DWARF symbol table.
+      # These are the defaults specified by goreleaser:
+      # https://github.com/goreleaser/goreleaser/blob/682c811106f56ffe06c4212de546aec62161fb9d/internal/builders/golang/build.go#L46
+      - -s -w -X version.Version={{.Version}} -X version.Commit={{.Commit}}

client/client.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/CircleCI-Public/circleci-cli/logger"
+	"github.com/CircleCI-Public/circleci-cli/version"
 	"github.com/machinebox/graphql"
 )
 
@@ -20,14 +21,14 @@ func NewClient(endpoint string, logger *logger.Logger) *graphql.Client {
 	}
 
 	return client
-
 }
 
 // NewAuthorizedRequest returns a new GraphQL request with the
 // authorization headers set for CircleCI auth.
 func NewAuthorizedRequest(token, query string) *graphql.Request {
 	req := graphql.NewRequest(query)
 	req.Header.Set("Authorization", token)
+	req.Header.Set("User-Agent", fmt.Sprintf("circleci-cli/%s-%s", version.Version, version.Commit))
 	return req
 }
 

cmd/root.go

@@ -47,6 +47,7 @@ func MakeCommands() *cobra.Command {
 	rootCmd.AddCommand(newConfigCommand())
 	rootCmd.AddCommand(newOrbCommand())
 	rootCmd.AddCommand(newBuildCommand())
+	rootCmd.AddCommand(newVersionCommand())
 	rootCmd.PersistentFlags().BoolP("verbose", "v", false, "Enable verbose logging.")
 	rootCmd.PersistentFlags().StringP("endpoint", "e", defaultEndpoint, "the endpoint of your CircleCI GraphQL API")
 	rootCmd.PersistentFlags().StringP("token", "t", "", "your token for using CircleCI")

cmd/root_test.go

@@ -16,7 +16,7 @@ var _ = Describe("Root", func() {
 
 		It("can create commands", func() {
 			commands := cmd.MakeCommands()
-			Expect(len(commands.Commands())).To(Equal(7))
+			Expect(len(commands.Commands())).To(Equal(8))
 		})
 
 	})

cmd/version.go

@@ -0,0 +1,17 @@
+package cmd
+
+import (
+	"github.com/CircleCI-Public/circleci-cli/version"
+	"github.com/spf13/cobra"
+)
+
+func newVersionCommand() *cobra.Command {
+	return &cobra.Command{
+		Use:   "version",
+		Short: "Display version information",
+		Run: func(cmd *cobra.Command, args []string) {
+			Logger.Infof("%s (%s)", version.Version, version.Commit)
+		},
+	}
+
+}

version/version.go

@@ -0,0 +1,9 @@
+package version
+
+// These vars set by `goreleaser`:
+var (
+	// Version is the current Git tag (the v prefix is stripped) or the name of the snapshot, if you’re using the --snapshot flag
+	Version = "local-dev-build"
+	// Commit is the current git commit SHA
+	Commit = "dirty-local-tree"
+)