implements v1.0

Author: xrlin

build.bat

@@ -0,0 +1,14 @@
+SET CGO_ENABLED=0
+SET GOOS=darwin
+SET GOARCH=amd64
+go build -o git-json-diff-osx cmd/git-json-diff/main.go
+
+SET CGO_ENABLED=0
+SET GOOS=linux
+SET GOARCH=amd64
+go build -o git-json-diff cmd/git-json-diff/main.go
+
+SET CGO_ENABLED=0
+SET GOOS=windows
+SET GOARCH=amd64
+go build -o git-json-diff.exe cmd/git-json-diff/main.go

cmd/main.go renamed to cmd/git-json-diff/main.go

@@ -24,7 +24,7 @@ func main() {
 
 	jsonText2, err := git_json_diff.RetrieveFileContentWithCommitId(*filePath, *commit2)
 
-	diffString, err := git_json_diff.Compare(jsonText1, jsonText2, *format)
+	diffString, err := git_json_diff.Compare(jsonText2, jsonText1, *format)
 	if err != nil {
 		log.Fatalln(err)
 	}

git.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"encoding/json"
 	"github.com/yudai/gojsondiff/formatter"
-)
+	)
 
 func isGitInstall() bool {
 	if _, err := exec.LookPath("git"); err != nil {
@@ -34,7 +34,29 @@ func RetrieveFileContentWithCommitId(filePath, commitId string) (ret string, err
 	return string(stdout), err
 }
 
+func checkJSONUnmarshal(jsonText string) error {
+	var m  map[string]interface{}
+	err := json.Unmarshal([]byte(jsonText), &m)
+	return err
+}
+
 func Compare(jsonText1, jsonText2, outFormat string) (string, error) {
+	if jsonText1 == "" {
+		jsonText1 = "{}"
+	}
+
+	if jsonText2 == "" {
+		jsonText2 = "{}"
+	}
+
+	if err := checkJSONUnmarshal(jsonText1); err != nil {
+		return "", fmt.Errorf("json content:\n %s \n decode failed with error: %s\n", jsonText1, err)
+	}
+
+	if err := checkJSONUnmarshal(jsonText2); err != nil {
+		return "", fmt.Errorf("json content:\n %s \n decode failed with error: %s\n", jsonText2, err)
+	}
+
 	differ := diff.New()
 	d, err := differ.Compare([]byte(jsonText1), []byte(jsonText2))
 	if err != nil {

git_test.go

@@ -42,6 +42,14 @@ func TestCompare(t *testing.T) {
   ]
 }
 	`},
+		{
+			`{
+	"item1": [
+		{"up": 1, "down": 2}
+	]
+	}`,
+			``,
+		},
 	}
 	for _, c := range testCases {
 		diffStr, err := Compare(c.input1, c.input2, "ascii")