first commit

Author: xrlin

.idea/git-json-diff.iml

@@ -0,0 +1,22 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+

.idea/misc.xml

@@ -0,0 +1,74 @@
+package git_json_diff
+
+import (
+	"os/exec"
+	"log"
+	"io/ioutil"
+	diff "github.com/yudai/gojsondiff"
+	"fmt"
+	"encoding/json"
+	"github.com/yudai/gojsondiff/formatter"
+)
+
+func isGitInstall() bool {
+	if _, err := exec.LookPath("git"); err != nil {
+		return false
+	}
+	return true
+}
+
+func RetriveFileContentWithCommitId(filePath, commitid string) (string, 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)
+	}
+	defer func() {
+		stdout.Close()
+	}()
+
+	if err := cmd.Start(); err != nil {
+		log.Fatal(err)
+	}
+	if err := cmd.Wait(); err != nil {
+		log.Fatal(err)
+	}
+	b, err := ioutil.ReadAll(stdout)
+	return string(b), err
+}
+
+func Compare(jsonText1, jsonText2, outFormat string) (string, error) {
+	differ := diff.New()
+	d, err := differ.Compare([]byte(jsonText1), []byte(jsonText2))
+	if err != nil {
+		return "", err
+	}
+	if !d.Modified() {
+		return "", err
+	}
+	return formatDiff(d, jsonText1, outFormat, true)
+}
+
+func formatDiff(d diff.Diff, prevJsonText string, format string, enableColor bool) (ret string, err error) {
+	if format == "ascii" {
+		var aJson map[string]interface{}
+		json.Unmarshal([]byte(prevJsonText), &aJson)
+
+		config := formatter.AsciiFormatterConfig{
+			ShowArrayIndex: true,
+			Coloring:       enableColor,
+		}
+
+		formatTransfer := formatter.NewAsciiFormatter(aJson, config)
+		return formatTransfer.Format(d)
+	}
+
+	if format == "delta" {
+		formatTransfer := formatter.NewDeltaFormatter()
+		return formatTransfer.Format(d)
+	}
+	return "", fmt.Errorf("unkonw format %s", format)
+}

.idea/modules.xml

@@ -0,0 +1,37 @@
+package git_json_diff
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"log"
+)
+
+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, default HEAD")
+	commit2 := flag.String("commit2", "HEAD^", "commit id, as the old version, to fetch the file content , default HEAD^")
+	format := flag.String("format", "ascii", "Diff Output Format (ascii, delta)")
+	flag.Parse()
+
+	if len(flag.Args()) == 0 {
+		flag.Usage()
+		os.Exit(1)
+	}
+
+	jsonText1, err := RetriveFileContentWithCommitId(*filePath, *commit1)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	jsonText2, err := RetriveFileContentWithCommitId(*filePath, *commit2)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	diffString, err := Compare(jsonText1, jsonText2, *format)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	fmt.Println(diffString)
+
+}