Differentiate on metadata, addresses hashicorp#56

version.go

@@ -124,19 +124,12 @@ func (v *Version) Compare(other *Version) int {
 
 	// If the segments are the same, we must compare on prerelease info
 	if reflect.DeepEqual(segmentsSelf, segmentsOther) {
-		preSelf := v.Prerelease()
-		preOther := other.Prerelease()
-		if preSelf == "" && preOther == "" {
-			return 0
+		prereleaseVal := comparePrereleasesAndMeta(v.Prerelease(), other.Prerelease())
+		// if prereleases are the same, compare on metadata
+		if prereleaseVal == 0 {
+			return comparePrereleasesAndMeta(v.Metadata(), other.Metadata())
 		}
-		if preSelf == "" {
-			return 1
-		}
-		if preOther == "" {
-			return -1
-		}
-
-		return comparePrereleases(preSelf, preOther)
+		return prereleaseVal
 	}
 
 	// Get the highest specificity (hS), or if they're equal, just use segmentSelf length
@@ -238,7 +231,7 @@ func comparePart(preSelf string, preOther string) int {
 	return -1
 }
 
-func comparePrereleases(v string, other string) int {
+func comparePrereleasesAndMeta(v string, other string) int {
 	// the same pre release!
 	if v == other {
 		return 0

version_test.go

@@ -97,9 +97,10 @@ func TestVersionCompare(t *testing.T) {
 		{"1.2-beta", "1.2-beta", 0},
 		{"1.2", "1.1.4", 1},
 		{"1.2", "1.2-beta", 1},
-		{"1.2+foo", "1.2+beta", 0},
+		{"1.2+foo", "1.2+beta", 1},
+		{"1.2+foo", "1.2+foo", 0},
 		{"v1.2", "v1.2-beta", 1},
-		{"v1.2+foo", "v1.2+beta", 0},
+		{"v1.2+foo", "v1.2+beta", 1},
 		{"v1.2.3.4", "v1.2.3.4", 0},
 		{"v1.2.0.0", "v1.2", 0},
 		{"v1.2.0.0.1", "v1.2", 1},
@@ -142,8 +143,8 @@ func TestVersionCompare_versionAndSemver(t *testing.T) {
 	}{
 		{"0.0.2", "0.0.2", 0},
 		{"1.0.2alpha", "1.0.2-alpha", 0},
-		{"v1.2+foo", "v1.2+beta", 0},
-		{"v1.2", "v1.2+meta", 0},
+		{"v1.2+foo", "v1.2+beta", 1},
+		{"v1.2", "v1.2+meta", 1},
 		{"1.2", "1.2-beta", 1},
 		{"v1.2", "v1.2-beta", 1},
 		{"1.2.3", "1.4.5", -1},
@@ -372,9 +373,9 @@ func TestEqual(t *testing.T) {
 		{"1.2-beta", "1.2-beta", true},
 		{"1.2", "1.1.4", false},
 		{"1.2", "1.2-beta", false},
-		{"1.2+foo", "1.2+beta", true},
+		{"1.2+foo", "1.2+beta", false},
 		{"v1.2", "v1.2-beta", false},
-		{"v1.2+foo", "v1.2+beta", true},
+		{"v1.2+foo", "v1.2+beta", false},
 		{"v1.2.3.4", "v1.2.3.4", true},
 		{"v1.2.0.0", "v1.2", true},
 		{"v1.2.0.0.1", "v1.2", false},
@@ -419,9 +420,9 @@ func TestGreaterThan(t *testing.T) {
 		{"1.2-beta", "1.2-beta", false},
 		{"1.2", "1.1.4", true},
 		{"1.2", "1.2-beta", true},
-		{"1.2+foo", "1.2+beta", false},
+		{"1.2+foo", "1.2+beta", true},
 		{"v1.2", "v1.2-beta", true},
-		{"v1.2+foo", "v1.2+beta", false},
+		{"v1.2+foo", "v1.2+beta", true},
 		{"v1.2.3.4", "v1.2.3.4", false},
 		{"v1.2.0.0", "v1.2", false},
 		{"v1.2.0.0.1", "v1.2", true},
@@ -560,9 +561,9 @@ func TestLessThanOrEqual(t *testing.T) {
 		{"1.2-beta", "1.2-beta", true},
 		{"1.2", "1.1.4", false},
 		{"1.2", "1.2-beta", false},
-		{"1.2+foo", "1.2+beta", true},
+		{"1.2+foo", "1.2+beta", false},
 		{"v1.2", "v1.2-beta", false},
-		{"v1.2+foo", "v1.2+beta", true},
+		{"v1.2+foo", "v1.2+beta", false},
 		{"v1.2.3.4", "v1.2.3.4", true},
 		{"v1.2.0.0", "v1.2", true},
 		{"v1.2.0.0.1", "v1.2", false},