Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 75cb241

Browse files
sdboyersdboyer
authored
Merge pull request #750 from jmank88/version_api
Version API Method Names
2 parents 564e006 + cb7df4a commit 75cb241

26 files changed

+161
-161
lines changed

‎cmd/dep/glide_importer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func TestGlideConfig_Convert_Project(t *testing.T) {
189189
}
190190

191191
wantRev := "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
192-
gotRev := lpv.Underlying().String()
192+
gotRev := lpv.Revision().String()
193193
if gotRev != wantRev {
194194
t.Fatalf("Expected locked revision to be %s, got %s", wantRev, gotRev)
195195
}

‎cmd/dep/godep_importer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func (g *godepImporter) buildLockedProject(pkg godepPackage) gps.LockedProject {
174174

175175
if pkg.Comment != "" {
176176
ver := gps.NewVersion(pkg.Comment)
177-
version = ver.Is(gps.Revision(pkg.Rev))
177+
version = ver.Pair(gps.Revision(pkg.Rev))
178178
} else {
179179
version = gps.Revision(pkg.Rev)
180180
}

‎cmd/dep/godep_importer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func TestGodepConfig_ConvertProject(t *testing.T) {
150150
t.Fatalf("Expected locked version to be PairedVersion but got %T", lv)
151151
}
152152

153-
rev := lpv.Underlying()
153+
rev := lpv.Revision()
154154
if rev != "ff2948a2ac8f538c4ecd55962e919d1e13e74baf" {
155155
t.Fatalf("Expected locked revision to be 'ff2948a2ac8f538c4ecd55962e919d1e13e74baf', got %s", rev)
156156
}
@@ -208,7 +208,7 @@ func TestGodepConfig_ConvertProject_EmptyComment(t *testing.T) {
208208
t.Fatalf("Expected locked version to be PairedVersion but got %T", lv)
209209
}
210210

211-
rev := lpv.Underlying()
211+
rev := lpv.Revision()
212212
if rev != "ff2948a2ac8f538c4ecd55962e919d1e13e74baf" {
213213
t.Fatalf("Expected locked revision to be 'ff2948a2ac8f538c4ecd55962e919d1e13e74baf', got %s", rev)
214214
}

‎cmd/dep/gopath_scanner_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,19 +151,19 @@ func TestGetProjectPropertiesFromVersion(t *testing.T) {
151151
want: wantSemver,
152152
},
153153
{
154-
version: gps.NewBranch("foo-branch").Is("some-revision"),
154+
version: gps.NewBranch("foo-branch").Pair("some-revision"),
155155
want: gps.NewBranch("foo-branch"),
156156
},
157157
{
158-
version: gps.NewVersion("foo-version").Is("some-revision"),
158+
version: gps.NewVersion("foo-version").Pair("some-revision"),
159159
want: gps.NewVersion("foo-version"),
160160
},
161161
{
162162
version: gps.Revision("some-revision"),
163163
want: nil,
164164
},
165165
{
166-
version: gps.NewVersion("v1.0.0").Is("some-revision"),
166+
version: gps.NewVersion("v1.0.0").Pair("some-revision"),
167167
want: wantSemver,
168168
},
169169
}

