Add exec

- command execution with “startup” and “finish”
- support for type local and remote
- support for workdir

Author: mblaschke

sync/config.go

@@ -1,6 +1,12 @@
 package sync
 
-import "regexp"
+import (
+	"regexp"
+	"sync"
+)
+
+var waitGroup sync.WaitGroup
+
 
 type Filter struct {
 	Exclude []string
@@ -21,6 +27,7 @@ type Connection struct {
 	User string
 	Password string
 	Docker string
+	WorkDir string
 }
 
 type Database struct {
@@ -53,11 +60,19 @@ type Database struct {
 	remoteConnection Connection
 }
 
+type Execution struct {
+	Type string
+	Command string
+	Workdir string
+	When string
+}
+
 type Server struct {
 	Path string
 	Connection Connection
 	Filesystem []Filesystem
 	Database []Database
+	Exec []Execution
 }
 
 type SyncConfig struct {

sync/connection.go

@@ -3,11 +3,18 @@ package sync
 import (
 	"strings"
 	"github.com/webdevops/go-shell"
+	"fmt"
 )
 
 func (connection *Connection) CommandBuilder(command string, args ...string) []interface{} {
 	var ret []interface{}
 
+	if connection.WorkDir != "" {
+		shellArgs := []string{command}
+		shellArgs = append(shellArgs, args...)
+		return connection.ShellCommandBuilder(shellArgs...)
+	}
+
 	switch connection.GetType() {
 	case "local":
 		ret = connection.LocalCommandBuilder(command, args...)
@@ -35,6 +42,10 @@ func (connection *Connection) ShellCommandBuilder(args ...string) []interface{}
 
 	inlineCommand := shell.Quote(strings.Join(inlineArgs, " "))
 
+	if connection.WorkDir != "" {
+		inlineCommand = fmt.Sprintf("cd %s ; %s", shell.Quote(connection.WorkDir), inlineCommand)
+	}
+
 	switch connection.GetType() {
 	case "local":
 		ret = connection.LocalCommandBuilder("/bin/sh", "-c", inlineCommand)

sync/database_local.go

@@ -40,32 +40,6 @@ func (database *Database) localMysqldumpCmdBuilder(additionalArgs []string, useF
 	return database.Local.Connection.CommandBuilder("mysqldump", args...)
 }
 
-func (database *Database) localCommandInterface(command string, args ...string) []interface{} {
-	var ret []interface{}
-
-	if database.Local.Connection.Type == "" {
-		database.Local.Connection.Type = "local"
-
-		// autodetection
-		if database.Local.Connection.Docker != "" {
-			database.Local.Connection.Type = "docker"
-		}
-
-		if database.Local.Connection.Hostname != "" {
-			database.Local.Connection.Type = "ssh"
-		}
-	}
-
-	switch database.Local.Connection.Type {
-	case "local":
-		ret = ShellCommandInterfaceBuilder(command, args...)
-	case "ssh":
-		ret = database.Local.Connection.CommandBuilder(command, args...)
-	}
-
-	return ret
-}
-
 func (database *Database) localMysqlCmdBuilder(args ...string) []interface{} {
 	args = append(args, "-BN")
 

sync/execution.go

@@ -0,0 +1,59 @@
+package sync
+
+import (
+	"strings"
+	"github.com/webdevops/go-shell"
+	"fmt"
+)
+
+func (execution *Execution) String(server *Server) string {
+	var parts []string
+
+	parts = append(parts, fmt.Sprintf("Type:%s", execution.GetType()))
+
+
+	if execution.Workdir != "" {
+		parts = append(parts, fmt.Sprintf("Workdir:%s", execution.Workdir))
+	}
+	parts = append(parts, fmt.Sprintf("Command:%s", execution.Command))
+
+	return fmt.Sprintf("Exec[%s]", strings.Join(parts[:]," "))
+}
+
+func (execution *Execution) Execute(server *Server) {
+	shell.Cmd(execution.commandBuilder(server)...)
+}
+
+func (execution *Execution) commandBuilder(server *Server) []interface{} {
+	var connection Connection
+
+	switch execution.GetType() {
+	case "local":
+		connection = Connection{Type:"local"}
+	case "remote":
+		connection = server.Connection
+	}
+
+	if execution.Workdir != "" {
+		connection.WorkDir = execution.Workdir
+	}
+
+	return connection.CommandBuilder(execution.Command)
+}
+
+func (execution *Execution) GetType() string {
+	var ret string
+
+	switch strings.ToLower(execution.Type) {
+	case "":
+		fallthrough
+	case "local":
+		ret = "local"
+	case "remote":
+		ret = "remote"
+	default:
+		panic(execution)
+	}
+
+	return ret
+}

sync/server_deploy.go

@@ -6,8 +6,12 @@ func (server *Server) Deploy() {
 		//ShellErrorHandler(recover)
 	}()
 
+	server.RunExec("startup")
 	server.DeployFilesystem()
 	server.DeployDatabases()
+	server.RunExec("finish")
+
+	waitGroup.Wait()
 }
 
 func (server *Server) DeployFilesystem() {

sync/server_exec.go

@@ -0,0 +1,29 @@
+package sync
+
+func (server *Server) RunExec(when string) {
+	defer func() {
+		recover := recover()
+		ShellErrorHandler(recover)
+	}()
+
+	execList := server.GetExecByWhen(when)
+
+	if len(execList) >= 1 {
+		Logger.Main("Starting exec mode \"%s\"", when)
+
+		for _, exec := range execList {
+			Logger.Step("executing >> %s", exec.String(server))
+			exec.Execute(server)
+		}
+	}
+}
+
+func (server *Server) GetExecByWhen(when string) []Execution {
+	var execList []Execution
+
+	for _, val := range server.Exec {
+		execList = append(execList, val)
+	}
+
+	return execList
+}

sync/server_sync.go

@@ -6,8 +6,12 @@ func (server *Server) Sync() {
 		ShellErrorHandler(recover)
 	}()
 
+	server.RunExec("startup")
 	server.SyncFilesystem()
 	server.SyncDatabases()
+	server.RunExec("finish")
+
+	waitGroup.Wait()
 }
 
 func (server *Server) SyncFilesystem() {