Added `--json/-j' flag to info command along with corresponding renderers for both txt and JSON.

jaytaylor · aktau · commit f2ebbf795aa4 · 2017-03-29T23:55:05.000+02:00
diff --git a/cmd.go b/cmd.go
@@ -25,22 +25,28 @@ func infocmd(opt Options) error {
 	}
 
 	// Find regular git tags.
-	tags, err := Tags(user, repo, token)
+	foundTags, err := Tags(user, repo, token)
 	if err != nil {
 		return fmt.Errorf("could not fetch tags, %v", err)
 	}
-	if len(tags) == 0 {
+	if len(foundTags) == 0 {
 		return fmt.Errorf("no tags available for %v/%v", user, repo)
 	}
 
-	fmt.Println("tags:")
-	for _, t := range tags {
+	tags := foundTags[:0]
+	for _, t := range foundTags {
 		// If the user only requested one tag, filter out the rest.
 		if tag == "" || t.Name == tag {
-			fmt.Println("-", &t)
+			tags = append(tags, t)
 		}
 	}
 
+	renderer := renderInfoText
+
+	if opt.Info.JSON {
+		renderer = renderInfoJSON
+	}
+
 	// List releases + assets.
 	var releases []Release
 	if tag == "" {
@@ -60,6 +66,15 @@ func infocmd(opt Options) error {
 		releases = []Release{*release}
 	}
 
+	return renderer(tags, releases)
+}
+
+func renderInfoText(tags []Tag, releases []Release) error {
+	fmt.Println("tags:")
+	for _, tag := range tags {
+		fmt.Println("-", &tag)
+	}
+
 	fmt.Println("releases:")
 	for _, release := range releases {
 		fmt.Println("-", &release)
@@ -68,6 +83,20 @@ func infocmd(opt Options) error {
 	return nil
 }
 
+func renderInfoJSON(tags []Tag, releases []Release) error {
+	out := struct {
+		Tags     []Tag
+		Releases []Release
+	}{
+		Tags:     tags,
+		Releases: releases,
+	}
+
+	enc := json.NewEncoder(os.Stdout)
+	enc.SetIndent("", "    ")
+	return enc.Encode(&out)
+}
+
 func uploadcmd(opt Options) error {
 	user := nvls(opt.Upload.User, EnvUser)
 	repo := nvls(opt.Upload.Repo, EnvRepo)
diff --git a/github-release.go b/github-release.go
@@ -67,6 +67,7 @@ type Options struct {
 		User  string `goptions:"-u, --user, description='Github repo user or organisation (required if $GITHUB_USER not set)'"`
 		Repo  string `goptions:"-r, --repo, description='Github repo (required if $GITHUB_REPO not set)'"`
 		Tag   string `goptions:"-t, --tag, description='Git tag to query (optional)'"`
+		JSON  bool   `goptions:"-j, --json, description='Emit info as JSON instead of text'"`
 	} `goptions:"info"`
 }
 

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ type Options struct {`
`67`	`67`	User string `goptions:"-u, --user, description='Github repo user or organisation (required if $GITHUB_USER not set)'"`
`68`	`68`	Repo string `goptions:"-r, --repo, description='Github repo (required if $GITHUB_REPO not set)'"`
`69`	`69`	Tag string `goptions:"-t, --tag, description='Git tag to query (optional)'"`
	`70`	+ JSON bool `goptions:"-j, --json, description='Emit info as JSON instead of text'"`
`70`	`71`	} `goptions:"info"`
`71`	`72`	`}`
`72`	`73`