tomll: port to v2 (#727)

Fixes #721

cmd/jsontoml/main.go

@@ -13,15 +13,20 @@ import (
 	"github.com/pelletier/go-toml/v2/internal/cli"
 )
 
-func main() {
-	usage := `jsontoml can be used in two ways:
+const usage = `jsontoml can be used in two ways:
 Reading from stdin:
   cat file.json | jsontoml > file.toml
 
 Reading from a file:
   jsontoml file.json > file.toml
 `
-	cli.Execute(usage, convert)
+
+func main() {
+	p := cli.Program{
+		Usage: usage,
+		Fn:    convert,
+	}
+	p.Execute()
 }
 
 func convert(r io.Reader, w io.Writer) error {

cmd/tomljson/main.go

@@ -15,15 +15,20 @@ import (
 	"github.com/pelletier/go-toml/v2/internal/cli"
 )
 
-func main() {
-	usage := `tomljson can be used in two ways:
+const usage = `tomljson can be used in two ways:
 Reading from stdin:
   cat file.toml | tomljson > file.json
 
 Reading from a file:
   tomljson file.toml > file.json
 `
-	cli.Execute(usage, convert)
+
+func main() {
+	p := cli.Program{
+		Usage: usage,
+		Fn:    convert,
+	}
+	p.Execute()
 }
 
 func convert(r io.Reader, w io.Writer) error {

cmd/tomll/main.go

@@ -0,0 +1,46 @@
+// Tomll is a linter for TOML
+//
+// Usage:
+//   cat file.toml | tomll > file_linted.toml
+//   tomll file1.toml file2.toml # lint the two files in place
+package main
+
+import (
+	"io"
+
+	"github.com/pelletier/go-toml/v2"
+	"github.com/pelletier/go-toml/v2/internal/cli"
+)
+
+const usage = `tomll can be used in two ways:
+
+Reading from stdin, writing to stdout:
+  cat file.toml | tomll > file.toml
+
+Reading and updating a list of files in place:
+  tomll a.toml b.toml c.toml
+
+When given a list of files, tomll will modify all files in place without asking.
+`
+
+func main() {
+	p := cli.Program{
+		Usage:   usage,
+		Fn:      convert,
+		Inplace: true,
+	}
+	p.Execute()
+}
+
+func convert(r io.Reader, w io.Writer) error {
+	var v interface{}
+
+	d := toml.NewDecoder(r)
+	err := d.Decode(&v)
+	if err != nil {
+		return err
+	}
+
+	e := toml.NewEncoder(w)
+	return e.Encode(v)
+}

cmd/tomll/main_test.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"bytes"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestConvert(t *testing.T) {
+	examples := []struct {
+		name     string
+		input    string
+		expected string
+		errors   bool
+	}{
+		{
+			name: "valid toml",
+			input: `
+mytoml.a = 42.0
+`,
+			expected: `[mytoml]
+a = 42.0
+
+`,
+		},
+		{
+			name:   "invalid toml",
+			input:  `[what`,
+			errors: true,
+		},
+	}
+
+	for _, e := range examples {
+		b := new(bytes.Buffer)
+		err := convert(strings.NewReader(e.input), b)
+		if e.errors {
+			require.Error(t, err)
+		} else {
+			assert.NoError(t, err)
+			assert.Equal(t, e.expected, b.String())
+		}
+	}
+}