Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revise version comparison to work with new Docker versioning

Browse Source 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
This commit is contained in:
Nathan LeClaire
2017-02-22 13:44:36 -08:00
parent e40b9b3bfb
commit 1504114aeb
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libmachine/versioncmp/compare.go
View File

@@ -11,12 +11,55 @@ import (
"strings"
)
// compare compares two version strings. compare returns -1 if v1 < v2, 1 if v1
// > v2, 0 otherwise.
const (
rcString = "-rc"
ceEdition = "-ce"
)
// compare compares two versions of Docker to decipher which came first.
//
// compare returns -1 if v1 < v2, 1 if v1 > v2, 0 otherwise.
func compare(v1, v2 string) int {
// Replace RC string with "." to make the RC number appear as simply
// another sub-version.
v1 = strings.Replace(v1, rcString, ".", -1)
v2 = strings.Replace(v2, rcString, ".", -1)
// All releases before the community edition (differentiated by
// presence of the "ce" string in the version string) are "less than"
// any community edition release (first occuring in March 2017).
if strings.Contains(v1, ceEdition) && !strings.Contains(v2, ceEdition) {
return -1
}
if !strings.Contains(v1, ceEdition) && strings.Contains(v2, ceEdition) {
return 1
}
// Without this tag, both are pre-CE versions.
if !strings.Contains(v1, ceEdition) && !strings.Contains(v2, ceEdition) {
return compareNumeric(v1, v2)
}
return compareCE(v1, v2)
}
// compareCE ("Community Edition") will differentiate between versions of
// Docker that use the versioning scheme
// {{release-year}}.{{release-month}}-{{ce|ee}}-{{rcnum|""}}
//
// This will be every release after 1.13.1.
func compareCE(v1, v2 string) int {
return compareNumeric(
strings.Replace(v1, ceEdition, "", -1),
strings.Replace(v2, ceEdition, "", -1),
)
}
// compareNumeric compares two version that use pre-17.03 Docker.
//
// Non-numeric segments in either argument are considered equal, so
// compare("1.a", "1.b") == 0, but compare("2.a", "1.b") == 1.
func compare(v1, v2 string) int {
func compareNumeric(v1, v2 string) int {
if n := strings.IndexByte(v1, '-'); n != -1 {
v1 = v1[:n]
}

11
libmachine/versioncmp/compare_test.go
View File

@@ -4,7 +4,7 @@ import (
"testing"
)
func TestCompareVersion(t *testing.T) {
func TestCompare(t *testing.T) {
cases := []struct {
v1, v2 string
want int
@@ -25,9 +25,14 @@ func TestCompareVersion(t *testing.T) {
{"1.1.1", "1.1.2", -1},
{"1.1.2", "1.2", -1},
{"1.12.1", "1.13.0-rc1", -1},
{"1.13-rc1", "1.13.0-rc2", 0},
{"1.13.0-rc1", "1.13.0-rc2", 0},
{"1.13.0-rc1", "1.13.0-rc2", -1},
{"1.13.0-rc1", "1.13.1-rc1", -1},
{"17.03.0-ce", "17.03.0-ce", 0},
{"17.03.1-ce", "17.03.2-ce", -1},
{"17.06.6-ce", "17.09.2-ce", -1},
{"17.03.0-ce", "17.06.0-ce", -1},
{"17.03.0-ce-rc2", "17.03.0-ce-rc1", 1},
{"17.03.0-ce-rc1", "18.03.0-ce-rc1", -1},
}
for _, tc := range cases {