Remove commandbuilder (moved go go-shell)

Author: mblaschke

sync/config.go

@@ -3,6 +3,7 @@ package sync
 import (
 	"regexp"
 	"sync"
+	"github.com/webdevops/go-shell/commandbuilder"
 )
 
 var waitGroup sync.WaitGroup
@@ -20,14 +21,6 @@ type Filesystem struct {
 	Filter Filter
 }
 
-type Connection struct {
-	Type string
-	Hostname string
-	User string
-	Password string
-	Docker string
-	WorkDir string
-}
 
 type Database struct {
 	Type string
@@ -46,7 +39,7 @@ type Database struct {
 		User string
 		Password string
 
-		Connection Connection
+		Connection commandbuilder.Connection
 	}
 	Options struct {
 		ClearDatabase bool `yaml:"clear-database"`
@@ -56,7 +49,7 @@ type Database struct {
 	cacheRemoteTableList []string
 	cacheLocalTableList []string
 
-	remoteConnection Connection
+	remoteConnection commandbuilder.Connection
 }
 
 type Execution struct {
@@ -67,7 +60,7 @@ type Execution struct {
 
 type Server struct {
 	Path string
-	Connection Connection
+	Connection commandbuilder.Connection
 	Filesystem []Filesystem
 	Database []Database
 	ExecStartup []Execution `yaml:"exec-startup"`

sync/connection.go

@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"strings"
 	"github.com/webdevops/go-shell"
+	"github.com/webdevops/go-shell/commandbuilder"
 )
 
 
-func (database *Database) mysqlTableFilter(connection *Connection, connectionType string) ([]string, []string) {
+func (database *Database) mysqlTableFilter(connection *commandbuilder.Connection, connectionType string) ([]string, []string) {
 	var exclude []string
 	var include []string
 

sync/connection_docker.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 	"github.com/webdevops/go-shell"
 	"fmt"
+	"github.com/webdevops/go-shell/commandbuilder"
 )
 
 func (execution *Execution) String(server *Server) string {
@@ -28,11 +29,11 @@ func (execution *Execution) Execute(server *Server) {
 }
 
 func (execution *Execution) commandBuilder(server *Server) []interface{} {
-	var connection Connection
+	var connection commandbuilder.Connection
 
 	switch execution.GetType() {
 	case "local":
-		connection = Connection{Type:"local"}
+		connection = commandbuilder.Connection{Type:"local"}
 	case "remote":
 		connection = server.Connection
 	}

sync/connection_local.go

@@ -9,27 +9,6 @@ import (
 	"fmt"
 )
 
-func NewShellCommand(command string, args ...string) *shell.Command {
-	return shell.Cmd(ShellCommandInterfaceBuilder(command, args...)...)
-}
-
-func ShellCommandInterfaceBuilder(command string, args ...string) []interface{} {
-	cmd := []string{
-		command,
-	}
-
-	for _, val := range args {
-		cmd = append(cmd, val)
-	}
-
-	shellCmd := make([]interface{}, len(cmd))
-	for i, v := range cmd {
-		shellCmd[i] = v
-	}
-
-	return shellCmd
-}
-
 func CreateTempfile() *os.File {
 	tmpfile, err := ioutil.TempFile("", "gsync")
 	if err != nil {

sync/connection_ssh.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"errors"
 	"os"
+	"github.com/webdevops/go-shell"
 )
 
 // General sync
@@ -45,6 +46,6 @@ func (filesystem *Filesystem) deployRsync(server *Server) {
 	// make sure source/target paths are using suffix slash
 	args = append(args, RsyncPath(sourcePath), RsyncPath(targetPath))
 
-	cmd := NewShellCommand("rsync", args...)
+	cmd := shell.NewCmd("rsync", args...)
 	cmd.Run()
 }

sync/database.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"errors"
 	"os"
+	"github.com/webdevops/go-shell"
 )
 
 // General sync
@@ -45,6 +46,6 @@ func (filesystem *Filesystem) syncRsync(server *Server) {
 	// make sure source/target paths are using suffix slash
 	args = append(args, RsyncPath(sourcePath), RsyncPath(targetPath))
 
-	cmd := NewShellCommand("rsync", args...)
+	cmd := shell.NewCmd("rsync", args...)
 	cmd.Run()
 }