Merge pull request #699 from mattermost/PLT-92

PLT-92 Adding server side versioning to the binary

5 files changed, 218 insertions, 6 deletions

diff --git a/model/system.go b/model/system.go
new file mode 100644
index 000000000..c79391cca
--- /dev/null
+++ b/model/system.go
@@ -0,0 +1,34 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"encoding/json"
+	"io"
+)
+
+type System struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+func (o *System) ToJson() string {
+	b, err := json.Marshal(o)
+	if err != nil {
+		return ""
+	} else {
+		return string(b)
+	}
+}
+
+func SystemFromJson(data io.Reader) *System {
+	decoder := json.NewDecoder(data)
+	var o System
+	err := decoder.Decode(&o)
+	if err == nil {
+		return &o
+	} else {
+		return nil
+	}
+}
diff --git a/model/system_test.go b/model/system_test.go
new file mode 100644
index 000000000..14ba0db2e
--- /dev/null
+++ b/model/system_test.go
@@ -0,0 +1,19 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestSystemJson(t *testing.T) {
+	system := System{Name: "test", Value: NewId()}
+	json := system.ToJson()
+	result := SystemFromJson(strings.NewReader(json))
+
+	if result.Name != "test" {
+		t.Fatal("Ids do not match")
+	}
+}
diff --git a/model/utils.go b/model/utils.go
index 04b92947b..e19cceba5 100644
--- a/model/utils.go
+++ b/model/utils.go
@@ -16,11 +16,6 @@ import (
 	"time"
 )
 
-const (
-	// Also change web/react/stores/browser_store.jsx BROWSER_STORE_VERSION
-	ETAG_ROOT_VERSION = "12"
-)
-
 type StringMap map[string]string
 type StringArray []string
 type EncryptStringMap map[string]string
@@ -235,7 +230,7 @@ func IsValidAlphaNum(s string, allowUnderscores bool) bool {
 
 func Etag(parts ...interface{}) string {
 
-	etag := ETAG_ROOT_VERSION
+	etag := CurrentVersion
 
 	for _, part := range parts {
 		etag += fmt.Sprintf(".%v", part)
diff --git a/model/version.go b/model/version.go
new file mode 100644
index 000000000..8f0c76ebe
--- /dev/null
+++ b/model/version.go
@@ -0,0 +1,90 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"strconv"
+	"strings"
+)
+
+// This is a list of all the current viersions including any patches.
+// It should be maitained in chronological order with most current
+// release at the front of the list.
+var versions = []string{
+	"0.8.0",
+	"0.7.1",
+	"0.7.0",
+	"0.6.0",
+	"0.5.0",
+}
+
+var CurrentVersion string = versions[0]
+var BuildNumber = "_BUILD_NUMBER_"
+var BuildDate = "_BUILD_DATE_"
+var BuildHash = "_BUILD_HASH_"
+
+func SplitVersion(version string) (int64, int64, int64) {
+	parts := strings.Split(version, ".")
+
+	major := int64(0)
+	minor := int64(0)
+	patch := int64(0)
+
+	if len(parts) > 0 {
+		major, _ = strconv.ParseInt(parts[0], 10, 64)
+	}
+
+	if len(parts) > 1 {
+		minor, _ = strconv.ParseInt(parts[1], 10, 64)
+	}
+
+	if len(parts) > 2 {
+		patch, _ = strconv.ParseInt(parts[2], 10, 64)
+	}
+
+	return major, minor, patch
+}
+
+func GetPreviousVersion(currentVersion string) (int64, int64) {
+	currentIndex := -1
+	currentMajor, currentMinor, _ := SplitVersion(currentVersion)
+
+	for index, version := range versions {
+		major, minor, _ := SplitVersion(version)
+
+		if currentMajor == major && currentMinor == minor {
+			currentIndex = index
+		}
+
+		if currentIndex >= 0 {
+			if currentMajor != major || currentMinor != minor {
+				return major, minor
+			}
+		}
+	}
+
+	return 0, 0
+}
+
+func IsCurrentVersion(versionToCheck string) bool {
+	currentMajor, currentMinor, _ := SplitVersion(CurrentVersion)
+	toCheckMajor, toCheckMinor, _ := SplitVersion(versionToCheck)
+
+	if toCheckMajor == currentMajor && toCheckMinor == currentMinor {
+		return true
+	} else {
+		return false
+	}
+}
+
+func IsPreviousVersion(versionToCheck string) bool {
+	toCheckMajor, toCheckMinor, _ := SplitVersion(versionToCheck)
+	prevMajor, prevMinor := GetPreviousVersion(CurrentVersion)
+
+	if toCheckMajor == prevMajor && toCheckMinor == prevMinor {
+		return true
+	} else {
+		return false
+	}
+}
diff --git a/model/version_test.go b/model/version_test.go
new file mode 100644
index 000000000..da40006be
--- /dev/null
+++ b/model/version_test.go
@@ -0,0 +1,74 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestSplitVersion(t *testing.T) {
+	major1, minor1, patch1 := SplitVersion("junk")
+	if major1 != 0 || minor1 != 0 || patch1 != 0 {
+		t.Fatal()
+	}
+
+	major2, minor2, patch2 := SplitVersion("1.2.3")
+	if major2 != 1 || minor2 != 2 || patch2 != 3 {
+		t.Fatal()
+	}
+
+	major3, minor3, patch3 := SplitVersion("1.2")
+	if major3 != 1 || minor3 != 2 || patch3 != 0 {
+		t.Fatal()
+	}
+
+	major4, minor4, patch4 := SplitVersion("1")
+	if major4 != 1 || minor4 != 0 || patch4 != 0 {
+		t.Fatal()
+	}
+
+	major5, minor5, patch5 := SplitVersion("1.2.3.junkgoeswhere")
+	if major5 != 1 || minor5 != 2 || patch5 != 3 {
+		t.Fatal()
+	}
+}
+
+func TestGetPreviousVersion(t *testing.T) {
+	if major, minor := GetPreviousVersion("0.8.0"); major != 0 || minor != 7 {
+		t.Fatal(major, minor)
+	}
+
+	if major, minor := GetPreviousVersion("0.7.0"); major != 0 || minor != 6 {
+		t.Fatal(major, minor)
+	}
+
+	if major, minor := GetPreviousVersion("0.7.1"); major != 0 || minor != 6 {
+		t.Fatal(major, minor)
+	}
+
+	if major, minor := GetPreviousVersion("0.7111.1"); major != 0 || minor != 0 {
+		t.Fatal(major, minor)
+	}
+}
+
+func TestIsCurrentVersion(t *testing.T) {
+	major, minor, patch := SplitVersion(CurrentVersion)
+
+	if !IsCurrentVersion(CurrentVersion) {
+		t.Fatal()
+	}
+
+	if !IsCurrentVersion(fmt.Sprintf("%v.%v.%v", major, minor, patch+100)) {
+		t.Fatal()
+	}
+
+	if IsCurrentVersion(fmt.Sprintf("%v.%v.%v", major, minor+1, patch)) {
+		t.Fatal()
+	}
+
+	if IsCurrentVersion(fmt.Sprintf("%v.%v.%v", major+1, minor, patch)) {
+		t.Fatal()
+	}
+}