Implement new spec for dep ensure

cmd/dep/testdata/harness_tests/ensure/add/desync/initial/main.go

@@ -0,0 +1,18 @@
+// 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"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	err := nil
+	if err != nil {
+		deptest.Map["yo yo!"]
+	}
+	deptestdos.diMeLo("whatev")
+}

cmd/dep/testdata/harness_tests/ensure/add/desync/testcase.json

@@ -0,0 +1,6 @@
+{
+  "commands": [
+    ["ensure", "-add", "foobar.com/baz"]
+  ],
+  "error-expected": "Gopkg.toml and Gopkg.lock are out of sync. Run a plain dep ensure to resync them before attempting to -add"
+}

cmd/dep/testdata/harness_tests/ensure/add/exists-imports/final/Gopkg.toml

@@ -0,0 +1,4 @@
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/sdboyer/deptesttres"

cmd/dep/testdata/harness_tests/ensure/package/case2/initial/main.go → cmd/dep/testdata/harness_tests/ensure/add/exists-imports/initial/main.go

@@ -5,8 +5,9 @@
 package main
 
 import (
-	_ "github.com/sdboyer/deptest"
+	"github.com/sdboyer/deptesttres"
 )
 
 func main() {
+	type a deptesttres.Bar
 }

cmd/dep/testdata/harness_tests/ensure/add/exists-imports/testcase.json

@@ -0,0 +1,8 @@
+{
+  "commands": [
+    ["ensure", "-add", "github.com/sdboyer/deptesttres@master"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptesttres"
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/final/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/package/case1/initial/main.go → cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/main.go

@@ -5,8 +5,9 @@
 package main
 
 import (
-	_ "github.com/sdboyer/deptest"
+	"github.com/sdboyer/deptesttres"
 )
 
 func main() {
+	type a deptesttres.Bar
 }

cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/testcase.json

@@ -0,0 +1,9 @@
+{
+  "commands": [
+    ["ensure", "-add", "github.com/sdboyer/deptest"]
+  ],
+  "vendor-final": [
+      "github.com/sdboyer/deptest",
+      "github.com/sdboyer/deptesttres"
+  ]
+}

cmd/dep/testdata/harness_tests/ensure/add/exists-manifest/final/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/add/exists-manifest/initial/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/override/case1/initial/main.go → cmd/dep/testdata/harness_tests/ensure/add/exists-manifest/initial/main.go

@@ -5,11 +5,9 @@
 package main
 
 import (
-	"fmt"
-
-	stuff "github.com/sdboyer/deptest"
+	"github.com/sdboyer/deptesttres"
 )
 
 func main() {
-	fmt.Println(stuff.Thing)
+	type a deptesttres.Bar
 }

cmd/dep/testdata/harness_tests/ensure/add/exists-manifest/testcase.json

@@ -0,0 +1,6 @@
+{
+  "commands": [
+    ["ensure", "-add", "github.com/sdboyer/deptest@1.0.0"]
+  ],
+  "error-expected": "Gopkg.toml already contains rules for github.com/sdboyer/deptest, cannot specify a version constraint"
+}

cmd/dep/testdata/harness_tests/ensure/add/exists/final/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/add/exists/initial/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/add/exists/initial/main.go

@@ -0,0 +1,13 @@
+// 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() {
+	_ := deptest.Map["yo yo!"]
+}

cmd/dep/testdata/harness_tests/ensure/add/exists/testcase.json

@@ -0,0 +1,6 @@
+{
+  "commands": [
+    ["ensure", "-add", "github.com/sdboyer/deptest"]
+  ],
+  "error-expected": "nothing to -add, github.com/sdboyer/deptest is already in Gopkg.toml and the project's direct imports or required list"
+}

cmd/dep/testdata/harness_tests/ensure/add/noarg/final/Gopkg.toml

@@ -0,0 +1,3 @@
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "~0.8.0"

cmd/dep/testdata/harness_tests/ensure/add/noarg/final/main.go

@@ -0,0 +1,18 @@
+// 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"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	err := nil
+	if err != nil {
+		deptest.Map["yo yo!"]
+	}
+	deptestdos.diMeLo("whatev")
+}

cmd/dep/testdata/harness_tests/ensure/add/noarg/initial/Gopkg.toml

@@ -0,0 +1,3 @@
+[[constraint]]
+  name = "github.com/sdboyer/deptest"
+  version = "~0.8.0"

cmd/dep/testdata/harness_tests/ensure/add/noarg/initial/main.go

@@ -0,0 +1,18 @@
+// 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"
+	"github.com/sdboyer/deptestdos"
+)
+
+func main() {
+	err := nil
+	if err != nil {
+		deptest.Map["yo yo!"]
+	}
+	deptestdos.diMeLo("whatev")
+}

cmd/dep/testdata/harness_tests/ensure/add/noarg/testcase.json

@@ -0,0 +1,6 @@
+{
+  "commands": [
+    ["ensure", "-add"]
+  ],
+  "error-expected": "must specify at least one project or package to -add"
+}