Merge pull request golang#342 from carolynvs/toml-allthethings

Move to TOML for manifest and lock

Gopkg.toml

@@ -0,0 +1,20 @@
+
+[[dependencies]]
+  branch = "2.x"
+  name = "github.com/Masterminds/semver"
+
+[[dependencies]]
+  name = "github.com/Masterminds/vcs"
+  version = "^1.8.0"
+
+[[dependencies]]
+  branch = "master"
+  name = "github.com/pelletier/go-toml"
+
+[[dependencies]]
+  name = "github.com/pkg/errors"
+  version = ">=0.8.0, <1.0.0"
+
+[[dependencies]]
+  name = "github.com/sdboyer/gps"
+  version = ">=0.15.0, <1.0.0"

analyzer_test.go

@@ -18,7 +18,7 @@ func TestDeriveManifestAndLock(t *testing.T) {
 	defer h.Cleanup()
 
 	h.TempDir("dep")
-	golden := "analyzer/manifest.json"
+	golden := filepath.Join("analyzer", ManifestName)
 	want := h.GetTestFileString(golden)
 	h.TempCopy(filepath.Join("dep", ManifestName), golden)
 
@@ -29,7 +29,7 @@ func TestDeriveManifestAndLock(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	got, err := m.(*Manifest).MarshalJSON()
+	got, err := m.(*Manifest).MarshalTOML()
 	if err != nil {
 		t.Fatal(err)
 	}

cmd/dep/integration_test.go

@@ -11,6 +11,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/golang/dep"
 	"github.com/golang/dep/test"
 )
 
@@ -56,8 +57,8 @@ func TestIntegration(t *testing.T) {
 				}
 
 				// Check final manifest and lock
-				testCase.CompareFile("manifest.json", testProj.ProjPath("manifest.json"))
-				testCase.CompareFile("lock.json", testProj.ProjPath("lock.json"))
+				testCase.CompareFile(dep.ManifestName, testProj.ProjPath(dep.ManifestName))
+				testCase.CompareFile(dep.LockName, testProj.ProjPath(dep.LockName))
 
 				// Check vendor paths
 				testProj.CompareImportPaths()

cmd/dep/testdata/harness_tests/README.md

@@ -14,11 +14,11 @@ The directory structure is as follows:
                         testcase.json
                         initial/
                             file1.go
-                            manifest.json
+                            Gopkg.toml
                             ...
                         final/
-                            manifest.json
-                            lock.json
+                            Gopkg.toml
+                            Gopkg.lock
                     case2/
                     ...
 

cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.toml

@@ -0,0 +1,4 @@
+
+[[dependencies]]
+  name = "github.com/sdboyer/deptest"
+  version = "^0.8.0"

cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/override/case1/final/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/update/case2/final/Gopkg.toml

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

cmd/dep/testdata/harness_tests/ensure/update/case2/initial/Gopkg.toml

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