-
Notifications
You must be signed in to change notification settings - Fork 208
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into vladimirvivien-bugfix/array-tables
- Loading branch information
Showing
4 changed files
with
170 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
package main | ||
|
||
import ( | ||
"github.com/pelletier/go-toml" | ||
"io" | ||
"os" | ||
"flag" | ||
"fmt" | ||
"encoding/json" | ||
) | ||
|
||
func main() { | ||
flag.Usage = func() { | ||
fmt.Fprintln(os.Stderr, `tomljson can be used in two ways: | ||
Writing to STDIN and reading from STDOUT: | ||
cat file.toml | tomljson > file.json | ||
Reading from a file name: | ||
tomljson file.toml | ||
`) | ||
} | ||
flag.Parse() | ||
os.Exit(processMain(flag.Args(), os.Stdin, os.Stdout, os.Stderr)) | ||
} | ||
|
||
func processMain(files []string, defaultInput io.Reader, output io.Writer, errorOutput io.Writer) int { | ||
// read from stdin and print to stdout | ||
inputReader := defaultInput | ||
|
||
if len(files) > 0 { | ||
var err error | ||
inputReader, err = os.Open(files[0]) | ||
if err != nil { | ||
printError(err, errorOutput) | ||
return -1 | ||
} | ||
} | ||
s, err := reader(inputReader) | ||
if err != nil { | ||
printError(err, errorOutput) | ||
return -1 | ||
} | ||
io.WriteString(output, s + "\n") | ||
return 0 | ||
} | ||
|
||
func printError(err error, output io.Writer) { | ||
io.WriteString(output, err.Error() + "\n") | ||
} | ||
|
||
func reader(r io.Reader) (string, error) { | ||
tree, err := toml.LoadReader(r) | ||
if err != nil { | ||
return "", err | ||
} | ||
return mapToJson(tree) | ||
} | ||
|
||
func mapToJson(tree *toml.TomlTree) (string, error) { | ||
treeMap := tree.ToMap() | ||
bytes, err := json.MarshalIndent(treeMap, "", " ") | ||
if err != nil { | ||
return "", err | ||
} | ||
return string(bytes[:]), nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
package main | ||
|
||
import ( | ||
"testing" | ||
"strings" | ||
"bytes" | ||
"os" | ||
"io/ioutil" | ||
) | ||
|
||
func expectBufferEquality(t *testing.T, name string, buffer *bytes.Buffer, expected string) { | ||
output := buffer.String() | ||
if output != expected { | ||
t.Errorf("incorrect %s:\n%s\n\nexpected %s:\n%s", name, output, name, expected) | ||
t.Log([]rune(output)) | ||
t.Log([]rune(expected)) | ||
} | ||
} | ||
|
||
func expectProcessMainResults(t *testing.T, input string, args []string, exitCode int, expectedOutput string, expectedError string) { | ||
inputReader := strings.NewReader(input) | ||
outputBuffer := new(bytes.Buffer) | ||
errorBuffer := new(bytes.Buffer) | ||
|
||
returnCode := processMain(args, inputReader, outputBuffer, errorBuffer) | ||
|
||
expectBufferEquality(t, "output", outputBuffer, expectedOutput) | ||
expectBufferEquality(t, "error", errorBuffer, expectedError) | ||
|
||
if returnCode != exitCode { | ||
t.Error("incorrect return code:", returnCode, "expected", exitCode) | ||
} | ||
} | ||
|
||
|
||
func TestProcessMainReadFromStdin(t *testing.T) { | ||
input := ` | ||
[mytoml] | ||
a = 42` | ||
expectedOutput := `{ | ||
"mytoml": { | ||
"a": 42 | ||
} | ||
} | ||
` | ||
expectedError := `` | ||
expectedExitCode := 0 | ||
|
||
expectProcessMainResults(t, input, []string{}, expectedExitCode, expectedOutput, expectedError) | ||
} | ||
|
||
func TestProcessMainReadFromFile(t *testing.T) { | ||
input := ` | ||
[mytoml] | ||
a = 42` | ||
|
||
|
||
tmpfile, err := ioutil.TempFile("", "example.toml") | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
if _, err := tmpfile.Write([]byte(input)); err != nil { | ||
t.Fatal(err) | ||
} | ||
|
||
defer os.Remove(tmpfile.Name()) | ||
|
||
expectedOutput := `{ | ||
"mytoml": { | ||
"a": 42 | ||
} | ||
} | ||
` | ||
expectedError := `` | ||
expectedExitCode := 0 | ||
|
||
expectProcessMainResults(t, ``, []string{tmpfile.Name()}, expectedExitCode, expectedOutput, expectedError) | ||
} | ||
|
||
func TestProcessMainReadFromMissingFile(t *testing.T) { | ||
expectedError := `open /this/file/does/not/exist: no such file or directory | ||
` | ||
expectProcessMainResults(t, ``, []string{"/this/file/does/not/exist"}, -1, ``, expectedError) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters