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

Commit ffd86cf

Browse files
RhymondRhymond
committed
Merge branch 'master' of https://github.com/golang/dep into dot_output
2 parents b519dfa + 7f85e04 commit ffd86cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2134
-1152
lines changed

‎analyzer.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"os"
99
"path/filepath"
1010

11-
"github.com/Masterminds/semver"
1211
"github.com/sdboyer/gps"
1312
)
1413

@@ -37,7 +36,6 @@ func (a analyzer) DeriveManifestAndLock(path string, n gps.ProjectRoot) (gps.Man
3736
return m, nil, nil
3837
}
3938

40-
func (a analyzer) Info() (string, *semver.Version) {
41-
v, _ := semver.NewVersion("v0.0.1")
42-
return "dep", v
39+
func (a analyzer) Info() (string, int) {
40+
return "dep", 1
4341
}

‎cmd/dep/ensure.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/golang/dep"
1919
"github.com/pkg/errors"
2020
"github.com/sdboyer/gps"
21+
"github.com/sdboyer/gps/pkgtree"
2122
)
2223

2324
const ensureShortHelp = `Ensure a dependency is safely vendored in the project`
@@ -123,7 +124,7 @@ func (cmd *ensureCommand) Run(ctx *dep.Ctx, args []string) error {
123124
params.Trace = true
124125
params.TraceLogger = log.New(os.Stderr, "", 0)
125126
}
126-
params.RootPackageTree, err = gps.ListPackages(p.AbsRoot, string(p.ImportRoot))
127+
params.RootPackageTree, err = pkgtree.ListPackages(p.AbsRoot, string(p.ImportRoot))
127128
if err != nil {
128129
return errors.Wrap(err, "ensure ListPackage for project")
129130
}

‎cmd/dep/hash_in.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/golang/dep"
1212
"github.com/pkg/errors"
1313
"github.com/sdboyer/gps"
14+
"github.com/sdboyer/gps/pkgtree"
1415
)
1516

1617
func (cmd *hashinCommand) Name() string { return "hash-inputs" }
@@ -42,7 +43,7 @@ func (hashinCommand) Run(ctx *dep.Ctx, args []string) error {
4243
return errors.Wrap(err, "determineProjectRoot")
4344
}
4445

45-
params.RootPackageTree, err = gps.ListPackages(p.AbsRoot, cpr)
46+
params.RootPackageTree, err = pkgtree.ListPackages(p.AbsRoot, cpr)
4647
if err != nil {
4748
return errors.Wrap(err, "gps.ListPackages")
4849
}

‎cmd/dep/init.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/golang/dep"
1616
"github.com/pkg/errors"
1717
"github.com/sdboyer/gps"
18+
"github.com/sdboyer/gps/pkgtree"
1819
)
1920

2021
const initShortHelp = `Initialize a new project with manifest and lock files`
@@ -89,7 +90,7 @@ func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
8990
return errors.Wrap(err, "determineProjectRoot")
9091
}
9192
vlogf("Finding dependencies for %q...", cpr)
92-
pkgT, err := gps.ListPackages(root, cpr)
93+
pkgT, err := pkgtree.ListPackages(root, cpr)
9394
if err != nil {
9495
return errors.Wrap(err, "gps.ListPackages")
9596
}
@@ -214,7 +215,7 @@ type projectData struct {
214215
ondisk map[gps.ProjectRoot]gps.Version // projects that were found on disk
215216
}
216217

