modify

Author: xrlin

.idea/git-json-diff.iml

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"log"
+	"github.com/xrlin/git-json-diff"
+)
+
+func main() {
+	filePath := flag.String("file", "", "file in repo to show diff")
+	commit1 := flag.String("commit1", "HEAD", "commit id, as current version, to fetch the file content.")
+	commit2 := flag.String("commit2", "HEAD~", "commit id, as the old version, to fetch the file content.")
+	format := flag.String("format", "ascii", "Diff Output Format (ascii, delta)")
+	flag.Parse()
+
+	if *filePath == "" {
+		flag.Usage()
+		os.Exit(1)
+	}
+
+	jsonText1, err := git_json_diff.RetrieveFileContentWithCommitId(*filePath, *commit1)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	jsonText2, err := git_json_diff.RetrieveFileContentWithCommitId(*filePath, *commit2)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	diffString, err := git_json_diff.Compare(jsonText1, jsonText2, *format)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	fmt.Println(diffString)
+
+}

.idea/workspace.xml

@@ -3,7 +3,6 @@ package git_json_diff
 import (
 	"os/exec"
 	"log"
-	"io/ioutil"
 	diff "github.com/yudai/gojsondiff"
 	"fmt"
 	"encoding/json"
@@ -17,27 +16,22 @@ func isGitInstall() bool {
 	return true
 }
 
-func RetriveFileContentWithCommitId(filePath, commitid string) (string, error) {
-	if isGitInstall() {
+func RetrieveFileContentWithCommitId(filePath, commitId string) (ret string, err error) {
+	if !isGitInstall() {
 		log.Fatalln("cannot find git command")
 	}
-	cmd := exec.Command("git", "show " + commitid + ":" + filePath)
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		log.Fatal(err)
-	}
+	cmd := exec.Command("git", "show",  commitId + ":" + filePath)
+	stdout, err := cmd.CombinedOutput()
 	defer func() {
-		stdout.Close()
+		if err != nil {
+			fmt.Printf("running %s with args %s riase error: %s\n", cmd.Path, cmd.Args, stdout)
+		}
 	}()
 
-	if err := cmd.Start(); err != nil {
-		log.Fatal(err)
-	}
-	if err := cmd.Wait(); err != nil {
-		log.Fatal(err)
+	if err != nil {
+		return "", err
 	}
-	b, err := ioutil.ReadAll(stdout)
-	return string(b), err
+	return string(stdout), err
 }
 
 func Compare(jsonText1, jsonText2, outFormat string) (string, error) {

Gopkg.lock

@@ -0,0 +1,10 @@
+package git_json_diff
+
+import "testing"
+
+func TestRetrieveFileContentWithCommitId(t *testing.T) {
+	_, err := RetrieveFileContentWithCommitId("test.json", "HEAD")
+	if err != nil {
+		t.Errorf("failed with error: %v\n", err)
+	}
+}

Gopkg.toml

@@ -0,0 +1,7 @@
+module github.com/xrlin/git-json-diff
+
+require (
+	github.com/sergi/go-diff v1.0.0 // indirect
+	github.com/yudai/gojsondiff v1.0.0
+	github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
+)

cmd/main.go

@@ -0,0 +1,6 @@
+github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
+github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=