Skip to content

Commit 94ba649

Browse files
krisnovakrisnova
committed
Changes from code review
Revert a handful of substitutions Remove gps/CONTRIBUTING.md (Can port/replace later) Remove gps/README.md (Can port/replace later) Original code review: golang#410 (review)
1 parent 9c8c70c commit 94ba649

8 files changed

+55
-247
lines changed

‎Gopkg.lock

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,3 @@
1414
[[dependencies]]
1515
name = "github.com/pkg/errors"
1616
version = ">=0.8.0, <1.0.0"
17-
18-
[[dependencies]]
19-
name = "github.com/golang/dep/gps"
20-
version = ">=0.16.0, <1.0.0"

‎analyzer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (a Analyzer) DeriveManifestAndLock(path string, n gps.ProjectRoot) (gps.Man
3232
return nil, nil, err
3333
}
3434
// TODO: No need to return lock til we decide about preferred versions, see
35-
// https://github.com/golang/dep/gps/wiki/gps-for-Implementors#preferred-versions.
35+
// https://github.com/sdboyer/gps/wiki/gps-for-Implementors#preferred-versions.
3636
return m, nil, nil
3737
}
3838

‎gps/CONTRIBUTING.md

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎gps/README.md

Lines changed: 0 additions & 115 deletions
This file was deleted.