217-
func getProjectData(ctx *dep.Ctx, pkgT gps.PackageTree, cpr string, sm *gps.SourceMgr) (projectData, error) {
218+
func getProjectData(ctx *dep.Ctx, pkgT pkgtree.PackageTree, cpr string, sm *gps.SourceMgr) (projectData, error) {
218219
constraints := make(gps.ProjectConstraints)
219220
dependencies := make(map[gps.ProjectRoot][]string)
220221
packages := make(map[string]bool)
@@ -285,7 +286,7 @@ func getProjectData(ctx *dep.Ctx, pkgT gps.PackageTree, cpr string, sm *gps.Sour
285286
)
286287

287288
// cache of PackageTrees, so we don't parse projects more than once
288-
ptrees := make(map[gps.ProjectRoot]gps.PackageTree)
289+
ptrees := make(map[gps.ProjectRoot]pkgtree.PackageTree)
289290

290291
// depth-first traverser
291292
var dft func(string) error
@@ -339,7 +340,7 @@ func getProjectData(ctx *dep.Ctx, pkgT gps.PackageTree, cpr string, sm *gps.Sour
339340
ondisk[pr] = v
340341
}
341342

342-
ptree, err = gps.ListPackages(r, string(pr))
343+
ptree, err = pkgtree.ListPackages(r, string(pr))
343344
if err != nil {
344345
// Any error here other than an a nonexistent dir (which
345346
// can't happen because we covered that case above) is

‎cmd/dep/main.go

+27
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,28 @@ func main() {
4040
&hashinCommand{},
4141
}
4242

43+
examples := [][2]string{
44+
{
45+
"dep init",
46+
"set up a new project",
47+
},
48+
{
49+
"dep ensure",
50+
"install the project's dependencies",
51+
},
52+
{
53+
"dep ensure -update",
54+
"update the locked versions of all dependencies",
55+
},
56+
{
57+
"dep ensure github.com/pkg/errors",
58+
"add a dependency to the project",
59+
},
60+
}
61+
4362
usage := func() {
63+
fmt.Fprintln(os.Stderr, "dep is a tool for managing dependencies for Go projects")
64+
fmt.Fprintln(os.Stderr)
4465
fmt.Fprintln(os.Stderr, "Usage: dep <command>")
4566
fmt.Fprintln(os.Stderr)
4667
fmt.Fprintln(os.Stderr, "Commands:")
@@ -53,6 +74,12 @@ func main() {
5374
}
5475
w.Flush()
5576
fmt.Fprintln(os.Stderr)
77+
fmt.Fprintln(os.Stderr, "Examples:")
78+
for _, example := range examples {
79+
fmt.Fprintf(w, "\t%s\t%s\n", example[0], example[1])
80+
}
81+
w.Flush()
82+
fmt.Fprintln(os.Stderr)
5683
fmt.Fprintln(os.Stderr, "Use \"dep help [command]\" for more information about a command.")
5784
}
5885

‎cmd/dep/remove.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/golang/dep"
1414
"github.com/pkg/errors"
1515
"github.com/sdboyer/gps"
16+
"github.com/sdboyer/gps/pkgtree"
1617
)
1718

1819
const removeShortHelp = `Remove a dependency from the project`
@@ -60,7 +61,7 @@ func (cmd *removeCommand) Run(ctx *dep.Ctx, args []string) error {
6061
return errors.Wrap(err, "determineProjectRoot")
6162
}
6263

63-
pkgT, err := gps.ListPackages(p.AbsRoot, cpr)
64+
pkgT, err := pkgtree.ListPackages(p.AbsRoot, cpr)
6465
if err != nil {
6566
return errors.Wrap(err, "gps.ListPackages")
6667
}

‎cmd/dep/status.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/golang/dep"
1919
"github.com/pkg/errors"
2020
"github.com/sdboyer/gps"
21+
"github.com/sdboyer/gps/pkgtree"
2122
)
2223

2324
const statusShortHelp = `Report the status of the project's dependencies`
@@ -241,7 +242,7 @@ func runStatusAll(out outputter, p *dep.Project, sm *gps.SourceMgr) error {
241242

242243
// While the network churns on ListVersions() requests, statically analyze
243244
// code from the current project.
244-
ptree, err := gps.ListPackages(p.AbsRoot, string(p.ImportRoot))
245+
ptree, err := pkgtree.ListPackages(p.AbsRoot, string(p.ImportRoot))
245246
if err != nil {
246247
return errors.Errorf("analysis of local packages failed: %v", err)
247248
}
@@ -420,7 +421,7 @@ func formatVersion(v gps.Version) string {
420421
return v.String()
421422
}
422423

423-
func collectConstraints(ptree gps.PackageTree, p *dep.Project, sm *gps.SourceMgr) map[string][]gps.Constraint {
424+
func collectConstraints(ptree pkgtree.PackageTree, p *dep.Project, sm *gps.SourceMgr) map[string][]gps.Constraint {
424425
// TODO
425426
return map[string][]gps.Constraint{}
426427
}

‎cmd/dep/testdata/harness_tests/ensure/empty/case1/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "63510efb9632ec69c1164ce396d7ebea4ad3884b4fa508373da17226d5a39739",
2+
"memo": "4b36ae008ef4be09dee7e2ae00606d44fd75f4310fd0d0ef6e744690290569de",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/ensure/empty/case2/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "1a99b419931283cb086167ddfb2e8322df12e2648e139eb27a42904360e962ad",
2+
"memo": "e7725ea56516a42a641aaaf5d48754258d9f3c59949cb8a0e8a21b1ab6e07179",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/ensure/override/case1/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "70b47774699956441e395f458714b8e5800b54bebc73b046678245b9e1cfdc3b",
2+
"memo": "8bca9526e654e56e05d9075d1f33fa5b649bf6d58aa7d71ca39e7fbea8468e07",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/ensure/update/case1/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "3ee7126505b016d4b9140dc3521b931380fd9d61fd1d1e6612d6b5b56b21baad",
2+
"memo": "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/ensure/update/case2/testcase.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"commands": [
33
["init"],
44
["ensure", "-n", "-update", "github.com/sdboyer/deptest"]
5-
]
5+
],
6+
"vendor-final": []
67
}

