Use go:embed for defaults (#137).

cmd/site.go

@@ -1,8 +1,10 @@
 package cmd
 
 import (
+	"embed"
 	"errors"
 	"fmt"
+	"io/fs"
 	"io/ioutil"
 	"log"
 	"os"
@@ -16,6 +18,15 @@ import (
 	"github.com/spf13/cobra"
 )
 
+//go:embed defaults/*
+var defaultsFS embed.FS
+
+//go:embed defaults_bare/*
+var defaultsBareFS embed.FS
+
+//go:embed defaults_node_modules/*
+var defaultsNodeModulesFS embed.FS
+
 // siteCmd represents the site command
 var siteCmd = &cobra.Command{
 	Use:   "site [name]",
@@ -80,26 +91,53 @@ var siteCmd = &cobra.Command{
 		}
 
 		// set to Defaults and overwrite if bareFlag is set
-		scaffolding := generated.Defaults
+		scaffolding, err := fs.Sub(defaultsFS, "defaults")
+		if err != nil {
+			common.CheckErr(fmt.Errorf("Unable to get defaults: %w", err))
+		}
 		// Choose which scaffolding to use for new site.
 		if bareFlag {
-			scaffolding = generated.Defaults_bare
+			scaffolding, err = fs.Sub(defaultsBareFS, "defaults_bare")
+			if err != nil {
+				common.CheckErr(fmt.Errorf("Unable to get bare defaults: %w", err))
+			}
 		}
 
 		// Loop through generated file defaults to create site scaffolding
-		for file, content := range scaffolding {
-			// Create the directories needed for the current file
-			pth := fmt.Sprintf("%s/%s", newpath, strings.Trim(filepath.Dir(file), "/"))
-			if err := os.MkdirAll(pth, os.ModePerm); err != nil {
-				common.CheckErr(fmt.Errorf("Unable to create path(s) %s: %v", pth, err))
+		fs.WalkDir(scaffolding, ".", func(path string, d fs.DirEntry, err error) error {
+			if err != nil {
+				return err
 			}
-
+			if d.IsDir() {
+				// Create the directories needed for the current file
+				if err := os.MkdirAll(newpath+"/"+path, os.ModePerm); err != nil {
+					common.CheckErr(fmt.Errorf("Unable to create path(s) %s: %v", path, err))
+				}
+				return nil
+			}
+			content, _ := scaffolding.Open(path)
+			contentBytes, err := ioutil.ReadAll(content)
 			// Create the current default file
-			if err := ioutil.WriteFile(fmt.Sprintf("%s/%s", newpath, file), content, 0755); err != nil {
-
+			if err := ioutil.WriteFile(newpath+"/"+path, contentBytes, 0755); err != nil {
 				common.CheckErr(fmt.Errorf("Unable to write file: %w", err))
 			}
-		}
+			return nil
+		})
+		/*
+			for file, content := range scaffolding {
+				// Create the directories needed for the current file
+				pth := fmt.Sprintf("%s/%s", newpath, strings.Trim(filepath.Dir(file), "/"))
+				if err := os.MkdirAll(pth, os.ModePerm); err != nil {
+					common.CheckErr(fmt.Errorf("Unable to create path(s) %s: %v", pth, err))
+				}
+
+				// Create the current default file
+				if err := ioutil.WriteFile(fmt.Sprintf("%s/%s", newpath, file), content, 0755); err != nil {
+
+					common.CheckErr(fmt.Errorf("Unable to write file: %w", err))
+				}
+			}
+		*/
 
 		// Loop through generated node_modules npm pacakges to include in scaffolding
 		for file, content := range generated.Defaults_node_modules {