Write manifest and lock in TOML

analyzer_test.go

@@ -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)
 	}

fs.go

@@ -5,7 +5,6 @@
 package dep
 
 import (
-	"encoding/json"
 	"io"
 	"io/ioutil"
 	"os"
@@ -16,6 +15,13 @@ import (
 	"github.com/pkg/errors"
 )
 
+// Marshaler is the interface implemented by types that
+// can marshal themselves into valid TOML.
+// TODO(carolynvs) Consider adding this to go-toml?
+type Marshaler interface {
+	MarshalTOML() (string, error)
+}
+
 func IsRegular(name string) (bool, error) {
 	// TODO: lstat?
 	fi, err := os.Stat(name)
@@ -59,19 +65,19 @@ func IsNonEmptyDir(name string) (bool, error) {
 	return len(files) != 0, nil
 }
 
-func writeFile(path string, in json.Marshaler) error {
+func writeFile(path string, in Marshaler) error {
 	f, err := os.Create(path)
 	if err != nil {
 		return err
 	}
 	defer f.Close()
 
-	b, err := in.MarshalJSON()
+	s, err := in.MarshalTOML()
 	if err != nil {
 		return err
 	}
 
-	_, err = f.Write(b)
+	_, err = f.WriteString(s)
 	return err
 }
 

manifest_test.go

@@ -79,7 +79,7 @@ func TestWriteManifest(t *testing.T) {
 		Ignores: []string{"github.com/foo/bar"},
 	}
 
-	got, err := m.MarshalJSON()
+	got, err := m.MarshalTOML()
 	if err != nil {
 		t.Fatalf("Error while marshaling valid manifest to TOML: %q", err)
 	}

testdata/txn_writer/expected_lock.toml

@@ -0,0 +1,7 @@
+memo = "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c"
+
+[[projects]]
+  name = "github.com/sdboyer/dep-test"
+  packages = ["."]
+  revision = "2a3a211e171803acb82d1d5d42ceb53228f51751"
+  version = "1.0.0"

txn_writer.go

@@ -365,7 +365,7 @@ fail:
 func (sw *SafeWriter) PrintPreparedActions() error {
 	if sw.Payload.HasManifest() {
 		fmt.Println("Would have written the following manifest.json:")
-		m, err := sw.Payload.Manifest.MarshalJSON()
+		m, err := sw.Payload.Manifest.MarshalTOML()
 		if err != nil {
 			return errors.Wrap(err, "ensure DryRun cannot serialize manifest")
 		}
@@ -375,7 +375,7 @@ func (sw *SafeWriter) PrintPreparedActions() error {
 	if sw.Payload.HasLock() {
 		if sw.Payload.LockDiff == nil {
 			fmt.Println("Would have written the following lock.json:")
-			l, err := sw.Payload.Lock.MarshalJSON()
+			l, err := sw.Payload.Lock.MarshalTOML()
 			if err != nil {
 				return errors.Wrap(err, "ensure DryRun cannot serialize lock")
 			}

txn_writer_test.go

@@ -15,7 +15,7 @@ import (
 
 const safeWriterProject = "safewritertest"
 const safeWriterGoldenManifest = "txn_writer/expected_manifest.json"
-const safeWriterGoldenLock = "txn_writer/expected_lock.json"
+const safeWriterGoldenLock = "txn_writer/expected_lock.toml"
 
 func TestSafeWriter_BadInput_MissingRoot(t *testing.T) {
 	h := test.NewHelper(t)