‎cmd/dep/testdata/harness_tests/init/case2/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "1792d407a795640a2b821b350f481bc48852535ed17c98cae2cbe2912a9c3e36",
2+
"memo": "88d2718cda70cce45158f953d2c6ead79c1db38e67e9704aff72be8fddb096e7",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/init/skip-hidden/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "63510efb9632ec69c1164ce396d7ebea4ad3884b4fa508373da17226d5a39739",
2+
"memo": "4b36ae008ef4be09dee7e2ae00606d44fd75f4310fd0d0ef6e744690290569de",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/remove/force/case1/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "1792d407a795640a2b821b350f481bc48852535ed17c98cae2cbe2912a9c3e36",
2+
"memo": "88d2718cda70cce45158f953d2c6ead79c1db38e67e9704aff72be8fddb096e7",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/remove/specific/case1/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "1a90a1bc14e6c5302e5c936186412f7e61e380a3b82afc54ea387f3a237843f8",
2+
"memo": "d414dbf5fc668c1085effa68372d02e54b23d058cc66f9fd19ba094c6a946d9b",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/remove/specific/case2/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "ffb96eabfbb48ff1ae4f1ad2145a9e765f1e6aef7a3fbfd36a84ad875fcb3585",
2+
"memo": "38d8431865759ee3bf28fbdfc464f98ee8b56319394ec717df45e9969544cfca",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎cmd/dep/testdata/harness_tests/remove/unused/case1/final/lock.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "1a90a1bc14e6c5302e5c936186412f7e61e380a3b82afc54ea387f3a237843f8",
2+
"memo": "d414dbf5fc668c1085effa68372d02e54b23d058cc66f9fd19ba094c6a946d9b",
33
"projects": [
44
{
55
"name": "github.com/sdboyer/deptest",

‎lock.json

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"memo": "fc012dfb266db9deec4121dd38069e2556ba66a5514939662da94fac1251996e",
2+
"memo": "31a7162c06758e4619ed89b91e1f48bf94ad14f394bbee79299ed0bb5150e409",
33
"projects": [
44
{
55
"name": "github.com/Masterminds/semver",
@@ -11,8 +11,8 @@
1111
},
1212
{
1313
"name": "github.com/Masterminds/vcs",
14-
"version": "v1.8.0",
15-
"revision": "fbe9fb6ad5b5f35b3e82a7c21123cfc526cbf895",
14+
"version": "v1.11.0",
15+
"revision": "795e20f901c3d561de52811fb3488a2cb2c8588b",
1616
"packages": [
1717
"."
1818
]
@@ -35,10 +35,13 @@
3535
},
3636
{
3737
"name": "github.com/sdboyer/gps",
38-
"version": "v0.14.1",
39-
"revision": "287edec9f4ca516577cc3ac9744068a34c4c7b08",
38+
"version": "v0.15.0",
39+
"revision": "b0f646b744e74543c094023d05339ffb82458e35",
4040
"packages": [
41-
"."
41+
".",
42+
"internal",
43+
"internal/fs",
44+
"pkgtree"
4245
]
4346
}
4447
]

‎manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"version": ">=0.8.0, <1.0.0"
1111
},
1212
"github.com/sdboyer/gps": {
13-
"version": ">=0.14.0, <1.0.0"
13+
"version": ">=0.15.0, <1.0.0"
1414
}
1515
}
1616
}

‎vendor/github.com/Masterminds/vcs/.travis.yml

+6-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Masterminds/vcs/CHANGELOG.md

+40
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)