Change manifest and lock file names to manifest.toml and lock.toml

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
+                            manifest.toml
                             ...
                         final/
-                            manifest.json
-                            lock.json
+                            manifest.toml
+                            lock.toml
                     case2/
                     ...
 

context.go

@@ -48,7 +48,7 @@ func (c *Ctx) SourceManager() (*gps.SourceMgr, error) {
 // a project root.  If an absolute path is given, the search begins in that
 // directory.  If a relative or empty path is given, the search start is computed
 // from the current working directory.  The search stops when a file with the
-// name ManifestName (manifest.json, by default) is located.
+// name ManifestName (manifest.toml, by default) is located.
 //
 // The Project contains the parsed manifest as well as a parsed lock file, if
 // present.  The import path is calculated as the remaining path segment

hack/validate-vendor.bash

@@ -21,7 +21,7 @@ fi
 VALIDATE_HEAD="$(git rev-parse --verify HEAD)"
 
 IFS=$'\n'
-files=( $(git diff "$TRAVIS_BRANCH...$VALIDATE_HEAD" --diff-filter=ACMR --name-only -- 'manifest.json' 'lock.json' 'vendor/' || true) )
+files=( $(git diff "$TRAVIS_BRANCH...$VALIDATE_HEAD" --diff-filter=ACMR --name-only -- 'manifest.toml' 'lock.toml' 'vendor/' || true) )
 unset IFS
 
 if [ ${#files[@]} -gt 0 ]; then
@@ -29,7 +29,7 @@ if [ ${#files[@]} -gt 0 ]; then
 	go build
 	./dep ensure
 	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- vendor manifest.json lock.json 2>/dev/null)"
+	diffs="$(git status --porcelain -- vendor manifest.toml lock.toml 2>/dev/null)"
 	if [ "$diffs" ]; then
 		{
 			echo 'The result of ensure differs'

lock.go

@@ -16,7 +16,7 @@ import (
 	"github.com/sdboyer/gps"
 )
 
-const LockName = "lock.json"
+const LockName = "lock.toml"
 
 type Lock struct {
 	Memo []byte

manifest.go

@@ -14,7 +14,7 @@ import (
 	"github.com/sdboyer/gps"
 )
 
-const ManifestName = "manifest.json"
+const ManifestName = "manifest.toml"
 
 type Manifest struct {
 	Dependencies gps.ProjectConstraints

test/test.go

@@ -584,7 +584,7 @@ func (h *Helper) Cleanup() {
 
 // ReadManifest returns the manifest in the current directory.
 func (h *Helper) ReadManifest() string {
-	m := filepath.Join(h.pwd(), "manifest.json")
+	m := filepath.Join(h.pwd(), "manifest.toml")
 	h.MustExist(m)
 
 	f, err := ioutil.ReadFile(m)
@@ -594,7 +594,7 @@ func (h *Helper) ReadManifest() string {
 
 // ReadLock returns the lock in the current directory.
 func (h *Helper) ReadLock() string {
-	l := filepath.Join(h.pwd(), "lock.json")
+	l := filepath.Join(h.pwd(), "lock.toml")
 	h.MustExist(l)
 
 	f, err := ioutil.ReadFile(l)

test_project_context_test.go

@@ -54,7 +54,7 @@ func (pc *TestProjectContext) CopyFile(projectPath string, testdataPath string)
 }
 
 func (pc *TestProjectContext) Load() {
-	// TODO(carolynvs): Can't use Ctx.LoadProject until dep doesn't require a manifest.json at the project root or it also looks for lock.json
+	// TODO(carolynvs): Can't use Ctx.LoadProject until dep doesn't require a manifest at the project root or it also looks for lock
 	var err error
 	var m *Manifest
 	mp := pc.getManifestPath()

txn_writer.go

@@ -364,7 +364,7 @@ fail:
 
 func (sw *SafeWriter) PrintPreparedActions() error {
 	if sw.Payload.HasManifest() {
-		fmt.Println("Would have written the following manifest.json:")
+		fmt.Println("Would have written the following manifest.toml:")
 		m, err := sw.Payload.Manifest.MarshalTOML()
 		if err != nil {
 			return errors.Wrap(err, "ensure DryRun cannot serialize manifest")
@@ -374,14 +374,14 @@ func (sw *SafeWriter) PrintPreparedActions() error {
 
 	if sw.Payload.HasLock() {
 		if sw.Payload.LockDiff == nil {
-			fmt.Println("Would have written the following lock.json:")
+			fmt.Println("Would have written the following lock.toml:")
 			l, err := sw.Payload.Lock.MarshalTOML()
 			if err != nil {
 				return errors.Wrap(err, "ensure DryRun cannot serialize lock")
 			}
 			fmt.Println(string(l))
 		} else {
-			fmt.Println("Would have written the following changes to lock.json:")
+			fmt.Println("Would have written the following changes to lock.toml:")
 			diff, err := sw.Payload.LockDiff.Format()
 			if err != nil {
 				return errors.Wrap(err, "ensure DryRun cannot serialize the lock diff")