Add more runtime options

- Implement --database
- Implement --filesystem
- Implement --skip-exec

Author: mblaschke

command_deploy.go

@@ -1,13 +1,19 @@
 package main
 
-import "fmt"
+import (
+	"fmt"
+	"./sync"
+)
 
 type DeployCommand struct {
 	AbstractCommand
 	Positional struct {
 		Server string `description:"server configuration key"`
 	} `positional-args:"true"`
-	Dump  bool   `long:"dump"  description:"dump configuration as yaml"`
+	Dump            bool   `long:"dump"        description:"dump configuration as yaml"`
+	OnlyFilesystem  bool   `long:"filesystem"  description:"deploy only filesystem"`
+	OnlyDatabase    bool   `long:"database"    description:"deploy only database"`
+	SkipExec        bool   `long:"skip-exec"   description:"skip execution"`
 }
 
 // Run deployment command
@@ -21,6 +27,8 @@ func (command *DeployCommand) Execute(args []string) error {
 	Logger.Step("using Server[%s]", server)
 	Logger.Step("using %s", confServer.Connection.GetInstance().String())
 
+	confServer.SetRunConfiguration(command.buildSyncRunConfig())
+
 	// --dump
 	if command.Dump {
 		fmt.Println()
@@ -32,3 +40,26 @@ func (command *DeployCommand) Execute(args []string) error {
 
 	return nil
 }
+
+func (command *DeployCommand) buildSyncRunConfig() (conf sync.RunConfiguration) {
+	// Init
+	conf.Exec = true
+	conf.Database = true
+	conf.Filesystem = true
+
+	if command.OnlyFilesystem {
+		conf.Database = false
+		conf.Filesystem = true
+	}
+
+	if command.OnlyDatabase {
+		conf.Database = true
+		conf.Filesystem = false
+	}
+
+	if command.SkipExec {
+		conf.Exec = false
+	}
+
+	return
+}

command_sync.go

@@ -1,13 +1,19 @@
 package main
 
-import "fmt"
+import (
+	"fmt"
+	"./sync"
+)
 
 type SyncCommand struct {
 	AbstractCommand
 	Positional struct {
 		Server  string `description:"server configuration key"`
 	} `positional-args:"true"`
-	Dump  bool   `long:"dump"  description:"dump configuration as yaml"`
+	Dump            bool   `long:"dump"        description:"dump configuration as yaml"`
+	OnlyFilesystem  bool   `long:"filesystem"  description:"sync only filesystem"`
+	OnlyDatabase    bool   `long:"database"    description:"sync only database"`
+	SkipExec        bool   `long:"skip-exec"   description:"skip execution"`
 }
 
 // Run sync command
@@ -21,6 +27,8 @@ func (command *SyncCommand) Execute(args []string) error {
 	Logger.Step("using Server[%s]", server)
 	Logger.Step("using %s", confServer.Connection.GetInstance().String())
 
+	confServer.SetRunConfiguration(command.buildSyncRunConfig())
+
 	// --dump
 	if command.Dump {
 		fmt.Println()
@@ -32,3 +40,26 @@ func (command *SyncCommand) Execute(args []string) error {
 
 	return nil
 }
+
+func (command *SyncCommand) buildSyncRunConfig() (conf sync.RunConfiguration) {
+	// Init
+	conf.Exec = true
+	conf.Database = true
+	conf.Filesystem = true
+
+	if command.OnlyFilesystem {
+		conf.Database = false
+		conf.Filesystem = true
+	}
+
+	if command.OnlyDatabase {
+		conf.Database = true
+		conf.Filesystem = false
+	}
+
+	if command.SkipExec {
+		conf.Exec = false
+	}
+
+	return
+}

sync/config.go

@@ -82,9 +82,17 @@ type Server struct {
 	Database []Database `yaml:"database"`
 	ExecStartup []Execution `yaml:"exec-startup"`
 	ExecFinish []Execution `yaml:"exec-finish"`
+
+	runConfiguration *RunConfiguration
 }
 
 type SyncConfig struct {
 	Sync map[string]Server `yaml:"sync"`
 	Deploy map[string]Server `yaml:"deploy"`
 }
+
+type RunConfiguration struct {
+	Database   bool
+	Filesystem bool
+	Exec       bool
+}

sync/server.go

@@ -1,6 +1,17 @@
 package sync
 
-import "gopkg.in/yaml.v2"
+import (
+	"gopkg.in/yaml.v2"
+)
+
+func (server *Server) Init() {
+	if server.runConfiguration == nil {
+		server.runConfiguration = &RunConfiguration{
+			Database: true,
+			Filesystem: true,
+		}
+	}
+}
 
 func (server *Server) GetLocalPath() string {
 	if server.Path == "" {
@@ -10,6 +21,10 @@ func (server *Server) GetLocalPath() string {
 	return server.Path
 }
 
+func (server *Server) SetRunConfiguration(conf RunConfiguration) {
+	server.runConfiguration = &conf
+}
+
 func (server *Server) AsYaml() string {
 	conf, _ := yaml.Marshal(server)
 	return string(conf)

sync/server_deploy.go

@@ -6,10 +6,23 @@ func (server *Server) Deploy() {
 		ShellErrorHandler(recover)
 	}()
 
-	server.RunExec("startup")
-	server.DeployFilesystem()
-	server.DeployDatabases()
-	server.RunExec("finish")
+	server.Init()
+
+	if server.runConfiguration.Exec {
+		server.RunExec("startup")
+	}
+
+	if server.runConfiguration.Filesystem {
+		server.DeployFilesystem()
+	}
+
+	if server.runConfiguration.Database {
+		server.DeployDatabases()
+	}
+
+	if server.runConfiguration.Exec {
+		server.RunExec("finish")
+	}
 
 	waitGroup.Wait()
 }

sync/server_exec.go

@@ -8,6 +8,8 @@ func (server *Server) RunExec(when string) {
 		ShellErrorHandler(recover)
 	}()
 
+	server.Init()
+
 	execList := server.GetExecByWhen(when)
 
 	if len(execList) >= 1 {

sync/server_sync.go

@@ -6,10 +6,23 @@ func (server *Server) Sync() {
 		ShellErrorHandler(recover)
 	}()
 
-	server.RunExec("startup")
-	server.SyncFilesystem()
-	server.SyncDatabases()
-	server.RunExec("finish")
+	server.Init()
+
+	if server.runConfiguration.Exec {
+		server.RunExec("startup")
+	}
+
+	if server.runConfiguration.Filesystem {
+		server.SyncFilesystem()
+	}
+
+	if server.runConfiguration.Database {
+		server.SyncDatabases()
+	}
+
+	if server.runConfiguration.Exec {
+		server.RunExec("finish")
+	}
 
 	waitGroup.Wait()
 }