Skip to content

Implement constraint logic for caret (^) and tilde (~) #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Implement constraint logic for caret (^) and tilde (~) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions constraint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ func init() {
">=": constraintGreaterThanEqual,
"<=": constraintLessThanEqual,
"~>": constraintPessimistic,
"^": constraintCaret,
"~": constraintTilde,
}

ops := make([]string, 0, len(constraintOperators))
Expand Down Expand Up @@ -176,3 +178,29 @@ func constraintPessimistic(v, c *Version) bool {
// If nothing has rejected the version by now, it's valid
return true
}

func constraintCaret(v, c *Version) bool {
segments := c.Segments()
if segments[MajorPart] > 0 {
upperConstraint, _ := NewVersion(fmt.Sprintf("%d.%d.%d", segments[MajorPart]+1, 0, 0))
return constraintGreaterThanEqual(v, c) && constraintLessThan(v, upperConstraint)
}
if segments[MinorPart] > 0 {
upperConstraint, _ := NewVersion(fmt.Sprintf("%d.%d.%d", 0, segments[MinorPart]+1, 0))
return constraintGreaterThanEqual(v, c) && constraintLessThan(v, upperConstraint)
}
return constraintEqual(v, c)
}

func constraintTilde(v, c *Version) bool {
segments := c.Segments()
if segments[MajorPart] > 0 {
upperConstraint, _ := NewVersion(fmt.Sprintf("%d.%d.%d", segments[MajorPart], segments[MinorPart]+1, 0))
return constraintGreaterThanEqual(v, c) && constraintLessThan(v, upperConstraint)
}
if segments[MinorPart] > 0 {
upperConstraint, _ := NewVersion(fmt.Sprintf("%d.%d.%d", 0, segments[MinorPart]+1, 0))
return constraintGreaterThanEqual(v, c) && constraintLessThan(v, upperConstraint)
}
return constraintEqual(v, c)
}
22 changes: 22 additions & 0 deletions constraint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,28 @@ func TestConstraintCheck(t *testing.T) {
{"~> 1.0.9.5", "1.0.9.6", true},
{"~> 1.0.9.5", "1.0.9.5.0", true},
{"~> 1.0.9.5", "1.0.9.5.1", true},
{"^1.0.0", "1.0.0", true},
{"^1.0.0", "1.0.1", true},
{"^1.0.0", "1.9.1", true},
{"^1.0.0", "2.0.0", false},
{"^0.1.0", "0.1.0", true},
{"^0.1.0", "0.2.0", false},
{"^0.1.0", "0.1.4", true},
{"^0.0.1", "0.0.0", false},
{"^0.0.1", "0.0.1", true},
{"^0.0.1", "0.0.2", false},
{"^0.0.1", "0.2.0", false},
{"~1.0.0", "1.0.0", true},
{"~1.0.0", "1.0.1", true},
{"~1.0.0", "1.9.1", false},
{"~1.0.0", "2.0.0", false},
{"~0.1.0", "0.1.0", true},
{"~0.1.0", "0.2.0", false},
{"~0.1.0", "0.1.4", true},
{"~0.0.1", "0.0.0", false},
{"~0.0.1", "0.0.1", true},
{"~0.0.1", "0.0.2", false},
{"~0.0.1", "0.2.0", false},
}

for _, tc := range cases {
Expand Down
10 changes: 10 additions & 0 deletions version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ const VersionRegexpRaw string = `v?([0-9]+(\.[0-9]+)*?)` +
`(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?` +
`?`

type VersionPart int

const (
MajorPart VersionPart = iota
Copy link
Author

@matthew-andrews matthew-andrews Jun 18, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Borrowed from this Pull Request:-
https://github.com/hashicorp/go-version/pull/9/files#diff-ccde124315e74e68fae484840d08dff5R25

MinorPart
PatchPart
PreReleasePart
MetadataPart
)

// Version represents a single version.
type Version struct {
metadata string
Expand Down