Built out the input list handling

builtinsupport/builtinsupport.go

@@ -11,10 +11,7 @@ type Builtin struct {
 var builtins map[string]Builtin
 
 func GetBuiltin(builtinname string) (*Builtin, error) {
-	if len(builtins) == 0 {
-		// Load builtins
-		initBuiltins()
-	}
+	initBuiltins()
 
 	builtin, ok := builtins[builtinname]
 
@@ -25,7 +22,22 @@ func GetBuiltin(builtinname string) (*Builtin, error) {
 	return &builtin, nil
 }
 
+func GetBuiltins() []Builtin {
+	initBuiltins()
+
+	var builtarray []Builtin
+
+	for _, v := range builtins {
+		builtarray = append(builtarray, v)
+	}
+
+	return builtarray
+}
+
 func initBuiltins() {
+	if len(builtins) != 0 {
+		return
+	}
 	builtins = make(map[string]Builtin)
 
 	for _, rt := range basicbuiltins {
@@ -35,7 +47,7 @@ func initBuiltins() {
 
 var basicbuiltins = []Builtin{
 	Builtin{Name: "node",
-		Description: "A Nodejs Builtin",
+		Description: "Builtin Nodejs",
 		FileText: `
 			FROM node:current-alpine
 			WORKDIR /app			
@@ -47,7 +59,7 @@ var basicbuiltins = []Builtin{
 			CMD [ "npm","start" ]
 	`},
 	Builtin{Name: "ruby",
-		Description: "A Ruby Builtin - runs app.rb",
+		Description: "Builtin Ruby - runs app.rb",
 		FileText: `
 			FROM ruby:2.7
 			WORKDIR /usr/src/app
@@ -59,7 +71,7 @@ var basicbuiltins = []Builtin{
 			CMD ["bundle", "exec", "rackup", "--host", "0.0.0.0", "-p", "8080"]
 `},
 	Builtin{Name: "deno",
-		Description: "A deno Builtin - runs main.ts, requires deps.ts",
+		Description: "Builtin Deno - runs main.ts, requires deps.ts",
 		FileText: `
 			FROM hayd/alpine-deno:1.2.1
 			EXPOSE 8080
@@ -72,7 +84,7 @@ var basicbuiltins = []Builtin{
 			CMD ["run", "--allow-net", "main.ts"]
 `},
 	Builtin{Name: "go",
-		Description: "A Go Builtin - Builds app.go uses go modules",
+		Description: "Builtin Go - Builds app.go uses go modules",
 		FileText: `
 			FROM golang:1.13 as builder
 			WORKDIR /go/src/app
@@ -87,7 +99,7 @@ var basicbuiltins = []Builtin{
 			CMD ["/app"]
 `},
 	Builtin{Name: "static",
-		Description: "A Static Web Site - All files are copied across and served",
+		Description: "Builtin Static - Static web server. All files are copied across and served",
 		FileText: `
 			FROM pierrezemb/gostatic
 			COPY . /srv/http/

cmd/init.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"path"
 	"strconv"
 
 	"github.com/superfly/flyctl/cmdctx"
@@ -160,26 +159,20 @@ func runInit(commandContext *cmdctx.CmdContext) error {
 		dockerfile := commandContext.Config.GetBool("dockerfile")
 
 		if builder == "" && !dockerfileSet {
-			builder, err := selectBuildtype(commandContext)
+			builder, builtin, err := selectBuildtype(commandContext)
 
 			switch {
 			case isInterrupt(err):
 				return nil
-			case err != nil || org == nil:
+			case err != nil || builder == "":
 				return fmt.Errorf("Error setting builder: %s", err)
 			}
+
 			if builder != "Dockerfile" {
 				newAppConfig.Build = &flyctl.Build{Builder: builder}
-			} else {
-				dockerfileExists := helpers.FileExists(path.Join(commandContext.WorkingDir, "Dockerfile"))
-				if !dockerfileExists {
-					newdf, err := os.Create(path.Join(commandContext.WorkingDir, "Dockerfile"))
-					if err != nil {
-						return fmt.Errorf("Error writing example Dockerfile: %s", err)
-					}
-					fmt.Fprintf(newdf, "FROM flyio/hellofly\n")
-					newdf.Close()
-				}
+			}
+			if builtin {
+				builtinname = builder
 			}
 		} else if builder != "" {
 			// If the builder was set and there's not dockerfile setting, write the builder

cmd/input.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/superfly/flyctl/api"
+	"github.com/superfly/flyctl/builtinsupport"
 	"github.com/superfly/flyctl/cmdctx"
 	"github.com/superfly/flyctl/helpers"
 )
@@ -101,16 +102,25 @@ var suggestedBuilders = []suggestedBuilder{
 	},
 }
 
-func selectBuildtype(commandContext *cmdctx.CmdContext) (string, error) {
+var builtins []builtinsupport.Builtin
+
+func selectBuildtype(commandContext *cmdctx.CmdContext) (string, bool, error) {
 
 	dockerfileExists := helpers.FileExists(path.Join(commandContext.WorkingDir, "Dockerfile"))
 
+	dockerfileentry := -1
+
 	builders := []string{}
 
+	builtins = builtinsupport.GetBuiltins()
+
+	for _, b := range builtins {
+		builders = append(builders, fmt.Sprintf("%s\n    %s", b.Name, helpers.WrapString(b.Description, 60, 4)))
+	}
+
 	if dockerfileExists {
 		builders = append(builders, fmt.Sprintf("%s\n    (%s)", "Dockerfile", "Use the existing Dockerfile"))
-	} else {
-		builders = append(builders, fmt.Sprintf("%s\n    (%s)", "Dockerfile", "Create an example Dockerfile"))
+		dockerfileentry = len(builders) - 1
 	}
 
 	for _, b := range suggestedBuilders {
@@ -125,11 +135,25 @@ func selectBuildtype(commandContext *cmdctx.CmdContext) (string, error) {
 		PageSize: 15,
 	}
 	if err := survey.AskOne(prompt, &selectedBuilder); err != nil {
-		return "", err
+		return "", false, err
 	}
 
-	if selectedBuilder == 0 {
-		return "Dockerfile", nil
+	fmt.Println(selectedBuilder, dockerfileentry)
+	offset := 0 // offset of the builder names
+
+	if dockerfileentry != -1 {
+		offset = offset + 1
+		if selectedBuilder == dockerfileentry {
+			return "Dockerfile", false, nil
+		}
+	}
+
+	if selectedBuilder < len(builtins) {
+		// Selected a built in
+		return builtins[selectedBuilder].Name, true, nil
 	}
-	return suggestedBuilders[selectedBuilder-1].Image, nil
+
+	offset = offset + len(builtins)
+
+	return suggestedBuilders[selectedBuilder-offset].Image, false, nil
 }