Tidy up format package

Author: stilvoid

format/bash.go

@@ -50,7 +50,7 @@ func formatBashInternal(in interface{}, buf *bytes.Buffer) {
 	}
 }
 
-func formatBash(in interface{}) (string, error) {
+func Bash(in interface{}) (string, error) {
 	in = internal.ArraysToMaps(in)
 	in = internal.ForceStringKeys(in)
 

format/bash_test.go

@@ -1,6 +1,10 @@
-package format
+package format_test
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stilvoid/please/format"
+)
 
 func TestBash(t *testing.T) {
 	expecteds := []string{
@@ -24,7 +28,7 @@ func TestBash(t *testing.T) {
 	for i, expected := range expecteds {
 		testCase := testCases[i]
 
-		actual, err := formatBash(testCase)
+		actual, err := format.Bash(testCase)
 
 		if err != nil {
 			t.Errorf("unexpected error: %v", err)

format/benchmark_test.go

@@ -1,6 +1,10 @@
-package format
+package format_test
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stilvoid/please/format"
+)
 
 var input = map[interface{}]interface{}{
 	"description": "some example json",
@@ -18,36 +22,36 @@ var input = map[interface{}]interface{}{
 
 func BenchmarkBash(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		formatBash(input)
+		format.Bash(input)
 	}
 }
 
 func BenchmarkDot(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		formatDot(input)
+		format.Dot(input)
 	}
 }
 
 func BenchmarkJSON(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		formatJSON(input)
+		format.Json(input)
 	}
 }
 
 func BenchmarkQuery(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		formatQuery(input)
+		format.Query(input)
 	}
 }
 
 func BenchmarkXML(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		formatXML(input)
+		format.Xml(input)
 	}
 }
 
 func BenchmarkYAML(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		formatYAML(input)
+		format.Yaml(input)
 	}
 }

format/dot.go

@@ -76,7 +76,7 @@ func flatten(in interface{}, parent string, name string, buf *bytes.Buffer) {
 	}
 }
 
-func formatDot(in interface{}) (string, error) {
+func Dot(in interface{}) (string, error) {
 	in = internal.ForceStringKeys(in)
 
 	var buf bytes.Buffer

format/dot_test.go

@@ -1,6 +1,10 @@
-package format
+package format_test
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stilvoid/please/format"
+)
 
 func TestDot(t *testing.T) {
 	expecteds := []string{
@@ -100,7 +104,7 @@ func TestDot(t *testing.T) {
 	for i, expected := range expecteds {
 		testCase := testCases[i]
 
-		actual, err := formatDot(testCase)
+		actual, err := format.Dot(testCase)
 
 		if err != nil {
 			t.Errorf("unexpected error: %v", err)

format/test.go format/format_test.goformat/test.go renamed to format/format_test.go

@@ -1,4 +1,4 @@
-package format
+package format_test
 
 var testCases = []interface{}{
 	123,

format/formatters.go

@@ -11,12 +11,12 @@ type Formatter func(interface{}) (string, error)
 var formatters = make(map[string]Formatter)
 
 func init() {
-	Register("bash", formatBash)
-	Register("dot", formatDot)
-	Register("json", formatJSON)
-	Register("xml", formatXML)
-	Register("yaml", formatYAML)
-	Register("query", formatQuery)
+	Register("bash", Bash)
+	Register("dot", Dot)
+	Register("json", Json)
+	Register("xml", Xml)
+	Register("yaml", Yaml)
+	Register("query", Query)
 }
 
 // Names returns a sorted list of valid options for the "format" parameter of Format

format/json.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stilvoid/please/internal"
 )
 
-func formatJSON(in interface{}) (string, error) {
+func Json(in interface{}) (string, error) {
 	in = internal.ForceStringKeys(in)
 
 	bytes, err := json.MarshalIndent(in, "", "  ")

format/json_test.go

@@ -1,6 +1,10 @@
-package format
+package format_test
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stilvoid/please/format"
+)
 
 func TestJSON(t *testing.T) {
 	expecteds := []string{
@@ -24,7 +28,7 @@ func TestJSON(t *testing.T) {
 	for i, expected := range expecteds {
 		testCase := testCases[i]
 
-		actual, err := formatJSON(testCase)
+		actual, err := format.Json(testCase)
 
 		if err != nil {
 			t.Errorf("unexpected error: %v", err)

format/query.go

@@ -36,7 +36,7 @@ func formatQueryInternal(in interface{}) string {
 	return output.Encode()
 }
 
-func formatQuery(in interface{}) (string, error) {
+func Query(in interface{}) (string, error) {
 	in = internal.ArraysToMaps(in)
 	in = internal.ForceStringKeys(in)