c/snap: add --format json to snap tasks

Author: Rnfudge02

cmd/snap/cmd_changes.go

@@ -20,12 +20,12 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"regexp"
 	"sort"
 
 	"github.com/jessevdk/go-flags"
-
 	"github.com/snapcore/snapd/client"
 	"github.com/snapcore/snapd/i18n"
 )
@@ -51,14 +51,17 @@ type cmdChanges struct {
 type cmdTasks struct {
 	timeMixin
 	changeIDMixin
+	Format string `long:"format" required:"false"`
 }
 
 func init() {
 	addCommand("changes", shortChangesHelp, longChangesHelp,
 		func() flags.Commander { return &cmdChanges{} }, timeDescs, nil)
 	addCommand("tasks", shortTasksHelp, longTasksHelp,
 		func() flags.Commander { return &cmdTasks{} },
-		changeIDMixinOptDesc.also(timeDescs),
+		changeIDMixinOptDesc.also(timeDescs).also(map[string]string{
+			"format": i18n.G("Output format (json)."),
+		}),
 		changeIDMixinArgDesc).alias = "change"
 }
 
@@ -160,6 +163,15 @@ func (c *cmdTasks) showChange(chid string) error {
 		return err
 	}
 
+	if c.Format == "json" {
+		data, err := json.Marshal(chg)
+		if err != nil {
+			return err
+		}
+		fmt.Fprint(Stdout, string(data))
+		return nil
+	}
+
 	w := tabWriter()
 
 	fmt.Fprint(w, i18n.G("Status\tSpawn\tReady\tSummary\n"))

cmd/snap/cmd_changes_test.go

@@ -20,13 +20,15 @@
 package main_test
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"strings"
 
 	"gopkg.in/check.v1"
 
 	snap "github.com/snapcore/snapd/cmd/snap"
+	"github.com/snapcore/snapd/client"
 )
 
 var mockChangeJSON = `{"type": "sync", "result": {
@@ -232,6 +234,30 @@ Doing +2016-04-21T01:02:03Z +2016-04-21T01:02:04Z +some summary \(50.00%\)
 	c.Check(s.Stderr(), check.Equals, "")
 }
 
+func (s *SnapSuite) TestTasksJSON(c *check.C) {
+	s.RedirectClientToTestServer(func(w http.ResponseWriter, r *http.Request) {
+		c.Check(r.Method, check.Equals, "GET")
+		c.Check(r.URL.Path, check.Equals, "/v2/changes/42")
+		fmt.Fprintln(w, mockChangeJSON)
+	})
+
+	rest, err := snap.Parser(snap.Client()).ParseArgs([]string{"tasks", "--format=json", "42"})
+	c.Assert(err, check.IsNil)
+	c.Assert(rest, check.DeepEquals, []string{})
+
+	var chg client.Change
+	c.Assert(json.Unmarshal([]byte(s.Stdout()), &chg), check.IsNil)
+	c.Check(chg.ID, check.Equals, "uno")
+	c.Check(chg.Kind, check.Equals, "foo")
+	c.Check(chg.Summary, check.Equals, "...")
+	c.Check(chg.Status, check.Equals, "Do")
+	c.Check(chg.Ready, check.Equals, false)
+	c.Assert(chg.Tasks, check.HasLen, 1)
+	c.Check(chg.Tasks[0].Kind, check.Equals, "bar")
+	c.Check(chg.Tasks[0].Summary, check.Equals, "some summary")
+	c.Check(chg.Tasks[0].Status, check.Equals, "Do")
+}
+
 func (s *SnapSuite) TestNoChanges(c *check.C) {
 	n := 0
 	s.RedirectClientToTestServer(func(w http.ResponseWriter, r *http.Request) {