Move Convert to a sub-package (#98)

Move Convert to a sub-package to make it possible
to run from other tools as an API

Author: karelbilek

gocov/convert.go gocov/convert/convert.gogocov/convert.go renamed to gocov/convert/convert.go

@@ -18,15 +18,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
 
-package main
+package convert
 
 import (
+	"bytes"
+	"encoding/json"
 	"fmt"
 	"go/ast"
 	"go/build"
 	"go/parser"
 	"go/token"
-	"os"
+	"io"
 	"path/filepath"
 	"strings"
 
@@ -35,9 +37,13 @@ import (
 	"golang.org/x/tools/cover"
 )
 
+func marshalJson(w io.Writer, packages []*gocov.Package) error {
+	return json.NewEncoder(w).Encode(struct{ Packages []*gocov.Package }{packages})
+}
+
 type packagesCache map[string]*build.Package
 
-func convertProfiles(filenames ...string) error {
+func ConvertProfiles(filenames ...string) ([]byte, error) {
 	var (
 		ps       gocovutil.Packages
 		packages = make(packagesCache)
@@ -49,22 +55,23 @@ func convertProfiles(filenames ...string) error {
 		}
 		profiles, err := cover.ParseProfiles(filenames[i])
 		if err != nil {
-			return err
+			return nil, err
 		}
 		for _, p := range profiles {
 			if err := converter.convertProfile(packages, p); err != nil {
-				return err
+				return nil, err
 			}
 		}
 
 		for _, pkg := range converter.packages {
 			ps.AddPackage(pkg)
 		}
 	}
-	if err := marshalJson(os.Stdout, ps); err != nil {
-		return err
+	buf := bytes.Buffer{}
+	if err := marshalJson(&buf, ps); err != nil {
+		return nil, err
 	}
-	return nil
+	return buf.Bytes(), nil
 }
 
 type converter struct {

gocov/convert_test.go gocov/convert/convert_test.gogocov/convert_test.go renamed to gocov/convert/convert_test.go

@@ -1,4 +1,4 @@
-package main
+package convert
 
 import (
 	"go/ast"

gocov/main.go

@@ -28,6 +28,7 @@ import (
 	"os"
 
 	"github.com/axw/gocov"
+	"github.com/axw/gocov/gocov/convert"
 )
 
 func usage() {
@@ -68,10 +69,12 @@ func main() {
 				fmt.Fprintln(os.Stderr, "missing cover profile")
 				os.Exit(1)
 			}
-			if err := convertProfiles(flag.Args()[1:]...); err != nil {
+			out, err := convert.ConvertProfiles(flag.Args()[1:]...)
+			if err != nil {
 				fmt.Fprintln(os.Stderr, "error:", err)
 				os.Exit(1)
 			}
+			os.Stdout.Write(out)
 		case "annotate":
 			os.Exit(annotateSource())
 		case "report":

gocov/test.go

@@ -30,6 +30,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/axw/gocov/gocov/convert"
 	"github.com/axw/gocov/gocov/internal/testflag"
 )
 
@@ -100,5 +101,7 @@ func runTests(args []string) error {
 	}
 
 	// Merge the profiles.
-	return convertProfiles(files...)
+	out, err := convert.ConvertProfiles(files...)
+	os.Stdout.Write(out)
+	return err
 }