feat(version): add build version to deis -v output

Author: Vaughn Dice

client/Makefile

@@ -42,8 +42,7 @@ bootstrap:
 glideup:
 	${DEV_ENV_CMD} glide up
 
-build:
-	${DEV_ENV_CMD} make binary-build
+build: binary-build
 	@$(call check-static-binary,deis)
 
 build-all:
@@ -53,7 +52,7 @@ build-all:
 	-output="$(DIST_DIR)/deis-${VERSION}-{{.OS}}-{{.Arch}}" .
 
 binary-build:
-	go build -a -installsuffix cgo -ldflags '-s' -o deis .
+	${DEV_ENV_CMD} go build -a -installsuffix cgo -ldflags "-s -X ${repo_path}/version.BuildVersion=${VERSION}" -o deis .
 
 dist: build-all
 

client/parser/version.go

@@ -20,6 +20,11 @@ Use 'deis help [command]' to learn more.
 		return err
 	}
 
-	fmt.Println(version.Version)
+	v := version.Version
+	if version.BuildVersion != "" {
+		v = fmt.Sprintf("%s-%s", version.Version, version.BuildVersion)
+	}
+	fmt.Println(v)
+
 	return nil
 }

client/version/version.go

@@ -5,3 +5,6 @@ const Version = "2.0.0-dev"
 
 // API identifies the latest Deis api verison
 const APIVersion = "2.0"
+
+// Note: This value is overwritten by the linker during build
+var BuildVersion = ""