Added some features

server/api/build/log.go

@@ -3,6 +3,7 @@ package build
 import (
 	"io"
 	"net/http"
+	"regexp"
 	"strconv"
 
 	"github.com/bleenco/abstruse/internal/auth"
@@ -45,6 +46,8 @@ func HandleLog(jobs core.JobStore, scheduler core.Scheduler) http.HandlerFunc {
 
 		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
 		w.WriteHeader(http.StatusOK)
-		io.WriteString(w, job.Log)
+		re := regexp.MustCompile(`(\[1;[0-9][0-9]m|\[0m|\x1b|\r)`)
+		log := re.ReplaceAllString(job.Log, "")
+		io.WriteString(w, log)
 	}
 }

server/api/user/login.go

@@ -31,7 +31,7 @@ func HandleLogin(users core.UserStore) http.HandlerFunc {
 		}
 
 		if users.Login(f.Email, f.Password) {
-			user, _ := users.FindEmail(f.Email)
+			user, _ := users.FindEmailOrName(f.Email)
 			token, err := auth.JWT.CreateJWT(user.Claims())
 			if err != nil {
 				render.InternalServerError(w, err.Error())

server/core/user.go

@@ -8,7 +8,7 @@ type (
 		ID       uint    `gorm:"primary_key;auto_increment;not null" json:"id"`
 		Email    string  `gorm:"not null;size:255;unique_index" json:"email"`
 		Password string  `gorm:"not null;size:255;column:password" json:"-"`
-		Name     string  `gorm:"not null;size:255" json:"name"`
+		Name     string  `gorm:"not null;size:255;unique_index" json:"name"`
 		Avatar   string  `gorm:"not null;size:255;default:'/assets/images/avatars/avatar_1.svg'" json:"avatar"`
 		Role     string  `gorm:"not null;size:20;default:'user'" json:"role"`
 		Active   bool    `gorm:"not null;default:true" json:"active"`
@@ -24,6 +24,12 @@ type (
 		// FindEmail returns a user from the datastore by email.
 		FindEmail(string) (*User, error)
 
+		// FindName returns a user from the datastore by username.
+		FindName(string) (*User, error)
+
+		// FindEmailOrName returns a user from the datastore by email or username.
+		FindEmailOrName(string) (*User, error)
+
 		// List returns a list of users from datastore.
 		List() ([]*User, error)
 

server/store/repo/repo.go

@@ -215,7 +215,7 @@ func (s repositoryStore) CreateHook(id, userID uint, data gitscm.HookForm) error
 	}
 
 	target := fmt.Sprintf("%s/webhooks", repo.Provider.Host)
-	_, err = gitscm.CreateHook(repo.FullName, target, repo.Provider.Name, repo.Provider.Secret, data)
+	_, err = gitscm.CreateHook(repo.FullName, target, repo.Provider.Secret, repo.Provider.Name, data)
 	return err
 }
 

server/store/user/user.go

@@ -29,6 +29,19 @@ func (s userStore) FindEmail(email string) (*core.User, error) {
 	return &user, err
 }
 
+func (s userStore) FindName(name string) (*core.User, error) {
+	var user core.User
+	err := s.db.Model(&user).Preload("Teams").Where("name = ?", name).First(&user).Error
+	return &user, err
+}
+
+func (s userStore) FindEmailOrName(pattern string) (*core.User, error) {
+	var user core.User
+	err := s.db.Model(&user).Preload("Teams").
+		Where("name = ? OR email = ?", pattern, pattern).First(&user).Error
+	return &user, err
+}
+
 func (s userStore) List() ([]*core.User, error) {
 	var users []*core.User
 	err := s.db.Model(users).Preload("Teams").Find(&users).Error
@@ -42,6 +55,16 @@ func (s userStore) Create(user *core.User) error {
 	}
 	user.Password = hash
 
+	_, err = s.FindEmail(user.Email)
+	if err == nil {
+		return fmt.Errorf("email already exists")
+	}
+
+	_, err = s.FindName(user.Name)
+	if err == nil {
+		return fmt.Errorf("username already exists")
+	}
+
 	return s.db.Create(user).Error
 }
 
@@ -73,7 +96,7 @@ func (s userStore) Delete(user *core.User) error {
 }
 
 func (s userStore) Login(email, password string) bool {
-	user, err := s.FindEmail(email)
+	user, err := s.FindEmailOrName(email)
 	if err != nil {
 		return false
 	}

worker/docker/docker.go

@@ -54,7 +54,43 @@ func RunContainer(name, image string, job *api.Job, config *config.Config, env [
 
 	cacheSaved := false
 
-	for i, command := range job.GetCommands() {
+	ExecCmd := func(command *api.Command) (string, error) {
+		cmd := strings.Split(command.GetCommand(), " ")
+		str := yellow("\r==> " + strings.Join(cmd, " ") + "\r\n")
+		logch <- []byte(str)
+		shcmd := []string{shell, "-ci", strings.Join(cmd, " ")}
+		conn, execID, err := exec(cli, containerID, shcmd, env)
+		if err != nil {
+			logch <- []byte(err.Error())
+			return "", err
+		}
+		for {
+			buf := make([]byte, 4096)
+			n, err := conn.Reader.Read(buf)
+			if err != nil {
+				conn.Close()
+				break
+			}
+			logch <- buf[:n]
+		}
+		return execID, nil
+	}
+
+	var commands []*api.Command
+	var failureCmd, successCmd *api.Command = nil, nil
+	for _, command := range job.GetCommands() {
+		if command.GetType() == api.Command_AfterFailure {
+			failureCmd = command
+			continue
+		}
+		if command.GetType() == api.Command_AfterSuccess {
+			successCmd = command
+			continue
+		}
+		commands = append(commands, command)
+	}
+
+	for i, command := range commands {
 		if !isContainerRunning(cli, containerID) {
 			if err := startContainer(cli, containerID); err != nil {
 				logch <- []byte(err.Error())
@@ -101,38 +137,32 @@ func RunContainer(name, image string, job *api.Job, config *config.Config, env [
 			}
 		}
 
-		cmd := strings.Split(command.GetCommand(), " ")
-
-		str := yellow("\r==> " + strings.Join(cmd, " ") + "\r\n")
-		logch <- []byte(str)
-		shcmd := []string{shell, "-ci", strings.Join(cmd, " ")}
-		conn, execID, err := exec(cli, containerID, shcmd, env)
+		execID, err := ExecCmd(command)
 		if err != nil {
 			logch <- []byte(err.Error())
 			return err
 		}
-		for {
-			buf := make([]byte, 4096)
-			n, err := conn.Reader.Read(buf)
-			if err != nil {
-				conn.Close()
-				break
-			}
-			logch <- buf[:n]
-		}
 		inspect, err := cli.ContainerExecInspect(ctx, execID)
 		if err != nil {
 			logch <- []byte(err.Error())
 			return err
 		}
 		exitCode = inspect.ExitCode
 		if exitCode != 0 {
+			if failureCmd != nil {
+				logch <- []byte(red("==> Starting after_failure script...\n"))
+				ExecCmd(failureCmd)
+			}
 			break
 		}
 	}
 
 	logch <- []byte(genExitMessage(exitCode))
 	if exitCode == 0 {
+		if successCmd != nil {
+			logch <- []byte(green("==> Starting after_success script...\n"))
+			ExecCmd(successCmd)
+		}
 		return nil
 	}
 	return fmt.Errorf("errored: %d", exitCode)

worker/docker/util.go

@@ -8,11 +8,19 @@ import (
 
 func genExitMessage(code int) string {
 	if code == 0 {
-		return aurora.Bold(aurora.Green(fmt.Sprintf("\nExit code: %d", code))).String()
+		return green(fmt.Sprintf("\nExit code: %d", code))
 	}
-	return aurora.Bold(aurora.Red(fmt.Sprintf("\nExit code: %d", code))).String()
+	return red(fmt.Sprintf("\nExit code: %d", code))
+}
+
+func green(str string) string {
+	return aurora.Bold(aurora.Green(str)).String()
 }
 
 func yellow(str string) string {
 	return aurora.Bold(aurora.Yellow(str)).String()
 }
+
+func red(str string) string {
+	return aurora.Bold(aurora.Red(str)).String()
+}