Merge pull request #1256 from JelteF/no-vendor-dry-run

ensure: Make -no-vendor combined with -dry-run fail when Gopkg.lock is outdated

Author: sdboyer

CHANGELOG.md

@@ -5,6 +5,8 @@ NEW FEATURES:
 * Wildcard ignore support. (#1156)
 * Disable SourceManager lock by setting `DEPNOLOCK` environment variable.
 (#1206)
+* `dep ensure -no-vendor -dry-run` now exits with an error when changes would
+have to be made to `Gopkg.lock`. This is useful for CI. (#1256)
 
 BUG FIXES:
 

cmd/dep/ensure.go

@@ -110,6 +110,12 @@ dep ensure -update -no-vendor
 
     As above, but only modify Gopkg.lock; leave vendor/ unchanged.
 
+dep ensure -no-vendor -dry-run
+
+    This fails with a non zero exit code if Gopkg.lock is not up to date with
+    the Gopkg.toml or the project imports. It can be useful to run this during
+    CI to check if Gopkg.lock is up to date.
+
 `
 
 var (
@@ -267,6 +273,10 @@ func (cmd *ensureCommand) runDefault(ctx *dep.Ctx, args []string, p *dep.Project
 		return errors.WithMessage(sw.Write(p.AbsRoot, sm, true, logger), "grouped write of manifest, lock and vendor")
 	}
 
+	if cmd.noVendor && cmd.dryRun {
+		return errors.New("Gopkg.lock was not up to date")
+	}
+
 	solution, err := solver.Solve()
 	if err != nil {
 		handleAllTheFailuresOfTheWorld(err)

cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/final/Gopkg.lock

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "1.0.0"

cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/final/Gopkg.toml

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "1.0.0"

cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/Gopkg.lock

@@ -0,0 +1,12 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	_ "github.com/sdboyer/deptest"
+)
+
+func main() {
+}

cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/Gopkg.toml

@@ -0,0 +1,5 @@
+{
+  "commands": [
+    ["ensure", "-no-vendor", "-dry-run"]
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/main.go

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "1.0.0"

cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/testcase.json

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "1.0.0"

cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/final/Gopkg.lock

@@ -0,0 +1,12 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package main
+
+import (
+	_ "github.com/sdboyer/deptest"
+)
+
+func main() {
+}

cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/final/Gopkg.toml

@@ -0,0 +1,6 @@
+{
+  "commands": [
+    ["ensure", "-no-vendor", "-dry-run"]
+  ],
+  "error-expected": "Gopkg.lock was not up to date"
+}