fix(status): add marshalJSON()

Add `rawStatus` struct and use `marshalJSON()` to convert `BasicStatus`
to `rawStatus`.

Author: darkowlzz

cmd/dep/status.go

@@ -118,22 +118,20 @@ func (out *tableOutput) MissingFooter() {
 
 type jsonOutput struct {
 	w       io.Writer
-	basic   []*BasicStatus
+	basic   []*rawStatus
 	missing []*MissingStatus
 }
 
 func (out *jsonOutput) BasicHeader() {
-	out.basic = []*BasicStatus{}
+	out.basic = []*rawStatus{}
 }
 
 func (out *jsonOutput) BasicFooter() {
 	json.NewEncoder(out.w).Encode(out.basic)
 }
 
 func (out *jsonOutput) BasicLine(bs *BasicStatus) {
-	bs.JSONConstraint = bs.getConsolidatedConstraint()
-	bs.JSONVersion = formatVersion(bs.Version)
-	out.basic = append(out.basic, bs)
+	out.basic = append(out.basic, bs.marshalJSON())
 }
 
 func (out *jsonOutput) MissingHeader() {
@@ -232,6 +230,15 @@ func (cmd *statusCommand) Run(ctx *dep.Ctx, args []string) error {
 	return nil
 }
 
+type rawStatus struct {
+	ProjectRoot  string
+	Constraint   string
+	Version      string
+	Revision     gps.Revision
+	Latest       gps.Version
+	PackageCount int
+}
+
 // BasicStatus contains all the information reported about a single dependency
 // in the summary/list status output mode.
 type BasicStatus struct {
@@ -270,6 +277,17 @@ func (bs *BasicStatus) getConsolidatedVersion() string {
 	return version
 }
 
+func (bs *BasicStatus) marshalJSON() *rawStatus {
+	return &rawStatus{
+		ProjectRoot:  bs.ProjectRoot,
+		Constraint:   bs.getConsolidatedConstraint(),
+		Version:      formatVersion(bs.Version),
+		Revision:     bs.Revision,
+		Latest:       bs.Latest,
+		PackageCount: bs.PackageCount,
+	}
+}
+
 // MissingStatus contains information about all the missing packages in a project.
 type MissingStatus struct {
 	ProjectRoot     string

cmd/dep/status_test.go

@@ -33,7 +33,6 @@ func TestStatusFormatVersion(t *testing.T) {
 }
 
 func TestBasicLine(t *testing.T) {
-
 	project := dep.Project{}
 	aSemverConstraint, _ := gps.NewSemverConstraint("1.2.3")
 
@@ -140,7 +139,6 @@ func TestBasicLine(t *testing.T) {
 }
 
 func TestBasicStatusGetConsolidatedConstraint(t *testing.T) {
-
 	aSemverConstraint, _ := gps.NewSemverConstraint("1.2.1")
 
 	testCases := []struct {

cmd/dep/testdata/harness_tests/status/case1/json/stdout.txt

@@ -1 +1 @@
-[{"ProjectRoot":"github.com/sdboyer/deptest","Children":null,"Revision":"ff2948a2ac8f538c4ecd55962e919d1e13e74baf","Latest":"3f4c3bea144e112a69bbe5d8d01c1b09a544253f","PackageCount":1,"Constraint":"^0.8.0","Version":"v0.8.0"},{"ProjectRoot":"github.com/sdboyer/deptestdos","Children":null,"Revision":"5c607206be5decd28e6263ffffdcee067266015e","Latest":"5c607206be5decd28e6263ffffdcee067266015e","PackageCount":1,"Constraint":"*","Version":"v2.0.0"}]
+[{"ProjectRoot":"github.com/sdboyer/deptest","Constraint":"^0.8.0","Version":"v0.8.0","Revision":"ff2948a2ac8f538c4ecd55962e919d1e13e74baf","Latest":"3f4c3bea144e112a69bbe5d8d01c1b09a544253f","PackageCount":1},{"ProjectRoot":"github.com/sdboyer/deptestdos","Constraint":"*","Version":"v2.0.0","Revision":"5c607206be5decd28e6263ffffdcee067266015e","Latest":"5c607206be5decd28e6263ffffdcee067266015e","PackageCount":1}]