Merge pull request #134 from krmichelos/master

mattfarina · web-flow · commit 61053f7dfe72 · 2019-11-14T08:52:35.000-05:00
Fixing broken constraint checking with ^0.0
diff --git a/constraints.go b/constraints.go
@@ -493,6 +493,9 @@ func constraintCaret(v *Version, c *constraint) bool {
 	}
 
 	// ^ when the major is 0 and minor > 0 is >=0.y.z < 0.y+1
+	if c.con.Major() == 0 && v.Major() > 0 {
+		return false
+	}
 	// If the con Minor is > 0 it is not dirty
 	if c.con.Minor() > 0 || c.patchDirty {
 		return v.Minor() == c.con.Minor()
diff --git a/constraints_test.go b/constraints_test.go
@@ -171,6 +171,7 @@ func TestConstraintCheck(t *testing.T) {
 		{"^0.0.3", "0.0.4", false},
 		{"^0.0", "0.0.3", true},
 		{"^0.0", "0.1.4", false},
+		{"^0.0", "1.0.4", false},
 		{"^0", "0.2.3", true},
 		{"^0", "1.1.4", false},
 		{"^0.2.3-beta.2", "0.2.3-beta.4", true},

Original file line number	Diff line number	Diff line change
`@@ -493,6 +493,9 @@ func constraintCaret(v Version, c constraint) bool {`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`// ^ when the major is 0 and minor > 0 is >=0.y.z < 0.y+1`
	`496`	`+ if c.con.Major() == 0 && v.Major() > 0 {`
	`497`	`+ return false`
	`498`	`+ }`
`496`	`499`	`// If the con Minor is > 0 it is not dirty`
`497`	`500`	`if c.con.Minor() > 0 \|\| c.patchDirty {`
`498`	`501`	`return v.Minor() == c.con.Minor()`