Merge pull request #813 from bradrydzewski/master

fixed dependency issue w/ gopkg.in

plugin/notify/webhook/webhook.go

@@ -29,10 +29,11 @@ func (w *Webhook) Send(context *model.Request) error {
 func (w *Webhook) send(context *model.Request) error {
 	// data will get posted in this format
 	data := struct {
+		From   string        `json:"from_url"`
 		Owner  *model.User   `json:"owner"`
 		Repo   *model.Repo   `json:"repository"`
 		Commit *model.Commit `json:"commit"`
-	}{context.User, context.Repo, context.Commit}
+	}{context.Host, context.User, context.Repo, context.Commit}
 
 	// data json encoded
 	payload, err := json.Marshal(data)

plugin/publish/docker_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/drone/drone/shared/build/buildfile"
 	"github.com/drone/drone/shared/build/repo"
-	"gopkg.in/v1/yaml"
+	"gopkg.in/yaml.v1"
 )
 
 type PublishToDrone struct {

plugin/publish/github_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"gopkg.in/v1/yaml"
+	"gopkg.in/yaml.v1"
 )
 
 var validcfg = map[string]interface{}{

server/datastore/database/user.go

@@ -49,20 +49,15 @@ func (db *Userstore) GetUserList() ([]*model.User, error) {
 
 // PostUser saves a User in the datastore.
 func (db *Userstore) PostUser(user *model.User) error {
-	if user.Created == 0 {
-		user.Created = time.Now().UTC().Unix()
-	}
+	user.Created = time.Now().UTC().Unix()
 	user.Updated = time.Now().UTC().Unix()
-	return meddler.Save(db, userTable, user)
+	return meddler.Insert(db, userTable, user)
 }
 
 // PutUser saves a user in the datastore.
 func (db *Userstore) PutUser(user *model.User) error {
-	if user.Created == 0 {
-		user.Created = time.Now().UTC().Unix()
-	}
 	user.Updated = time.Now().UTC().Unix()
-	return meddler.Save(db, userTable, user)
+	return meddler.Update(db, userTable, user)
 }
 
 // DelUser removes the user from the datastore.

server/handler/login.go

@@ -70,6 +70,13 @@ func GetLogin(c web.C, w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		// the user id should NEVER equal zero
+		if u.ID == 0 {
+			log.Println("Unable to create account. User ID is zero")
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
 		// if this is the first user, they
 		// should be an admin.
 		if u.ID == 1 {

shared/model/request.go

@@ -1,5 +1,9 @@
 package model
 
+import (
+	"fmt"
+)
+
 type Request struct {
 	Host   string  `json:"-"`
 	User   *User   `json:"-"`
@@ -7,3 +11,16 @@ type Request struct {
 	Commit *Commit `json:"commit"`
 	Prior  *Commit `json:"prior_commit"`
 }
+
+// URL returns the link to the commit in
+// string format.
+func (r *Request) URL() string {
+	return fmt.Sprintf("%s/%s/%s/%s/%s/%s",
+		r.Host,
+		r.Repo.Host,
+		r.Repo.Owner,
+		r.Repo.Name,
+		r.Commit.Branch,
+		r.Commit.Sha,
+	)
+}