Merge pull request #479 from kool-dev/tweaks

Improved preset names + other tweaks

Author: fabriciojs

commands/cloud_setup.go

@@ -90,9 +90,7 @@ func (s *KoolCloudSetup) Execute(args []string) (err error) {
 
 		s.Shell().Info(fmt.Sprintf("Setting up service container '%s' for deployment", serviceName))
 		deployConfig.Services[serviceName] = &cloud.DeployConfigService{
-			Environment: map[string]string{
-				"FOO": "bar",
-			},
+			Environment: map[string]string{},
 		}
 
 		// handle image/build config

commands/preset.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"kool-dev/kool/core/presets"
 	"kool-dev/kool/core/shell"
+	"sort"
 
 	"github.com/spf13/cobra"
 )
@@ -74,9 +75,9 @@ an interactive wizard will present the available options.`,
 	return
 }
 
-func (p *KoolPreset) getPreset(args []string) (preset string, err error) {
+func (p *KoolPreset) getPreset(args []string) (pickedPreset string, err error) {
 	if len(args) == 1 {
-		preset = args[0]
+		pickedPreset = args[0]
 		return
 	}
 
@@ -90,6 +91,24 @@ func (p *KoolPreset) getPreset(args []string) (preset string, err error) {
 		return
 	}
 
-	preset, err = p.promptSelect.Ask("What preset do you want to use", p.presetsParser.GetPresets(tag))
+	var availablePresets = p.presetsParser.GetPresets(tag)
+	var presets []string
+
+	for _, name := range availablePresets {
+		presets = append(presets, name)
+	}
+
+	sort.Strings(presets)
+
+	if pickedPreset, err = p.promptSelect.Ask("What preset do you want to use", presets); err != nil {
+		return
+	}
+
+	for preset, name := range availablePresets {
+		if name == pickedPreset {
+			pickedPreset = preset
+		}
+	}
+
 	return
 }

core/presets/fake_parser.go

@@ -13,7 +13,7 @@ type FakeParser struct {
 
 	MockExists     bool
 	MockGetTags    []string
-	MockGetPresets []string
+	MockGetPresets map[string]string
 	MockInstall    error
 	MockCreate     error
 	MockAdd        error
@@ -38,7 +38,7 @@ func (f *FakeParser) GetTags() (languages []string) {
 }
 
 // GetPresets get all presets names
-func (f *FakeParser) GetPresets(tag string) (presets []string) {
+func (f *FakeParser) GetPresets(tag string) (presets map[string]string) {
 	f.CalledGetPresets = true
 	presets = f.MockGetPresets
 	return

core/presets/fake_parser_test.go

@@ -15,10 +15,10 @@ func TestFakeParser(t *testing.T) {
 		t.Error("failed to use mocked Exists function on FakeParser")
 	}
 
-	f.MockGetPresets = []string{"preset"}
+	f.MockGetPresets = map[string]string{"preset": "preset"}
 	presets := f.GetPresets("")
 
-	if !f.CalledGetPresets || len(presets) != 1 || presets[0] != "preset" {
+	if !f.CalledGetPresets || len(presets) != 1 || presets["preset"] != "preset" {
 		t.Error("failed to use mocked GetPresets function on FakeParser")
 	}
 

core/presets/parser.go

@@ -40,7 +40,7 @@ type DefaultParser struct {
 type Parser interface {
 	Exists(string) bool
 	GetTags() []string
-	GetPresets(string) []string
+	GetPresets(string) map[string]string
 	Install(string) error
 	Create(string) error
 	Add(string, shell.Shell) error
@@ -97,7 +97,7 @@ func (p *DefaultParser) GetTags() (tags []string) {
 }
 
 // GetPresets look up all presets IDs with the given tag
-func (p *DefaultParser) GetPresets(tag string) (presets []string) {
+func (p *DefaultParser) GetPresets(tag string) (presets map[string]string) {
 	var (
 		entries []fs.DirEntry
 		folder  fs.DirEntry
@@ -107,6 +107,8 @@ func (p *DefaultParser) GetPresets(tag string) (presets []string) {
 
 	entries, _ = source.ReadDir("presets")
 
+	presets = make(map[string]string, len(entries))
+
 	for _, folder = range entries {
 		data, _ = source.ReadFile(
 			fmt.Sprintf(presetConfigFile, folder.Name()),
@@ -116,11 +118,14 @@ func (p *DefaultParser) GetPresets(tag string) (presets []string) {
 		_ = yaml.Unmarshal(data, config)
 
 		if config.HasTag(tag) {
-			presets = append(presets, folder.Name())
+			presets[folder.Name()] = folder.Name()
+
+			if config.Name != "" {
+				presets[folder.Name()] = config.Name
+			}
 		}
 	}
 
-	sort.Strings(presets)
 	return
 }
 

presets/adonis/config.yml

@@ -1,6 +1,8 @@
 # Which tags are related to this preset; used for branching the choices on preset wizard
 tags: [ 'JS' ]
 
+name: 'AdonisJS'
+
 # Create defines the workflow for creating a new Project where this preset can then be installed
 create:
   - name: Creating new Adonis Application

presets/codeigniter/config.yml

@@ -1,6 +1,8 @@
 # Which tags are related to this preset; used for branching the choices on preset wizard
 tags: [ 'PHP' ]
 
+name: 'CodeIgniter'
+
 # Create defines the workflow for creating a new Project where this preset can then be installed
 create:
   - name: Creating new CodeIgniter Application

presets/expressjs/config.yml

@@ -1,6 +1,8 @@
 # Which tags are related to this preset; used for branching the choices on preset wizard
 tags: [ 'JS' ]
 
+name: 'ExpressJS'
+
 # Create defines the workflow for creating a new Project where this preset can then be installed
 create:
   - name: Creating new Express Application

presets/golang-cli/config.yml

@@ -1,6 +1,8 @@
 # Which tags are related to this preset; used for branching the choices on preset wizard
 tags: [ 'Golang' ]
 
+name: 'CLI App'
+
 # Preset defines the workflow for installing this preset in the current working directory
 preset:
   - name: 'Copy basic config files'

presets/hugo/config.yml

@@ -1,6 +1,8 @@
 # Which tags are related to this preset; used for branching the choices on preset wizard
 tags: [ 'Static' ]
 
+name: 'Hugo'
+
 # Create defines the workflow for creating a new Project where this preset can then be installed
 create:
   - name: Creating new Hugo website