Merge pull request #62 from wailsapp/Default-Prompts-not-populating

Default prompts not populating

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Description**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behaviour:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**System Details**
+Please paste the output of `wails report` here.
+
+**Additional context**
+Add any other context about the problem here.

cmd/fs.go

@@ -41,6 +41,14 @@ func (fs *FSHelper) FileExists(path string) bool {
 	return fi.Mode().IsRegular()
 }
 
+// CreateFile creates a file at the given filename location with the contents
+// set to the given data. It will create intermediary directories if needed.
+func (fs *FSHelper) CreateFile(filename string, data []byte) error {
+	// Ensure directory exists
+	fs.MkDirs(filepath.Dir(filename))
+	return ioutil.WriteFile(filename, data, 0644)
+}
+
 // MkDirs creates the given nested directories.
 // Returns error on failure
 func (fs *FSHelper) MkDirs(fullPath string, mode ...os.FileMode) error {

cmd/helpers.go

@@ -14,6 +14,8 @@ import (
 	"github.com/leaanthony/spinner"
 )
 
+var fs = NewFSHelper()
+
 // ValidateFrontendConfig checks if the frontend config is valid
 func ValidateFrontendConfig(projectOptions *ProjectOptions) error {
 	if projectOptions.FrontEnd.Dir == "" {
@@ -172,7 +174,7 @@ func CheckWindres() (err error) {
 	}
 	programHelper := NewProgramHelper()
 	if !programHelper.IsInstalled("windres") {
-		return fmt.Errorf("windres not installed. It comes by default with mingw. Ensure you have installed mingw correctly.")
+		return fmt.Errorf("windres not installed. It comes by default with mingw. Ensure you have installed mingw correctly")
 	}
 	return nil
 }

cmd/log.go

@@ -17,6 +17,7 @@ func NewLogger() *Logger {
 	return &Logger{errorOnly: false}
 }
 
+// SetErrorOnly ensures that only errors are logged out
 func (l *Logger) SetErrorOnly(errorOnly bool) {
 	l.errorOnly = errorOnly
 }
@@ -99,6 +100,7 @@ func (l *Logger) Error(format string, a ...interface{}) {
 	color.New(color.FgHiRed).PrintfFunc()("Error: "+format+"\n", a...)
 }
 
+// PrintSmallBanner prints a condensed banner
 func (l *Logger) PrintSmallBanner(message ...string) {
 	yellow := color.New(color.FgYellow).SprintFunc()
 	red := color.New(color.FgRed).SprintFunc()

cmd/package.go

@@ -150,6 +150,7 @@ func (b *PackageHelper) packageOSX(po *ProjectOptions) error {
 	return err
 }
 
+// PackageWindows packages the application for windows platforms
 func (b *PackageHelper) PackageWindows(po *ProjectOptions, cleanUp bool) error {
 	basename := strings.TrimSuffix(po.BinaryName, ".exe")
 

cmd/project.go

@@ -4,9 +4,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
+
+	"github.com/leaanthony/slicer"
 )
 
 type author struct {
@@ -47,15 +50,11 @@ func NewProjectHelper() *ProjectHelper {
 // GenerateProject generates a new project using the options given
 func (ph *ProjectHelper) GenerateProject(projectOptions *ProjectOptions) error {
 
-	fs := NewFSHelper()
-	exists, err := ph.templates.TemplateExists(projectOptions.Template)
-	if err != nil {
-		return err
-	}
+	// exists := ph.templates.TemplateExists(projectOptions.Template)
 
-	if !exists {
-		return fmt.Errorf("template '%s' is invalid", projectOptions.Template)
-	}
+	// if !exists {
+	// 	return fmt.Errorf("template '%s' is invalid", projectOptions.Template)
+	// }
 
 	// Calculate project path
 	projectPath, err := filepath.Abs(projectOptions.OutputDirectory)
@@ -63,6 +62,8 @@ func (ph *ProjectHelper) GenerateProject(projectOptions *ProjectOptions) error {
 		return err
 	}
 
+	_ = projectPath
+
 	if fs.DirExists(projectPath) {
 		return fmt.Errorf("directory '%s' already exists", projectPath)
 	}
@@ -114,15 +115,14 @@ func (ph *ProjectHelper) LoadProjectConfig(dir string) (*ProjectOptions, error)
 // NewProjectOptions creates a new default set of project options
 func (ph *ProjectHelper) NewProjectOptions() *ProjectOptions {
 	result := ProjectOptions{
-		Name:            "",
-		Description:     "Enter your project description",
-		Version:         "0.1.0",
-		BinaryName:      "",
-		system:          NewSystemHelper(),
-		log:             NewLogger(),
-		templates:       NewTemplateHelper(),
-		templateNameMap: make(map[string]string),
-		Author:          &author{},
+		Name:        "",
+		Description: "Enter your project description",
+		Version:     "0.1.0",
+		BinaryName:  "",
+		system:      NewSystemHelper(),
+		log:         NewLogger(),
+		templates:   NewTemplateHelper(),
+		Author:      &author{},
 	}
 
 	// Populate system config
@@ -137,25 +137,25 @@ func (ph *ProjectHelper) NewProjectOptions() *ProjectOptions {
 
 // ProjectOptions holds all the options available for a project
 type ProjectOptions struct {
-	Name            string    `json:"name"`
-	Description     string    `json:"description"`
-	Author          *author   `json:"author,omitempty"`
-	Version         string    `json:"version"`
-	OutputDirectory string    `json:"-"`
-	UseDefaults     bool      `json:"-"`
-	Template        string    `json:"-"`
-	BinaryName      string    `json:"binaryname"`
-	FrontEnd        *frontend `json:"frontend,omitempty"`
-	NPMProjectName  string    `json:"-"`
-	system          *SystemHelper
-	log             *Logger
-	templates       *TemplateHelper
-	templateNameMap map[string]string // Converts template prompt text to template name
+	Name             string    `json:"name"`
+	Description      string    `json:"description"`
+	Author           *author   `json:"author,omitempty"`
+	Version          string    `json:"version"`
+	OutputDirectory  string    `json:"-"`
+	UseDefaults      bool      `json:"-"`
+	Template         string    `json:"-"`
+	BinaryName       string    `json:"binaryname"`
+	FrontEnd         *frontend `json:"frontend,omitempty"`
+	NPMProjectName   string    `json:"-"`
+	system           *SystemHelper
+	log              *Logger
+	templates        *TemplateHelper
+	selectedTemplate *TemplateDetails
 }
 
 // Defaults sets the default project template
 func (po *ProjectOptions) Defaults() {
-	po.Template = "basic"
+	po.Template = "vuebasic"
 }
 
 // PromptForInputs asks the user to input project details
@@ -170,48 +170,31 @@ func (po *ProjectOptions) PromptForInputs() error {
 		return err
 	}
 
-	templateDetails, err := po.templates.GetTemplateDetails()
-	if err != nil {
-		return err
+	// Process Templates
+	templateList := slicer.Interface()
+	options := slicer.String()
+	for _, templateDetails := range po.templates.TemplateList.details {
+		templateList.Add(templateDetails)
+		options.Add(fmt.Sprintf("%s - %s", templateDetails.Metadata.Name, templateDetails.Metadata.ShortDescription))
 	}
 
-	templates := []string{}
-	// Add a Custom Template
-	// templates = append(templates, "Custom - Choose your own CSS framework")
-	for templateName, templateDetails := range templateDetails {
-		templateText := templateName
-		// Check if metadata json exists
-		if templateDetails.Metadata != nil {
-			shortdescription := templateDetails.Metadata["shortdescription"]
-			if shortdescription != "" {
-				templateText += " - " + shortdescription.(string)
-			}
-		}
-		templates = append(templates, templateText)
-		po.templateNameMap[templateText] = templateName
+	templateIndex := 0
+
+	if len(options.AsSlice()) > 1 {
+		templateIndex = PromptSelection("Please select a template", options.AsSlice(), 0)
 	}
 
-	if po.Template != "" {
-		if _, ok := templateDetails[po.Template]; !ok {
-			po.log.Error("Template '%s' invalid.", po.Template)
-			templateSelected := PromptSelection("Select template", templates)
-			po.Template = templates[templateSelected]
-		}
-	} else {
-		templateSelected := PromptSelection("Select template", templates)
-		po.Template = templates[templateSelected]
-	}
+	// After selection do this....
+	po.selectedTemplate = templateList.AsSlice()[templateIndex].(*TemplateDetails)
 
 	// Setup NPM Project name
 	po.NPMProjectName = strings.ToLower(strings.Replace(po.Name, " ", "_", -1))
 
 	// Fix template name
-	if po.templateNameMap[po.Template] != "" {
-		po.Template = po.templateNameMap[po.Template]
-	}
+	po.Template = strings.Split(po.selectedTemplate.Path, string(os.PathSeparator))[0]
 
-	// Populate template details
-	templateMetadata := templateDetails[po.Template].Metadata
+	// // Populate template details
+	templateMetadata := po.selectedTemplate.Metadata
 
 	err = processTemplateMetadata(templateMetadata, po)
 	if err != nil {
@@ -263,7 +246,7 @@ func computeBinaryName(projectName string) string {
 func processOutputDirectory(po *ProjectOptions) error {
 	// po.OutputDirectory
 	if po.OutputDirectory == "" {
-		po.OutputDirectory = PromptRequired("Project directory name")
+		po.OutputDirectory = PromptRequired("Project directory name", computeBinaryName(po.Name))
 	}
 	projectPath, err := filepath.Abs(po.OutputDirectory)
 	if err != nil {
@@ -299,36 +282,36 @@ func processBinaryName(po *ProjectOptions) {
 	fmt.Println("Output binary Name: " + po.BinaryName)
 }
 
-func processTemplateMetadata(templateMetadata map[string]interface{}, po *ProjectOptions) error {
-	if templateMetadata["frontenddir"] != nil {
+func processTemplateMetadata(templateMetadata *TemplateMetadata, po *ProjectOptions) error {
+	if templateMetadata.FrontendDir != "" {
 		po.FrontEnd = &frontend{}
-		po.FrontEnd.Dir = templateMetadata["frontenddir"].(string)
+		po.FrontEnd.Dir = templateMetadata.FrontendDir
 	}
-	if templateMetadata["install"] != nil {
+	if templateMetadata.Install != "" {
 		if po.FrontEnd == nil {
 			return fmt.Errorf("install set in template metadata but not frontenddir")
 		}
-		po.FrontEnd.Install = templateMetadata["install"].(string)
+		po.FrontEnd.Install = templateMetadata.Install
 	}
-	if templateMetadata["build"] != nil {
+	if templateMetadata.Build != "" {
 		if po.FrontEnd == nil {
 			return fmt.Errorf("build set in template metadata but not frontenddir")
 		}
-		po.FrontEnd.Build = templateMetadata["build"].(string)
+		po.FrontEnd.Build = templateMetadata.Build
 	}
 
-	if templateMetadata["bridge"] != nil {
+	if templateMetadata.Bridge != "" {
 		if po.FrontEnd == nil {
 			return fmt.Errorf("bridge set in template metadata but not frontenddir")
 		}
-		po.FrontEnd.Bridge = templateMetadata["bridge"].(string)
+		po.FrontEnd.Bridge = templateMetadata.Bridge
 	}
 
-	if templateMetadata["serve"] != nil {
+	if templateMetadata.Serve != "" {
 		if po.FrontEnd == nil {
 			return fmt.Errorf("serve set in template metadata but not frontenddir")
 		}
-		po.FrontEnd.Serve = templateMetadata["serve"].(string)
+		po.FrontEnd.Serve = templateMetadata.Serve
 	}
 	return nil
 }

cmd/prompt.go

@@ -1,25 +1,35 @@
 package cmd
 
 import (
+	"bufio"
 	"fmt"
+	"os"
+	"runtime"
 	"strconv"
+	"strings"
 )
 
 // Prompt asks the user for a value
 func Prompt(question string, defaultValue ...string) string {
 	var answer string
-	haveDefault := len(defaultValue) > 0 && defaultValue[0] != ""
 
-	if haveDefault {
-		question = fmt.Sprintf("%s (%s)", question, defaultValue[0])
+	if len(defaultValue) > 0 {
+		answer = defaultValue[0]
+		question = fmt.Sprintf("%s (%s)", question, answer)
 	}
 	fmt.Printf(question + ": ")
-	fmt.Scanln(&answer)
-	if haveDefault {
-		if len(answer) == 0 {
-			answer = defaultValue[0]
-		}
+	reader := bufio.NewReader(os.Stdin)
+	input, _ := reader.ReadString('\n')
+	EOL := "\n"
+	if runtime.GOOS == "windows" {
+		EOL = "\r\n"
 	}
+	input = strings.Replace(input, EOL, "", -1)
+
+	if input != "" {
+		answer = input
+	}
+
 	return answer
 }
 
@@ -34,18 +44,29 @@ func PromptRequired(question string, defaultValue ...string) string {
 }
 
 // PromptSelection asks the user to choose an option
-func PromptSelection(question string, options []string) int {
+func PromptSelection(question string, options []string, optionalDefaultValue ...int) int {
 
+	defaultValue := -1
+	message := "Please choose an option"
 	fmt.Println(question + ":")
+
+	if len(optionalDefaultValue) > 0 {
+		defaultValue = optionalDefaultValue[0] + 1
+		message = fmt.Sprintf("%s [%d]", message, defaultValue)
+	}
+
 	for index, option := range options {
 		fmt.Printf("  %d: %s\n", index+1, option)
 	}
 
-	fmt.Println()
 	selectedValue := -1
 
 	for {
-		choice := Prompt("Please choose an option")
+		choice := Prompt(message)
+		if choice == "" && defaultValue > -1 {
+			selectedValue = defaultValue - 1
+			break
+		}
 
 		// index
 		number, err := strconv.Atoi(choice)

cmd/templates.go

@@ -3,112 +3,95 @@ package cmd
 import (
 	"bytes"
 	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
+	"log"
 	"path/filepath"
-	"runtime"
+	"regexp"
 	"strings"
 	"text/template"
+
+	mewn "github.com/leaanthony/mewn"
+	mewnlib "github.com/leaanthony/mewn/lib"
+	"github.com/leaanthony/slicer"
 )
 
-const templateSuffix = ".template"
-
-// TemplateHelper helps with creating projects
-type TemplateHelper struct {
-	system      *SystemHelper
-	fs          *FSHelper
-	templateDir string
-	// templates   map[string]string
-	templateSuffix   string
-	metadataFilename string
+// TemplateMetadata holds all the metadata for a Wails template
+type TemplateMetadata struct {
+	Name             string `json:"name"`
+	ShortDescription string `json:"shortdescription"`
+	Description      string `json:"description"`
+	Install          string `json:"install"`
+	Build            string `json:"build"`
+	Author           string `json:"author"`
+	Created          string `json:"created"`
+	FrontendDir      string `json:"frontenddir"`
+	Serve            string `json:"serve"`
+	Bridge           string `json:"bridge"`
 }
 
-// Template defines a single template
+// TemplateDetails holds information about a specific template
+type TemplateDetails struct {
+	BasePath string
+	Path     string
+	Metadata *TemplateMetadata
+}
+
+// TemplateList is a list of available templates
+type TemplateList struct {
+	details map[string]*TemplateDetails
+}
+
+// NewTemplateList creates a new TemplateList object
+func NewTemplateList(filenames *mewnlib.FileGroup) *TemplateList {
+	// Iterate each template and store information
+
+	result := &TemplateList{details: make(map[string]*TemplateDetails)}
+
+	entries := slicer.String()
+	entries.AddSlice(filenames.Entries())
+
+	// Find all template.json files
+	metadataFiles := entries.Filter(func(filename string) bool {
+		match, _ := regexp.MatchString("(.)+template.json$", filename)
+		return match
+	})
+
+	// Load each metadata file
+	metadataFiles.Each(func(filename string) {
+		fileData := filenames.Bytes(filename)
+		var metadata TemplateMetadata
+		err := json.Unmarshal(fileData, &metadata)
+		if err != nil {
+			log.Fatalf("corrupt metadata for template: %s", filename)
+		}
+		path := strings.Split(filename, string(filepath.Separator))[0]
+		thisTemplate := &TemplateDetails{Path: path, Metadata: &metadata}
+		result.details[filename] = thisTemplate
+	})
+
+	return result
+}
+
+// Template holds details about a Wails template
 type Template struct {
-	Name     string
-	Dir      string
-	Metadata map[string]interface{}
+	Name        string
+	Path        string
+	Description string
+}
+
+// TemplateHelper is a utility object to help with processing templates
+type TemplateHelper struct {
+	TemplateList *TemplateList
+	Files        *mewnlib.FileGroup
 }
 
 // NewTemplateHelper creates a new template helper
 func NewTemplateHelper() *TemplateHelper {
-	result := TemplateHelper{
-		system:           NewSystemHelper(),
-		fs:               NewFSHelper(),
-		templateSuffix:   ".template",
-		metadataFilename: "template.json",
-	}
-	// Calculate template base dir
-	_, filename, _, _ := runtime.Caller(1)
-	result.templateDir = filepath.Join(path.Dir(filename), "templates")
-	// result.templateDir = filepath.Join(result.system.homeDir, "go", "src", "github.com", "wailsapp", "wails", "cmd", "templates")
-	return &result
-}
+	files := mewn.Group("./templates")
 
-// GetTemplateNames returns a map of all available templates
-func (t *TemplateHelper) GetTemplateNames() (map[string]string, error) {
-	templateDirs, err := t.fs.GetSubdirs(t.templateDir)
-	if err != nil {
-		return nil, err
+	return &TemplateHelper{
+		TemplateList: NewTemplateList(files),
+		Files:        files,
 	}
-	return templateDirs, nil
-}
-
-// GetTemplateDetails returns a map of Template structs containing details
-// of the found templates
-func (t *TemplateHelper) GetTemplateDetails() (map[string]*Template, error) {
-	templateDirs, err := t.fs.GetSubdirs(t.templateDir)
-	if err != nil {
-		return nil, err
-	}
-
-	result := make(map[string]*Template)
-
-	for name, dir := range templateDirs {
-		result[name] = &Template{
-			Dir: dir,
-		}
-		metadata, err := t.LoadMetadata(dir)
-		if err != nil {
-			return nil, err
-		}
-		result[name].Metadata = metadata
-		if metadata["name"] != nil {
-			result[name].Name = metadata["name"].(string)
-		} else {
-			// Ignore bad templates?
-			result[name] = nil
-		}
-	}
-
-	return result, nil
-}
-
-// LoadMetadata loads the template's 'metadata.json' file
-func (t *TemplateHelper) LoadMetadata(dir string) (map[string]interface{}, error) {
-	templateFile := filepath.Join(dir, t.metadataFilename)
-	result := make(map[string]interface{})
-	if !t.fs.FileExists(templateFile) {
-		return nil, nil
-	}
-	rawJSON, err := ioutil.ReadFile(templateFile)
-	if err != nil {
-		return nil, err
-	}
-	err = json.Unmarshal(rawJSON, &result)
-	return result, err
-}
-
-// TemplateExists returns true if the given template name exists
-func (t *TemplateHelper) TemplateExists(templateName string) (bool, error) {
-	templates, err := t.GetTemplateNames()
-	if err != nil {
-		return false, err
-	}
-	_, exists := templates[templateName]
-	return exists, nil
 }
 
 // InstallTemplate installs the template given in the project options to the
@@ -116,161 +99,55 @@ func (t *TemplateHelper) TemplateExists(templateName string) (bool, error) {
 func (t *TemplateHelper) InstallTemplate(projectPath string, projectOptions *ProjectOptions) error {
 
 	// Get template files
-	template, err := t.getTemplateFiles(projectOptions.Template)
-	if err != nil {
-		return err
-	}
+	templatePath := projectOptions.selectedTemplate.Path
 
-	// Copy files to target
-	err = template.Install(projectPath, projectOptions)
-	if err != nil {
-		return err
-	}
+	templateFilenames := slicer.String()
+	templateFilenames.AddSlice(projectOptions.templates.Files.Entries())
 
-	return nil
-}
+	templateJSONFilename := filepath.Join(templatePath, "template.json")
 
-// templateFiles categorises files found in a template
-type templateFiles struct {
-	BaseDir       string
-	StandardFiles []string
-	Templates     []string
-	Dirs          []string
-}
-
-// newTemplateFiles returns a new TemplateFiles struct
-func (t *TemplateHelper) newTemplateFiles(dir string) *templateFiles {
-	pathsep := string(os.PathSeparator)
-	// Ensure base directory has trailing slash
-	if !strings.HasSuffix(dir, pathsep) {
-		dir = dir + pathsep
-	}
-	return &templateFiles{
-		BaseDir: dir,
-	}
-}
-
-// AddStandardFile adds the given file to the list of standard files
-func (t *templateFiles) AddStandardFile(filename string) {
-	localPath := strings.TrimPrefix(filename, t.BaseDir)
-	t.StandardFiles = append(t.StandardFiles, localPath)
-}
-
-// AddTemplate adds the given file to the list of template files
-func (t *templateFiles) AddTemplate(filename string) {
-	localPath := strings.TrimPrefix(filename, t.BaseDir)
-	t.Templates = append(t.Templates, localPath)
-}
-
-// AddDir adds the given directory to the list of template dirs
-func (t *templateFiles) AddDir(dir string) {
-	localPath := strings.TrimPrefix(dir, t.BaseDir)
-	t.Dirs = append(t.Dirs, localPath)
-}
-
-// getTemplateFiles returns a struct categorising files in
-// the template directory
-func (t *TemplateHelper) getTemplateFiles(templateName string) (*templateFiles, error) {
-
-	templates, err := t.GetTemplateNames()
-	if err != nil {
-		return nil, err
-	}
-	templateDir := templates[templateName]
-	result := t.newTemplateFiles(templateDir)
-	var localPath string
-	err = filepath.Walk(templateDir, func(dir string, info os.FileInfo, err error) error {
-		if dir == templateDir {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-
-		// Don't copy template metadata
-		localPath = strings.TrimPrefix(dir, templateDir+string(filepath.Separator))
-		if localPath == t.metadataFilename {
-			return nil
-		}
-
-		// Categorise the file
-		switch {
-		case info.IsDir():
-			result.AddDir(dir)
-		case strings.HasSuffix(info.Name(), templateSuffix):
-			result.AddTemplate(dir)
-		default:
-			result.AddStandardFile(dir)
-		}
-		return nil
+	templateFiles := templateFilenames.Filter(func(filename string) bool {
+		return strings.HasPrefix(filename, templatePath) && filename != templateJSONFilename
 	})
 
-	if err != nil {
-		return nil, fmt.Errorf("error processing template '%s' in path '%q': %v", templateName, templateDir, err)
-	}
-	return result, err
-}
-
-// Install the template files into the given project path
-func (t *templateFiles) Install(projectPath string, projectOptions *ProjectOptions) error {
-
-	fs := NewFSHelper()
-
-	// Create directories
-	var targetDir string
-	for _, dirname := range t.Dirs {
-		targetDir = filepath.Join(projectPath, dirname)
-		fs.MkDir(targetDir)
-	}
-
-	// Copy standard files
-	var targetFile, sourceFile string
 	var err error
-	for _, filename := range t.StandardFiles {
-		sourceFile = filepath.Join(t.BaseDir, filename)
-		targetFile = filepath.Join(projectPath, filename)
+	templateFiles.Each(func(templateFile string) {
 
-		err = fs.CopyFile(sourceFile, targetFile)
+		// Setup filenames
+		relativeFilename := strings.TrimPrefix(templateFile, templatePath)[1:]
+		targetFilename, err := filepath.Abs(filepath.Join(projectOptions.OutputDirectory, relativeFilename))
 		if err != nil {
-			return err
+			return
 		}
-	}
+		filedata := projectOptions.templates.Files.Bytes(templateFile)
 
-	// Do we have template files?
-	if len(t.Templates) > 0 {
-
-		// Iterate over the templates
-		var templateFile string
-		var tmpl *template.Template
-		for _, filename := range t.Templates {
-
-			// Load template text
-			templateFile = filepath.Join(t.BaseDir, filename)
-			templateText, err := fs.LoadAsString(templateFile)
-			if err != nil {
-				return err
-			}
-
-			// Apply template
-			tmpl = template.New(templateFile)
-			tmpl.Parse(templateText)
-
-			// Write the template to a buffer
+		// If file is a template, process it
+		if strings.HasSuffix(templateFile, ".template") {
+			templateData := projectOptions.templates.Files.String(templateFile)
+			tmpl := template.New(templateFile)
+			tmpl.Parse(templateData)
 			var tpl bytes.Buffer
 			err = tmpl.Execute(&tpl, projectOptions)
 			if err != nil {
-				fmt.Println("ERROR!!! " + err.Error())
-				return err
+				return
 			}
 
-			// Save buffer to disk
-			targetFilename := strings.TrimSuffix(filename, templateSuffix)
-			targetFile = filepath.Join(projectPath, targetFilename)
-			err = ioutil.WriteFile(targetFile, tpl.Bytes(), 0644)
-			if err != nil {
-				return err
-			}
+			// Remove template suffix
+			targetFilename = strings.TrimSuffix(targetFilename, ".template")
+
+			// Set the filedata to the template result
+			filedata = tpl.Bytes()
 		}
+
+		// Normal file, just copy it
+		err = fs.CreateFile(targetFilename, filedata)
+		if err != nil {
+			return
+		}
+	})
+
+	if err != nil {
+		return err
 	}
 
 	return nil

cmd/templates/vuebasic/frontend/package.json.md5

@@ -1 +0,0 @@
-2b79f883dc856221fc3265755d610e40

cmd/version.go

@@ -2,4 +2,4 @@ package cmd
 
 // Version - Wails version
 // ...oO(There must be a better way)
-const Version = "v0.9.2"
+const Version = "v0.9.8"

cmd/wails/2_init.go

@@ -17,7 +17,7 @@ Any flags that are required and not given will be prompted for.`
 		LongDescription(commandDescription).
 		BoolFlag("f", "Use defaults", &projectOptions.UseDefaults).
 		StringFlag("dir", "Directory to create project in", &projectOptions.OutputDirectory).
-		StringFlag("template", "Template name", &projectOptions.Template).
+		// StringFlag("template", "Template name", &projectOptions.Template).
 		StringFlag("name", "Project name", &projectOptions.Name).
 		StringFlag("description", "Project description", &projectOptions.Description).
 		StringFlag("output", "Output binary name", &projectOptions.BinaryName)

cmd/wails/8_update.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	"fmt"
+	"net/http"
+	"io/ioutil"
+	"encoding/json"
+
+	"github.com/leaanthony/spinner"
+	"github.com/wailsapp/wails/cmd"
+)
+
+func init() {
+
+	// var forceRebuild = false
+	checkSpinner := spinner.NewSpinner()
+	checkSpinner.SetSpinSpeed(50)
+
+	commandDescription := `This command checks if there are updates to Wails.`
+	updateCmd := app.Command("update", "Check for Updates.").
+		LongDescription(commandDescription)
+
+	updateCmd.Action(func() error {
+
+		message := "Checking for updates..."
+		logger.PrintSmallBanner(message)
+		fmt.Println()
+
+		// Get versions
+		checkSpinner.Start(message)
+		resp, err := http.Get("https://api.github.com/repos/wailsapp/wails/tags")
+		if err != nil {
+			checkSpinner.Error(err.Error())
+			return err
+		}
+		checkSpinner.Success()
+		body, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			checkSpinner.Error(err.Error())
+			return err
+		}
+
+		data := []map[string]interface{}{}
+		err = json.Unmarshal(body, &data)
+		if err != nil {
+			return err
+		}
+
+		latestVersion := data[0]["name"].(string)
+		fmt.Println()
+		fmt.Println("Current Version: " + cmd.Version)
+		fmt.Println(" Latest Version: " + latestVersion)
+		if latestVersion != cmd.Version {
+			updateSpinner := spinner.NewSpinner()
+			updateSpinner.SetSpinSpeed(40)
+			updateSpinner.Start("Updating to  : " + latestVersion)
+			err = cmd.NewProgramHelper().RunCommandArray([]string{"go","get","-u","github.com/wailsapp/wails/cmd/wails"})
+			if err != nil {
+				updateSpinner.Error(err.Error())
+				return err
+			}
+			updateSpinner.Success()
+			logger.Yellow("Wails updated to " + latestVersion)
+		} else {
+			logger.Yellow("Looks like you're up to date!")
+		}
+		return nil
+	})
+}

cmd/wails/9_issue.go

@@ -0,0 +1,74 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"os"
+	"runtime"
+	"strings"
+
+	"github.com/pkg/browser"
+
+	"github.com/wailsapp/wails/cmd"
+)
+
+func init() {
+
+	commandDescription := `Generates an issue in Github using the given title, description and system report.`
+
+	initCommand := app.Command("issue", "Generates an issue in Github.").
+		LongDescription(commandDescription)
+
+	initCommand.Action(func() error {
+
+		logger.PrintSmallBanner("Generate Issue")
+		fmt.Println()
+		message := `Thanks for taking the time to submit an issue!
+
+To help you in this process, we will ask for some information, add Go/Wails details automatically, then prepare the issue for your editing and submission.
+`
+
+		logger.Yellow(message)
+
+		title := cmd.Prompt("Issue Title")
+		description := cmd.Prompt("Issue Description")
+
+		var str strings.Builder
+
+		gomodule, exists := os.LookupEnv("GO111MODULE")
+		if !exists {
+			gomodule = "(Not Set)"
+		}
+
+		str.WriteString("\n| Name   | Value |\n| ----- | ----- |\n")
+		str.WriteString(fmt.Sprintf("| Wails Version | %s |\n", cmd.Version))
+		str.WriteString(fmt.Sprintf("| Go Version    | %s |\n", runtime.Version()))
+		str.WriteString(fmt.Sprintf("| Platform      | %s |\n", runtime.GOOS))
+		str.WriteString(fmt.Sprintf("| Arch          | %s |\n", runtime.GOARCH))
+		str.WriteString(fmt.Sprintf("| GO111MODULE   | %s |\n", gomodule))
+
+		fmt.Println()
+		fmt.Println("Processing template and preparing for upload.")
+
+		// Grab issue template
+		resp, err := http.Get("https://raw.githubusercontent.com/wailsapp/wails/master/.github/ISSUE_TEMPLATE/bug_report.md")
+		if err != nil {
+			logger.Red("Unable to read in issue template. Are you online?")
+			os.Exit(1)
+		}
+		defer resp.Body.Close()
+		template, _ := ioutil.ReadAll(resp.Body)
+		body := string(template)
+		body = "**Description**\n" + (strings.Split(body, "**Description**")[1])
+		fullURL := "https://github.com/wailsapp/wails/issues/new?"
+		body = strings.Replace(body, "A clear and concise description of what the bug is.", description, -1)
+		body = strings.Replace(body, "Please paste the output of `wails report` here.", str.String(), -1)
+		params := "title=" + title + "&body=" + body
+
+		fmt.Println("Opening browser to file issue.")
+		browser.OpenURL(fullURL + url.PathEscape(params))
+		return nil
+	})
+}

go.mod

@@ -1,7 +1,6 @@
 module github.com/wailsapp/wails
 
 require (
-	github.com/akavel/rsrc v0.0.0-20170831122431-f6a15ece2cfd // indirect
 	github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc // indirect
 	github.com/dchest/htmlmin v0.0.0-20150526090704-e254725e81ac
 	github.com/dchest/jsmin v0.0.0-20160823214000-faeced883947 // indirect
@@ -9,12 +8,18 @@ require (
 	github.com/go-playground/colors v1.2.0
 	github.com/gorilla/websocket v1.4.0
 	github.com/jackmordaunt/icns v1.0.0
-	github.com/leaanthony/mewn v0.9.0
-	github.com/leaanthony/slicer v1.0.0
+	github.com/leaanthony/mewn v0.9.4
+	github.com/leaanthony/slicer v1.2.0
 	github.com/leaanthony/spinner v0.5.0
+	github.com/mattn/go-colorable v0.1.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
+	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/pkg/errors v0.8.1 // indirect
 	github.com/sirupsen/logrus v1.3.0
+	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/wailsapp/webview v0.2.5
+	golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2 // indirect
+	golang.org/x/net v0.0.0-20190213061140-3a22650c66bd // indirect
+	golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 // indirect
 )

go.sum

@@ -1,4 +1,5 @@
-github.com/akavel/rsrc v0.0.0-20170831122431-f6a15ece2cfd/go.mod h1:2+aQMrY0hBFBaIr2xxnZ/ctfwnYmMRMbTczYLAC34v4=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc h1:VBS1z48BFEe00G81z8MKOtwX7f/ISkuH38NscT8iVPw=
 github.com/dchest/cssmin v0.0.0-20151210170030-fb8d9b44afdc/go.mod h1:ABJPuor7YlcsHmvJ1QxX38e2NcufLY3hm0yXv+cy9sI=
@@ -18,10 +19,10 @@ github.com/jackmordaunt/icns v1.0.0 h1:RYSxplerf/l/DUd09AHtITwckkv/mqjVv4DjYdPmA
 github.com/jackmordaunt/icns v1.0.0/go.mod h1:7TTQVEuGzVVfOPPlLNHJIkzA6CoV7aH1Dv9dW351oOo=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/leaanthony/mewn v0.9.0 h1:GExA7M15ikWytAIBKgs9SDl9EOC04JSjvL29qiLTAq4=
-github.com/leaanthony/mewn v0.9.0/go.mod h1:CRkTx8unLiSSilu/Sd7i1LwrdaAL+3eQ3ses99qGMEQ=
-github.com/leaanthony/slicer v1.0.0 h1:BV2CySexcZ20qyHp5qBTxQhsazR6e8MBTF1EHmGu1xw=
-github.com/leaanthony/slicer v1.0.0/go.mod h1:VMB/HGvr3uR3MRpFWHWAm0w+DHQLzPHYe2pKfpFlQIQ=
+github.com/leaanthony/mewn v0.9.4 h1:thDAdV8DkCwqHcFLnfMLQtTHqK1N8leF7sD/SPsLMHI=
+github.com/leaanthony/mewn v0.9.4/go.mod h1:CRkTx8unLiSSilu/Sd7i1LwrdaAL+3eQ3ses99qGMEQ=
+github.com/leaanthony/slicer v1.2.0 h1:XZ+1l7cCO36j238iv5ZXkJAcM3hPtD0xb41/WE+QmuU=
+github.com/leaanthony/slicer v1.2.0/go.mod h1:VMB/HGvr3uR3MRpFWHWAm0w+DHQLzPHYe2pKfpFlQIQ=
 github.com/leaanthony/spinner v0.5.0 h1:HQykt/iTy7fmINEREtRbWrt+8j4MxC8dtvWBxEWM9oA=
 github.com/leaanthony/spinner v0.5.0/go.mod h1:8TSFz9SL1AUC4XSbEFYE6SfN5Mlus51qYluVGrie9ww=
 github.com/leaanthony/synx v0.1.0 h1:R0lmg2w6VMb8XcotOwAe5DLyzwjLrskNkwU7LLWsyL8=
@@ -30,6 +31,8 @@ github.com/leaanthony/wincursor v0.1.0 h1:Dsyp68QcF5cCs65AMBmxoYNEm0n8K7mMchG6a8
 github.com/leaanthony/wincursor v0.1.0/go.mod h1:7TVwwrzSH/2Y9gLOGH+VhA+bZhoWXBRgbGNTMk+yimE=
 github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.0 h1:v2XXALHHh6zHfYTJ+cSkwtyffnaOyR1MXaA91mTrb8o=
+github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
@@ -38,22 +41,34 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
+github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/ribice/glice v0.0.0-20181011133736-685f13fa9b12/go.mod h1:A+ednilkKNW0CJGLsrLkq0D49M4EhlCi8gvnkwoZFn0=
 github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
 github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/wailsapp/webview v0.2.5 h1:/VacryPEUeMBb2VHHOjpoIze6ki8tW3qYX04MnI0b7o=
 github.com/wailsapp/webview v0.2.5/go.mod h1:XO9HJbKWokDxUYTWQEBCYg95n/To1v7PxvanDNVf8hY=
 github.com/zserge/webview v0.0.0-20190123072648-16c93bcaeaeb/go.mod h1:a1CV8KR4Dd1eP2g+mEijGOp+HKczwdKHWyx0aPHKvo4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2 h1:NwxKRvbkH5MsNkvOtPZi3/3kmI8CAzs3mtv+GLQMkNo=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd h1:HuTn7WObtcDo9uEEU7rEqL0jYthdXAmZ6PP+meazmaU=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb h1:pf3XwC90UUdNPYWZdFjhGBE7DUFuK3Ct1zWmZ65QN30=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=