‎gps/deduce_test.go

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,51 +31,51 @@ func mkurl(s string) (u *url.URL) {
3131
var pathDeductionFixtures = map[string][]pathDeductionFixture{
3232
"github": []pathDeductionFixture{
3333
{
34-
in: "github.com/golang/dep/gps",
35-
root: "github.com/golang/dep/gps",
34+
in: "github.com/sdboyer/gps",
35+
root: "github.com/sdboyer/gps",
3636
mb: maybeSources{
37-
maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")},
38-
maybeGitSource{url: mkurl("ssh://[email protected]/golang/dep/gps")},
39-
maybeGitSource{url: mkurl("git://github.com/golang/dep/gps")},
40-
maybeGitSource{url: mkurl("http://github.com/golang/dep/gps")},
37+
maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")},
38+
maybeGitSource{url: mkurl("ssh://[email protected]/sdboyer/gps")},
39+
maybeGitSource{url: mkurl("git://github.com/sdboyer/gps")},
40+
maybeGitSource{url: mkurl("http://github.com/sdboyer/gps")},
4141
},
4242
},
4343
{
44-
in: "github.com/golang/dep/gps/foo",
45-
root: "github.com/golang/dep/gps",
44+
in: "github.com/sdboyer/gps/foo",
45+
root: "github.com/sdboyer/gps",
4646
mb: maybeSources{
47-
maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")},
48-
maybeGitSource{url: mkurl("ssh://[email protected]/golang/dep/gps")},
49-
maybeGitSource{url: mkurl("git://github.com/golang/dep/gps")},
50-
maybeGitSource{url: mkurl("http://github.com/golang/dep/gps")},
47+
maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")},
48+
maybeGitSource{url: mkurl("ssh://[email protected]/sdboyer/gps")},
49+
maybeGitSource{url: mkurl("git://github.com/sdboyer/gps")},
50+
maybeGitSource{url: mkurl("http://github.com/sdboyer/gps")},
5151
},
5252
},
5353
{
5454
// TODO(sdboyer) is this a problem for enforcing uniqueness? do we
5555
// need to collapse these extensions?
56-
in: "github.com/golang/dep/gps.git/foo",
57-
root: "github.com/golang/dep/gps.git",
56+
in: "github.com/sdboyer/gps.git/foo",
57+
root: "github.com/sdboyer/gps.git",
5858
mb: maybeSources{
59-
maybeGitSource{url: mkurl("https://github.com/golang/dep/gps.git")},
60-
maybeGitSource{url: mkurl("ssh://[email protected]/golang/dep/gps.git")},
61-
maybeGitSource{url: mkurl("git://github.com/golang/dep/gps.git")},
62-
maybeGitSource{url: mkurl("http://github.com/golang/dep/gps.git")},
59+
maybeGitSource{url: mkurl("https://github.com/sdboyer/gps.git")},
60+
maybeGitSource{url: mkurl("ssh://[email protected]/sdboyer/gps.git")},
61+
maybeGitSource{url: mkurl("git://github.com/sdboyer/gps.git")},
62+
maybeGitSource{url: mkurl("http://github.com/sdboyer/gps.git")},
6363
},
6464
},
6565
{
6666
in: "[email protected]:sdboyer/gps",
67-
root: "github.com/golang/dep/gps",
68-
mb: maybeGitSource{url: mkurl("ssh://[email protected]/golang/dep/gps")},
67+
root: "github.com/sdboyer/gps",
68+
mb: maybeGitSource{url: mkurl("ssh://[email protected]/sdboyer/gps")},
6969
},
7070
{
71-
in: "https://github.com/golang/dep/gps",
72-
root: "github.com/golang/dep/gps",
73-
mb: maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")},
71+
in: "https://github.com/sdboyer/gps",
72+
root: "github.com/sdboyer/gps",
73+
mb: maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")},
7474
},
7575
{
76-
in: "https://github.com/golang/dep/gps/foo/bar",
77-
root: "github.com/golang/dep/gps",
78-
mb: maybeGitSource{url: mkurl("https://github.com/golang/dep/gps")},
76+
in: "https://github.com/sdboyer/gps/foo/bar",
77+
root: "github.com/sdboyer/gps",
78+
mb: maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")},
7979
},
8080
{
8181
in: "github.com/sdboyer-/gps/foo",
@@ -127,30 +127,30 @@ var pathDeductionFixtures = map[string][]pathDeductionFixture{
127127
in: "gopkg.in/sdboyer/gps.v0",
128128
root: "gopkg.in/sdboyer/gps.v0",
129129
mb: maybeSources{
130-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/golang/dep/gps"), major: 0},
131-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://[email protected]/golang/dep/gps"), major: 0},
132-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/golang/dep/gps"), major: 0},
133-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/golang/dep/gps"), major: 0},
130+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/sdboyer/gps"), major: 0},
131+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://[email protected]/sdboyer/gps"), major: 0},
132+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/sdboyer/gps"), major: 0},
133+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/sdboyer/gps"), major: 0},
134134
},
135135
},
136136
{
137137
in: "gopkg.in/sdboyer/gps.v0/foo",
138138
root: "gopkg.in/sdboyer/gps.v0",
139139
mb: maybeSources{
140-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/golang/dep/gps"), major: 0},
141-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://[email protected]/golang/dep/gps"), major: 0},
142-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/golang/dep/gps"), major: 0},
143-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/golang/dep/gps"), major: 0},
140+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/sdboyer/gps"), major: 0},
141+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("ssh://[email protected]/sdboyer/gps"), major: 0},
142+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("git://github.com/sdboyer/gps"), major: 0},
143+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/sdboyer/gps"), major: 0},
144144
},
145145
},
146146
{
147147
in: "gopkg.in/sdboyer/gps.v1/foo/bar",
148148
root: "gopkg.in/sdboyer/gps.v1",
149149
mb: maybeSources{
150-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("https://github.com/golang/dep/gps"), major: 1},
151-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("ssh://[email protected]/golang/dep/gps"), major: 1},
152-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("git://github.com/golang/dep/gps"), major: 1},
153-
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("http://github.com/golang/dep/gps"), major: 1},
150+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("https://github.com/sdboyer/gps"), major: 1},
151+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("ssh://[email protected]/sdboyer/gps"), major: 1},
152+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("git://github.com/sdboyer/gps"), major: 1},
153+
maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("http://github.com/sdboyer/gps"), major: 1},
154154
},
155155
},
156156
{

‎gps/identifier.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ import (
2020
// management domain has lots of different path-ish strings floating around:
2121
//
2222
// actual directories:
23-
// /home/sdboyer/go/src/github.com/golang/dep/gps/example
23+
// /home/sdboyer/go/src/github.com/sdboyer/gps/example
2424
// URLs:
25-
// https://github.com/golang/dep/gps
25+
// https://github.com/sdboyer/gps
2626
// import paths:
27-
// github.com/golang/dep/gps/example
27+
// github.com/sdboyer/gps/example
2828
// portions of import paths that refer to a package:
2929
// example
3030
// portions that could not possibly refer to anything sane:
3131
// github.com/sdboyer
3232
// portions that correspond to a repository root:
33-
// github.com/golang/dep/gps
33+
// github.com/sdboyer/gps
3434
//
3535
// While not a panacea, having ProjectRoot allows gps to clearly indicate via
3636
// the type system when a path-ish string must have particular semantics.
@@ -49,10 +49,10 @@ type ProjectRoot string
4949
// These can be either a full URL, including protocol, or plain import paths.
5050
// So, these are all valid data for Source:
5151
//
52-
// github.com/golang/dep/gps
52+
// github.com/sdboyer/gps
5353
// github.com/fork/gps
5454
// [email protected]:sdboyer/gps
55-
// https://github.com/golang/dep/gps
55+
// https://github.com/sdboyer/gps
5656
//
5757
// With plain import paths, network addresses are derived purely through an
5858
// algorithm. By having an explicit network name, it becomes possible to, for

0 commit comments

Comments
 (0)