Use new template lib

Author: tboerger

Gopkg.lock

@@ -1,11 +1,19 @@
 [[constraint]]
-  name = "github.com/aymerick/raymond"
-  version = "2.0.1"
+  branch = "master"
+  name = "github.com/drone/drone-template-lib"
 
 [[constraint]]
   branch = "master"
   name = "github.com/matrix-org/gomatrix"
 
+[[constraint]]
+  name = "github.com/pkg/errors"
+  version = "0.8.0"
+
 [[constraint]]
   name = "github.com/urfave/cli"
   version = "1.20.0"
+
+[prune]
+  go-tests = true
+  unused-packages = true

Gopkg.toml

@@ -15,8 +15,8 @@ var (
 
 func main() {
 	app := cli.NewApp()
-	app.Name = "codecov plugin"
-	app.Usage = "codecov plugin"
+	app.Name = "matrix plugin"
+	app.Usage = "matrix plugin"
 	app.Version = fmt.Sprintf("%s+%s", version, build)
 	app.Action = run
 	app.Flags = []cli.Flag{
@@ -42,9 +42,9 @@ func main() {
 		},
 		cli.StringFlag{
 			Name:   "homeserver",
-			Value:  "https://matrix.org",
 			Usage:  "matrix home server",
 			EnvVar: "PLUGIN_HOMESERVER,MATRIX_HOMESERVER",
+			Value:  "https://matrix.org",
 		},
 		cli.StringFlag{
 			Name:   "roomid",
@@ -55,6 +55,7 @@ func main() {
 			Name:   "template",
 			Usage:  "template for the message",
 			EnvVar: "PLUGIN_TEMPLATE,MATRIX_TEMPLATE",
+			Value:  "Build {{ build.status }} <{{ build.link }}|{{ repo.Owner }}/{{ repo.Name }}#{{ truncate build.commit 8 }}> ({{ build.branch }}) by {{ build.author }}",
 		},
 		cli.StringFlag{
 			Name:   "repo.owner",

main.go

@@ -1,10 +1,11 @@
 package main
 
 import (
-	"fmt"
 	"strings"
 
+	"github.com/drone/drone-template-lib/template"
 	"github.com/matrix-org/gomatrix"
+	"github.com/pkg/errors"
 )
 
 type (
@@ -55,7 +56,7 @@ func (p Plugin) Exec() error {
 	m, err := gomatrix.NewClient(p.Config.Homeserver, prepend("@", p.Config.UserID), p.Config.AccessToken)
 
 	if err != nil {
-		return err
+		return errors.Wrap(err, "failed to initialize client")
 	}
 
 	if p.Config.UserID == "" || p.Config.AccessToken == "" {
@@ -67,7 +68,7 @@ func (p Plugin) Exec() error {
 		})
 
 		if err != nil {
-			return err
+			return errors.Wrap(err, "failed to authenticate user")
 		}
 
 		m.SetCredentials(r.UserID, r.AccessToken)
@@ -76,41 +77,22 @@ func (p Plugin) Exec() error {
 	joined, err := m.JoinRoom(p.Config.RoomID, "", nil)
 
 	if err != nil {
-		return err
+		return errors.Wrap(err, "failed to join room")
 	}
 
-	message := message(p.Repo, p.Build)
+	message, err := template.RenderTrim(p.Config.Template, p)
 
-	if p.Config.Template != "" {
-		if message, err = RenderTrim(p.Config.Template, p); err != nil {
-			return err
-		}
-
-		if err != nil {
-			return err
-		}
+	if err != nil {
+		return errors.Wrap(err, "failed to render template")
 	}
 
 	if _, err := m.SendNotice(joined.RoomID, message); err != nil {
-		return err
+		return errors.Wrap(err, "failed to submit message")
 	}
 
 	return nil
 }
 
-func message(repo Repo, build Build) string {
-	return fmt.Sprintf(
-		"Build %s <%s|%s/%s#%s> (%s) by %s",
-		build.Status,
-		build.Link,
-		repo.Owner,
-		repo.Name,
-		build.Commit[:8],
-		build.Branch,
-		build.Author,
-	)
-}
-
 func prepend(prefix, s string) string {
 	if s == "" {
 		return s