add shell to config

Author: kindermax

README.md

@@ -44,6 +44,7 @@ lets run --debug --level=info
 ## lets.yaml
 
 ```yaml
+shell: bash
 commands:
     [name]:
       description: string
@@ -96,7 +97,7 @@ Yet there is no binaries
 - [x] docopts as repeated flags, joined in string
 - [x] pass opts as is if cmd is an array
 - [x] file hashes (checksums)
-- [ ] global checksums
+- [ ] global checksums (check if some commands use checksum so we can skip its calculation)
 - [ ] multiple checksums in one command (kv)
 - [x] depends on other commands
 - [ ] inherit configs

commands/command/command.go

@@ -28,7 +28,7 @@ type Command struct {
 }
 
 // TODO interface{} must be replaced
-func NewCommand(name string, rawCommand map[string]interface{}) Command {
+func NewCommand(name string, rawCommand map[interface{}]interface{}) Command {
 	newCmd := Command{
 		Name: name,
 		Env:  make(map[string]string),
@@ -85,17 +85,19 @@ func NewCommand(name string, rawCommand map[string]interface{}) Command {
 	}
 
 	if checksum, ok := rawCommand[CHECKSUM]; ok {
-		var files []string
-		for _, value := range checksum.([]interface{}) {
-			// TODO validate if command is realy exists - in validate
-			files = append(files, value.(string))
-		}
-		checksum, err := calculateChecksum(files)
-		if err == nil {
-			newCmd.Checksum = checksum
-		} else {
-			// TODO return error or caclulate checksum upper in the code
-			fmt.Printf("error while checksum %s\n", err)
+		if patterns, ok := checksum.([]interface{}); ok {
+			var files []string
+			for _, value := range patterns {
+				// TODO validate if command is realy exists - in validate
+				files = append(files, value.(string))
+			}
+			checksum, err := calculateChecksum(files)
+			if err == nil {
+				newCmd.Checksum = checksum
+			} else {
+				// TODO return error or caclulate checksum upper in the code
+				fmt.Printf("error while checksum %s\n", err)
+			}
 		}
 	}
 	return newCmd

commands/run.go

@@ -48,8 +48,7 @@ func composeEnvs(envs ...[]string) []string {
 }
 
 func runCmd(cmdToRun command.Command, cfg *config.Config, out io.Writer, isChild bool) error {
-	// TODO get user's current shell
-	cmd := exec.Command("sh", "-c", cmdToRun.Cmd)
+	cmd := exec.Command(cfg.Shell, "-c", cmdToRun.Cmd)
 	// setup std out and err
 	cmd.Stdout = out
 	cmd.Stderr = out

config/config.go

@@ -12,13 +12,15 @@ import (
 var (
 	// COMMANDS is a top-level directive. Includes all commands to run
 	COMMANDS = "commands"
+	SHELL    = "shell"
 )
 
 // Config is a struct for loaded config file
 type Config struct {
 	WorkDir  string
 	FilePath string
 	Commands map[string]command.Command
+	Shell    string
 }
 
 // Load a config from file
@@ -75,24 +77,30 @@ func newConfig() *Config {
 
 // UnmarshalYAML unmarshals a config
 func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	rawKeyValue := make(map[string]map[string]map[string]interface{})
+	rawKeyValue := make(map[string]interface{})
 
 	if err := unmarshal(&rawKeyValue); err != nil {
 		return err
 	}
 
 	if cmds, ok := rawKeyValue[COMMANDS]; ok {
-		if err := c.loadCommands(cmds); err != nil {
+		if err := c.loadCommands(cmds.(map[interface{}]interface{})); err != nil {
 			return err
 		}
 	}
+
+	if shell, ok := rawKeyValue[SHELL]; ok {
+		c.Shell = fmt.Sprintf("%s", shell)
+	}
+
 	return nil
 }
 
 // TODO refactor
-func (c *Config) loadCommands(cmds map[string]map[string]interface{}) error {
+func (c *Config) loadCommands(cmds map[interface{}]interface{}) error {
 	for key, value := range cmds {
-		c.Commands[key] = command.NewCommand(key, value)
+		keyStr := key.(string)
+		c.Commands[keyStr] = command.NewCommand(keyStr, value.(map[interface{}]interface{}))
 	}
 	return nil
 }

lets.yaml

@@ -1,3 +1,5 @@
+shell: bash
+
 env:
 
 eval_env: