Use shuttle to run shuttle tests

Plus added support for 'no'-plan.
Also resolved a bug where local scripts couldn't run

.travis.yml

@@ -2,11 +2,8 @@ language: go
 
 script: |
   echo "Build shuttle" &&
-  go build -v -a &&
-  echo "\n\nRun go tests:" &&
-  go test ./pkg/... -run Test* &&
-  echo "\n\nRun shell tests:" &&
-  ./tests.sh
+  go build &&
+  ./shuttle run test
 
   # .travis.yml
 language: go

pkg/config/shuttleconfig.go

@@ -14,7 +14,8 @@ type DynamicYaml = map[string]interface{}
 
 // ShuttleConfig describes the actual config for each project
 type ShuttleConfig struct {
-	Plan      string                       `yaml:"plan"`
+	Plan      string                       `yaml:"not_plan"`
+	PlanRaw   interface{}                  `yaml:"plan"`
 	Variables DynamicYaml                  `yaml:"vars"`
 	Scripts   map[string]ShuttlePlanScript `yaml:"scripts"`
 }
@@ -72,5 +73,12 @@ func (c *ShuttleConfig) getConf(projectPath string) *ShuttleConfig {
 		panic(fmt.Sprintf("Unmarshal: %v", err))
 	}
 
+	switch c.PlanRaw {
+	case false:
+		// no plan
+	default:
+		c.Plan = c.PlanRaw.(string)
+	}
+
 	return c
 }

pkg/config/shuttleplan.go

@@ -48,6 +48,9 @@ type ShuttlePlan struct {
 
 // Load loads a plan from project path and shuttle config
 func (p *ShuttlePlanConfiguration) Load(planPath string) *ShuttlePlanConfiguration {
+	if planPath == "" {
+		return p
+	}
 	var configPath = path.Join(planPath, "plan.yaml")
 	//log.Printf("configpath: %s", configPath)
 	yamlFile, err := ioutil.ReadFile(configPath)
@@ -65,6 +68,9 @@ func (p *ShuttlePlanConfiguration) Load(planPath string) *ShuttlePlanConfigurati
 // FetchPlan so it exists locally and return path to that plan
 func FetchPlan(plan string, projectPath string, localShuttleDirectoryPath string, verbose bool) string {
 	switch {
+	case plan == "":
+		output.Verbose(verbose, "Using no plan")
+		return ""
 	case git.IsGitPlan(plan):
 		output.Verbose(verbose, "Using git plan at '%s'", plan)
 		return git.GetGitPlan(plan, localShuttleDirectoryPath, verbose)

pkg/executors/executor.go

@@ -25,7 +25,7 @@ type ActionExecutionContext struct {
 
 // Execute is the command executor for the plan files
 func Execute(p config.ShuttleProjectContext, command string, args []string) {
-	script, ok := p.Plan.Scripts[command]
+	script, ok := p.Scripts[command]
 	if !ok {
 		output.ExitWithErrorCode(2, fmt.Sprintf("No script found called '%s'", command))
 	}

shuttle.yaml

@@ -0,0 +1,18 @@
+plan: false
+scripts:
+  build:
+    description: 'build code'
+    actions:
+    - shell: 'go build'
+  test-go:
+    description: 'run tests written in go'
+    actions:
+    - shell: go test ./pkg/... -run Test*
+  test-shell:
+    description: 'run tests written in shell'
+    actions:
+    - shell: ./tests.sh
+  test:
+    actions:
+    - shell: shuttle run test-go
+    - shell: shuttle run test-shell