‎cmd/dep/root_analyzer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func lookupVersionForRevision(rev gps.Revision, pi gps.ProjectIdentifier, sm gps
159159

160160
gps.SortPairedForUpgrade(versions) // Sort versions in asc order
161161
for _, v := range versions {
162-
if v.Underlying() == rev {
162+
if v.Revision() == rev {
163163
return v, nil
164164
}
165165
}

‎cmd/dep/status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func runStatusAll(ctx *dep.Ctx, out outputter, p *dep.Project, sm gps.SourceMana
328328
bs.Revision = tv
329329
case gps.PairedVersion:
330330
bs.Version = tv.Unpair()
331-
bs.Revision = tv.Underlying()
331+
bs.Revision = tv.Revision()
332332
}
333333

334334
// Check if the manifest has an override for this project. If so,
@@ -364,7 +364,7 @@ func runStatusAll(ctx *dep.Ctx, out outputter, p *dep.Project, sm gps.SourceMana
364364
// upgrade, the first version we encounter that
365365
// matches our constraint will be what we want.
366366
if c.Constraint.Matches(v) {
367-
bs.Latest = v.Underlying()
367+
bs.Latest = v.Revision()
368368
break
369369
}
370370
}

‎context.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ func (c *Ctx) VersionInWorkspace(root gps.ProjectRoot) (gps.Version, error) {
290290
if contains(tags, ver) {
291291
// Assume semver if it starts with a v.
292292
if strings.HasPrefix(ver, "v") {
293-
return gps.NewVersion(ver).Is(gps.Revision(rev)), nil
293+
return gps.NewVersion(ver).Pair(gps.Revision(rev)), nil
294294
}
295295

296296
return nil, errors.Errorf("version for root %s does not start with a v: %q", pr, ver)
@@ -303,7 +303,7 @@ func (c *Ctx) VersionInWorkspace(root gps.ProjectRoot) (gps.Version, error) {
303303
}
304304
// Try to match the current version to a branch.
305305
if contains(branches, ver) {
306-
return gps.NewBranch(ver).Is(gps.Revision(rev)), nil
306+
return gps.NewBranch(ver).Pair(gps.Revision(rev)), nil
307307
}
308308

309309
return gps.Revision(rev), nil

‎context_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,15 @@ func TestVersionInWorkspace(t *testing.T) {
156156
checkout bool
157157
}{
158158
"github.com/pkg/errors": {
159-
rev: gps.NewVersion("v0.8.0").Is("645ef00459ed84a119197bfb8d8205042c6df63d"), // semver
159+
rev: gps.NewVersion("v0.8.0").Pair("645ef00459ed84a119197bfb8d8205042c6df63d"), // semver
160160
checkout: true,
161161
},
162162
"github.com/Sirupsen/logrus": {
163163
rev: gps.Revision("42b84f9ec624953ecbf81a94feccb3f5935c5edf"), // random sha
164164
checkout: true,
165165
},
166166
"github.com/rsc/go-get-default-branch": {
167-
rev: gps.NewBranch("another-branch").Is("8e6902fdd0361e8fa30226b350e62973e3625ed5"),
167+
rev: gps.NewBranch("another-branch").Pair("8e6902fdd0361e8fa30226b350e62973e3625ed5"),
168168
},
169169
}
170170

‎internal/gps/constraint_test.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
// gu - helper func for stringifying what we assume is a VersionPair (otherwise
1313
// will panic), but is given as a Constraint
1414
func gu(v Constraint) string {
15-
return fmt.Sprintf("%q at rev %q", v, v.(PairedVersion).Underlying())
15+
return fmt.Sprintf("%q at rev %q", v, v.(PairedVersion).Revision())
1616
}
1717

1818
func TestBranchConstraintOps(t *testing.T) {
@@ -47,7 +47,7 @@ func TestBranchConstraintOps(t *testing.T) {
4747

4848
// Add rev to one
4949
snuffster := Revision("snuffleupagus")
50-
v3 := v1.Is(snuffster).(versionPair)
50+
v3 := v1.Pair(snuffster).(versionPair)
5151
if v2.Matches(v3) {
5252
t.Errorf("%s should not match %s", v2, gu(v3))
5353
}
@@ -70,7 +70,7 @@ func TestBranchConstraintOps(t *testing.T) {
7070
}
7171

7272
// Add different rev to the other
73-
v4 := v2.Is(Revision("cookie monster")).(versionPair)
73+
v4 := v2.Pair(Revision("cookie monster")).(versionPair)
7474
if v4.Matches(v3) {
7575
t.Errorf("%s should not match %s", gu(v4), gu(v3))
7676
}
@@ -96,7 +96,7 @@ func TestBranchConstraintOps(t *testing.T) {
9696
// TODO(sdboyer) this might not actually be a good idea, when you consider the
9797
// semantics of floating versions...matching on an underlying rev might be
9898
// nice in the short term, but it's probably shit most of the time
99-
v5 := v2.Is(Revision("snuffleupagus")).(versionPair)
99+
v5 := v2.Pair(Revision("snuffleupagus")).(versionPair)
100100
if !v5.Matches(v3) {
101101
t.Errorf("%s should match %s", gu(v5), gu(v3))
102102
}
@@ -122,9 +122,9 @@ func TestBranchConstraintOps(t *testing.T) {
122122
cookie := Revision("cookie monster")
123123
o1 := NewVersion("master").(plainVersion)
124124
o2 := NewVersion("1.0.0").(semVersion)
125-
o3 := o1.Is(cookie).(versionPair)
126-
o4 := o2.Is(cookie).(versionPair)
127-
v6 := v1.Is(cookie).(versionPair)
125+
o3 := o1.Pair(cookie).(versionPair)
126+
o4 := o2.Pair(cookie).(versionPair)
127+
v6 := v1.Pair(cookie).(versionPair)
128128

129129
if v1.Matches(o1) {
130130
t.Errorf("%s (branch) should not match %s (version) across types", v1, o1)
@@ -231,7 +231,7 @@ func TestVersionConstraintOps(t *testing.T) {
231231

232232
// Add rev to one
233233
snuffster := Revision("snuffleupagus")
234-
v3 := v1.Is(snuffster).(versionPair)
234+
v3 := v1.Pair(snuffster).(versionPair)
235235
if v2.Matches(v3) {
236236
t.Errorf("%s should not match %s", v2, gu(v3))
237237
}
@@ -254,7 +254,7 @@ func TestVersionConstraintOps(t *testing.T) {
254254
}
255255

256256
// Add different rev to the other
257-
v4 := v2.Is(Revision("cookie monster")).(versionPair)
257+
v4 := v2.Pair(Revision("cookie monster")).(versionPair)
258258
if v4.Matches(v3) {
259259
t.Errorf("%s should not match %s", gu(v4), gu(v3))
260260
}
@@ -277,7 +277,7 @@ func TestVersionConstraintOps(t *testing.T) {
277277
}
278278

279279
// Now add same rev to different versions, and things should line up
280-
v5 := v2.Is(Revision("snuffleupagus")).(versionPair)
280+
v5 := v2.Pair(Revision("snuffleupagus")).(versionPair)
281281
if !v5.Matches(v3) {
282282
t.Errorf("%s should match %s", gu(v5), gu(v3))
283283
}
@@ -303,9 +303,9 @@ func TestVersionConstraintOps(t *testing.T) {
303303
cookie := Revision("cookie monster")
304304
o1 := NewBranch("master").(branchVersion)
305305
o2 := NewVersion("1.0.0").(semVersion)
306-
o3 := o1.Is(cookie).(versionPair)
307-
o4 := o2.Is(cookie).(versionPair)
308-
v6 := v1.Is(cookie).(versionPair)
306+
o3 := o1.Pair(cookie).(versionPair)
307+
o4 := o2.Pair(cookie).(versionPair)
308+
v6 := v1.Pair(cookie).(versionPair)
309309

310310
if v1.Matches(o1) {
311311
t.Errorf("%s (version) should not match %s (branch) across types", v1, o1)
@@ -412,7 +412,7 @@ func TestSemverVersionConstraintOps(t *testing.T) {
412412

413413
// Add rev to one
414414
snuffster := Revision("snuffleupagus")
415-
v3 := v1.Is(snuffster).(versionPair)
415+
v3 := v1.Pair(snuffster).(versionPair)
416416
if v2.Matches(v3) {
417417
t.Errorf("%s should not match %s", v2, gu(v3))
418418
}
@@ -435,7 +435,7 @@ func TestSemverVersionConstraintOps(t *testing.T) {
435435
}
436436

437437
// Add different rev to the other
438-
v4 := v2.Is(Revision("cookie monster")).(versionPair)
438+
v4 := v2.Pair(Revision("cookie monster")).(versionPair)
439439
if v4.Matches(v3) {
440440
t.Errorf("%s should not match %s", gu(v4), gu(v3))
441441
}
@@ -458,7 +458,7 @@ func TestSemverVersionConstraintOps(t *testing.T) {
458458
}
459459

460460
// Now add same rev to different versions, and things should line up
461-
v5 := v2.Is(Revision("snuffleupagus")).(versionPair)
461+
v5 := v2.Pair(Revision("snuffleupagus")).(versionPair)
462462
if !v5.Matches(v3) {
463463
t.Errorf("%s should match %s", gu(v5), gu(v3))
464464
}
@@ -484,9 +484,9 @@ func TestSemverVersionConstraintOps(t *testing.T) {
484484
cookie := Revision("cookie monster")
485485
o1 := NewBranch("master").(branchVersion)
486486
o2 := NewVersion("ab123").(plainVersion)
487-
o3 := o1.Is(cookie).(versionPair)
488-
o4 := o2.Is(cookie).(versionPair)
489-
v6 := v1.Is(cookie).(versionPair)
487+
o3 := o1.Pair(cookie).(versionPair)
488+
o4 := o2.Pair(cookie).(versionPair)
489+
v6 := v1.Pair(cookie).(versionPair)
490490

491491
if v1.Matches(o1) {
492492
t.Errorf("%s (semver) should not match %s (branch) across types", v1, o1)
@@ -586,9 +586,9 @@ func TestSemverConstraintOps(t *testing.T) {
586586
v3 := NewVersion("1.0.0").(semVersion)
587587

588588
fozzie := Revision("fozzie bear")
589-
v4 := v1.Is(fozzie).(versionPair)
590-
v5 := v2.Is(fozzie).(versionPair)
591-
v6 := v3.Is(fozzie).(versionPair)
589+
v4 := v1.Pair(fozzie).(versionPair)
590+
v5 := v2.Pair(fozzie).(versionPair)
591+
v6 := v3.Pair(fozzie).(versionPair)
592592

593593
// TODO(sdboyer) we can't use the same range as below b/c semver.rangeConstraint is
594594
// still an incomparable type
@@ -702,9 +702,9 @@ func TestVersionUnion(t *testing.T) {
702702
rev := Revision("flooboofoobooo")
703703
v1 := NewBranch("master")
704704
v2 := NewBranch("test")
705-
v3 := NewVersion("1.0.0").Is(rev)
705+
v3 := NewVersion("1.0.0").Pair(rev)
706706
v4 := NewVersion("1.0.1")
707-
v5 := NewVersion("v2.0.5").Is(Revision("notamatch"))
707+
v5 := NewVersion("v2.0.5").Pair(Revision("notamatch"))
708708

709709
uv1 := versionTypeUnion{v1, v4, rev}
710710
uv2 := versionTypeUnion{v2, v3}
@@ -877,7 +877,7 @@ func TestTypedConstraintString(t *testing.T) {
877877
// Also tests typedVersionString(), as this nests down into that
878878
rev := Revision("flooboofoobooo")
879879
v1 := NewBranch("master")
880-
v2 := NewBranch("test").Is(rev)
880+
v2 := NewBranch("test").Pair(rev)
881881
v3 := NewVersion("1.0.1")
882882
v4 := NewVersion("v2.0.5")
883883
v5 := NewVersion("2.0.5.2")

‎internal/gps/lock.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ func (lp LockedProject) Version() Version {
145145
return lp.r
146146
}
147147

148-
return lp.v.Is(lp.r)
148+
return lp.v.Pair(lp.r)
149149
}
150150

151151
// Eq checks if two LockedProject instances are equal.

‎internal/gps/lock_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestLockedProjectsEq(t *testing.T) {
3636
NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps", "flugle"}),
3737
NewLockedProject(mkPI("foo"), NewVersion("nada"), []string{"foo"}),
3838
NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"flugle", "gps"}),
39-
NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
39+
NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Pair("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
4040
NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.11.0"), []string{"gps"}),
4141
NewLockedProject(mkPI("github.com/sdboyer/gps"), Revision("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
4242
}
@@ -81,9 +81,9 @@ func TestLockedProjectsEq(t *testing.T) {
8181
}
8282

8383
func TestLocksAreEq(t *testing.T) {
84-
gpl := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Is("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"})
84+
gpl := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Pair("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"})
8585
svpl := NewLockedProject(mkPI("github.com/Masterminds/semver"), NewVersion("v2.0.0"), []string{"semver"})
86-
bbbt := NewLockedProject(mkPI("github.com/beeblebrox/browntown"), NewBranch("master").Is("63fc17eb7966a6f4cc0b742bf42731c52c4ac740"), []string{"browntown", "smoochies"})
86+
bbbt := NewLockedProject(mkPI("github.com/beeblebrox/browntown"), NewBranch("master").Pair("63fc17eb7966a6f4cc0b742bf42731c52c4ac740"), []string{"browntown", "smoochies"})
8787

8888
l1 := solution{
8989
hd: []byte("foo"),

‎internal/gps/manager_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ func TestSourceInit(t *testing.T) {
148148
t.Errorf("Expected seven version results from the test repo, got %v", len(pvl))
149149
} else {
150150
expected := []PairedVersion{
151-
NewVersion("v2.0.0").Is(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
152-
NewVersion("v1.1.0").Is(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
153-
NewVersion("v1.0.0").Is(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
154-
newDefaultBranch("master").Is(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
155-
NewBranch("v1").Is(Revision("e3777f683305eafca223aefe56b4e8ecf103f467")),
156-
NewBranch("v1.1").Is(Revision("f1fbc520489a98306eb28c235204e39fa8a89c84")),
157-
NewBranch("v3").Is(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
151+
NewVersion("v2.0.0").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
152+
NewVersion("v1.1.0").Pair(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
153+
NewVersion("v1.0.0").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
154+
newDefaultBranch("master").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
155+
NewBranch("v1").Pair(Revision("e3777f683305eafca223aefe56b4e8ecf103f467")),
156+
NewBranch("v1.1").Pair(Revision("f1fbc520489a98306eb28c235204e39fa8a89c84")),
157+
NewBranch("v3").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
158158
}
159159

160160
// SourceManager itself doesn't guarantee ordering; sort them here so we
@@ -186,13 +186,13 @@ func TestSourceInit(t *testing.T) {
186186
t.Errorf("Expected seven version results from the test repo, got %v", len(vl))
187187
} else {
188188
expected := []Version{
189-
NewVersion("v2.0.0").Is(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
190-
NewVersion("v1.1.0").Is(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
191-
NewVersion("v1.0.0").Is(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
192-
newDefaultBranch("master").Is(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
193-
NewBranch("v1").Is(Revision("e3777f683305eafca223aefe56b4e8ecf103f467")),
194-
NewBranch("v1.1").Is(Revision("f1fbc520489a98306eb28c235204e39fa8a89c84")),
195-
NewBranch("v3").Is(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
189+
NewVersion("v2.0.0").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
190+
NewVersion("v1.1.0").Pair(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
191+
NewVersion("v1.0.0").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
192+
newDefaultBranch("master").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
193+
NewBranch("v1").Pair(Revision("e3777f683305eafca223aefe56b4e8ecf103f467")),
194+
NewBranch("v1.1").Pair(Revision("f1fbc520489a98306eb28c235204e39fa8a89c84")),
195+
NewBranch("v3").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
196196
}
197197

198198
for k, e := range expected {
@@ -273,9 +273,9 @@ func TestDefaultBranchAssignment(t *testing.T) {
273273
brev := Revision("fda020843ac81352004b9dca3fcccdd517600149")
274274
mrev := Revision("9f9c3a591773d9b28128309ac7a9a72abcab267d")
275275
expected := []PairedVersion{
276-
NewBranch("branchone").Is(brev),
277-
NewBranch("otherbranch").Is(brev),
278-
NewBranch("master").Is(mrev),
276+
NewBranch("branchone").Pair(brev),
277+
NewBranch("otherbranch").Pair(brev),
278+
NewBranch("master").Pair(mrev),
279279
}
280280

281281
SortPairedForUpgrade(v)

0 commit comments

Comments
 (0)