Set cfdev version at build time [#157016335]

Author: dgodd

src/code.cloudfoundry.org/cfdev/cfanalytics/cfanalytics.go

@@ -29,7 +29,7 @@ type Analytics struct {
 	version string
 }
 
-func New(toggle Toggle, client analytics.Client) *Analytics {
+func New(toggle Toggle, client analytics.Client, version string) *Analytics {
 	uuid, err := machineid.ProtectedID("cfdev")
 	if err != nil {
 		uuid = "UNKNOWN_ID"
@@ -38,7 +38,7 @@ func New(toggle Toggle, client analytics.Client) *Analytics {
 		client:  client,
 		toggle:  toggle,
 		userId:  uuid,
-		version: "0.0.2",
+		version: version,
 	}
 }
 

src/code.cloudfoundry.org/cfdev/cfanalytics/cfanalytics_test.go

@@ -57,7 +57,7 @@ var _ = Describe("Analytics", func() {
 	BeforeEach(func() {
 		mockToggle = &MockToggle{}
 		mockClient = &MockClient{}
-		subject = cfanalytics.New(mockToggle, mockClient)
+		subject = cfanalytics.New(mockToggle, mockClient, "4.5.6-unit-test")
 	})
 
 	Describe("PromptOptIn", func() {
@@ -135,7 +135,7 @@ var _ = Describe("Analytics", func() {
 					"Timestamp": BeTemporally(">=", time.Now().Add(-1*time.Minute)),
 					"Properties": BeEquivalentTo(map[string]interface{}{
 						"os":      runtime.GOOS,
-						"version": "0.0.2",
+						"version": "4.5.6-unit-test",
 						"mykey":   "myval",
 					}),
 				}))

src/code.cloudfoundry.org/cfdev/config/config.go

@@ -13,6 +13,7 @@ import (
 	"code.cloudfoundry.org/cfdev/cfanalytics"
 	"code.cloudfoundry.org/cfdev/cfanalytics/toggle"
 	"code.cloudfoundry.org/cfdev/resource"
+	"code.cloudfoundry.org/cfdev/semver"
 	analytics "gopkg.in/segmentio/analytics-go.v3"
 )
 
@@ -49,6 +50,7 @@ var (
 	cfdevdMd5  string
 	cfdevdSize string
 
+	cliVersion   string
 	analyticsKey string
 )
 
@@ -75,6 +77,7 @@ type Config struct {
 	Dependencies           resource.Catalog
 	CFDevDSocketPath       string
 	CFDevDInstallationPath string
+	CliVersion             *semver.Version
 	Analytics              Analytics
 	AnalyticsToggle        Toggle
 }
@@ -107,7 +110,8 @@ func NewConfig() (Config, error) {
 		Dependencies:           catalog,
 		CFDevDSocketPath:       filepath.Join("/var", "tmp", "cfdevd.socket"),
 		CFDevDInstallationPath: filepath.Join("/Library", "PrivilegedHelperTools", "org.cloudfoundry.cfdevd"),
-		Analytics:              cfanalytics.New(analyticsToggle, analyticsClient),
+		CliVersion:             semver.Must(semver.New(cliVersion)),
+		Analytics:              cfanalytics.New(analyticsToggle, analyticsClient, cliVersion),
 		AnalyticsToggle:        analyticsToggle,
 	}, nil
 }

src/code.cloudfoundry.org/cfdev/generate-plugin.sh

@@ -59,6 +59,7 @@ go build \
      -X $pkg.cfdevdMd5=$(md5 "$cfdevd" | awk '{ print $4 }')
      -X $pkg.cfdevdSize=$(wc -c < "$cfdevd" | tr -d '[:space:]')
 
+     -X $pkg.cliVersion=0.0.$(date +%Y%m%d-%H%M%S)
      -X $pkg.analyticsKey=WFz4dVFXZUxN2Y6MzfUHJNWtlgXuOYV2" \
      code.cloudfoundry.org/cfdev
 

src/code.cloudfoundry.org/cfdev/main.go

@@ -52,12 +52,13 @@ func main() {
 	}
 	defer conf.Close()
 
+	v := conf.CliVersion
 	cfdev := &Plugin{
 		Exit:    exitChan,
 		UI:      ui,
 		Config:  conf,
 		Root:    cmd.NewRoot(exitChan, ui, conf),
-		Version: plugin.VersionType{Major: 0, Minor: 0, Build: 2},
+		Version: plugin.VersionType{Major: v.Major, Minor: v.Minor, Build: v.Build},
 	}
 
 	plugin.Start(cfdev)

src/code.cloudfoundry.org/cfdev/semver/semver.go

@@ -0,0 +1,46 @@
+package semver
+
+import (
+	"strconv"
+	"strings"
+)
+
+type Version struct {
+	Major    int
+	Minor    int
+	Build    int
+	Original string
+}
+
+func New(v string) (*Version, error) {
+	s := &Version{Original: v}
+	arr := strings.SplitN(v, ".", 3)
+	var err error
+	if len(arr) >= 1 && v != "" {
+		s.Major, err = strconv.Atoi(arr[0])
+		if err != nil {
+			return nil, err
+		}
+	}
+	if len(arr) >= 2 {
+		s.Minor, err = strconv.Atoi(arr[1])
+		if err != nil {
+			return nil, err
+		}
+	}
+	if len(arr) >= 3 {
+		parts := strings.SplitN(arr[2], "-", 2)
+		s.Build, err = strconv.Atoi(parts[0])
+		if err != nil {
+			return nil, err
+		}
+	}
+	return s, nil
+}
+
+func Must(v *Version, err error) *Version {
+	if err != nil {
+		panic(err)
+	}
+	return v
+}

src/code.cloudfoundry.org/cfdev/semver/semver_suite_test.go

@@ -0,0 +1,13 @@
+package semver_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestSemver(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Semver Suite")
+}

src/code.cloudfoundry.org/cfdev/semver/semver_test.go

@@ -0,0 +1,36 @@
+package semver_test
+
+import (
+	"code.cloudfoundry.org/cfdev/semver"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Semver", func() {
+	It("parses 1.2.3", func() {
+		s, err := semver.New("1.2.3")
+		Expect(err).NotTo(HaveOccurred())
+		Expect(s.Major).To(Equal(1))
+		Expect(s.Minor).To(Equal(2))
+		Expect(s.Build).To(Equal(3))
+		Expect(s.Original).To(Equal("1.2.3"))
+	})
+
+	It("parses 2.3.4-patch-1", func() {
+		s, err := semver.New("2.3.4-patch-1")
+		Expect(err).NotTo(HaveOccurred())
+		Expect(s.Major).To(Equal(2))
+		Expect(s.Minor).To(Equal(3))
+		Expect(s.Build).To(Equal(4))
+		Expect(s.Original).To(Equal("2.3.4-patch-1"))
+	})
+
+	It("parses empty string", func() {
+		s, err := semver.New("")
+		Expect(err).NotTo(HaveOccurred())
+		Expect(s.Major).To(Equal(0))
+		Expect(s.Minor).To(Equal(0))
+		Expect(s.Build).To(Equal(0))
+		Expect(s.Original).To(Equal(""))
+	})
+})