feat(templates): Use user-provided templates

blox/meta.go

@@ -110,27 +110,53 @@ func (m Model) New(slug string, destination string) error {
 	if err != nil {
 		return err
 	}
+
+	// check for user installed templates first
+	cfg, err := config.Load()
+	cobra.CheckErr(err)
+
+	templatePath := path.Join(cfg.Base, cfg.Templates, m.Folder, m.ID+cfg.DefaultExtension)
+
 	joined := path.Join(destination, slug)
+	// check to see if we're creating the templates
+	// from the `init` command
+	fmt.Println("creating:", joined)
+	fmt.Println("template path:", templatePath)
+	var bb []byte
+	if templatePath == joined {
+		bb, err = m.defaultTemplate()
+		cobra.CheckErr(err)
+	} else {
+		bb, err = os.ReadFile(templatePath)
+		cobra.CheckErr(err)
+	}
+
+	// create the destination file
 	f, err := os.Create(joined)
 	if err != nil {
 		return err
 	}
 	defer f.Close()
 
+	f.Write(bb)
+
+	return nil
+}
+
+func (m Model) defaultTemplate() ([]byte, error) {
+
 	switch m.ID {
 	case "article":
-		f.Write([]byte(ArticleTemplate))
+		return []byte(ArticleTemplate), nil
 	case "category":
-		f.Write([]byte(CategoryTemplate))
+		return []byte(CategoryTemplate), nil
 	case "profile":
-		f.Write([]byte(ProfileTemplate))
+		return []byte(ProfileTemplate), nil
 	case "page":
-		f.Write([]byte(PageTemplate))
+		return []byte(PageTemplate), nil
 	default:
-		return fmt.Errorf("generator doesn't support %s yet", m.ID)
+		return []byte{}, fmt.Errorf("generator doesn't support %s yet", m.ID)
 	}
-
-	return nil
 }
 
 // baseModel defines fields used by all drb

blox/profile.cue

@@ -1,5 +1,5 @@
 {
-	first_name: "David" | "Brian"
+	first_name: string
 	last_name:  string
 	age?:       int
 	company?:   string

blox/schema.go

@@ -2,7 +2,6 @@ package blox
 
 import (
 	_ "embed"
-	"fmt"
 	"io/ioutil"
 	"path/filepath"
 	"strings"
@@ -65,7 +64,6 @@ func FromYAML(path string, modelName string, cue string) (map[string]interface{}
 	slug := strings.Replace(filepath.Base(path), ext, "", -1)
 
 	model["id"] = slug
-	fmt.Printf("Model %s '%s' validated successfully\n", modelName, model["id"])
 
 	return model, nil
 }

cmd/build.go

@@ -21,6 +21,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 
 	"github.com/devrel-blox/drb/blox"
 	"github.com/devrel-blox/drb/config"
@@ -40,6 +41,7 @@ to quickly create a Cobra application.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		cfg, err := config.Load()
 		cobra.CheckErr(err)
+		fmt.Println("Preparing data output...")
 
 		// convert markdown to yaml
 		cobra.CheckErr(convertModels(cfg))
@@ -61,16 +63,17 @@ to quickly create a Cobra application.`,
 		_, err = f.Write(bb)
 		cobra.CheckErr(err)
 
-		fmt.Printf("output data to %s\n", path.Join(cfg.Base, cfg.Destination, "data.json"))
+		fmt.Printf("wrote: %s\n", path.Join(cfg.Base, cfg.Destination, "data.json"))
 	},
 }
 
 func aggregateModels(cfg *config.BloxConfig) (map[string][]interface{}, error) {
 	data := make(map[string][]interface{})
+	fmt.Printf("Loading YAML files...\n")
 
 	for _, model := range blox.Models {
 		// Attempt to decode all the YAML files with this directory as model
-		fmt.Printf("Loading %s YAML files in %s\n", model.ID, path.Join(cfg.Base, cfg.Destination, model.Folder))
+		fmt.Printf("\t model %s: \n\t\tsource: %s\n", model.ID, path.Join(cfg.Base, cfg.Destination, model.Folder))
 
 		filepath.Walk(path.Join(cfg.Base, cfg.Destination, model.Folder),
 			func(path string, info os.FileInfo, err error) error {
@@ -84,6 +87,7 @@ func aggregateModels(cfg *config.BloxConfig) (map[string][]interface{}, error) {
 				}
 
 				ext := filepath.Ext(path)
+				slug := strings.Replace(filepath.Base(path), ext, "", -1)
 
 				// if ext != cfg.DefaultExtension {
 				// Should be SupportedExtensions?
@@ -101,6 +105,7 @@ func aggregateModels(cfg *config.BloxConfig) (map[string][]interface{}, error) {
 					return err
 				}
 				data[model.Folder] = append(data[model.ID], entity)
+				fmt.Printf("\t\t\t%s '%s' loaded\n", model.ID, slug)
 
 				return nil
 

cmd/convert.go

@@ -49,10 +49,11 @@ to quickly create a Cobra application.`,
 
 func convertModels(cfg *config.BloxConfig) error {
 	var errors error
+	fmt.Printf("Reading Markdown files...\n")
 
 	for _, model := range blox.Models {
 		// Attempt to decode all the YAML files with this directory as model
-		fmt.Printf("Checking for %s markdown files in %s\n", model.ID, path.Join(cfg.Base, cfg.Source, model.Folder))
+		fmt.Printf("\tmodel: %s \n\t\tsource: %s\n", model.Name, path.Join(cfg.Base, cfg.Source, model.Folder))
 
 		filepath.Walk(path.Join(cfg.Base, cfg.Source, model.Folder),
 			func(path string, info os.FileInfo, err error) error {
@@ -112,7 +113,7 @@ func convertModels(cfg *config.BloxConfig) error {
 
 				*/
 
-				fmt.Println(fmt.Sprintf("Markdown file '%s' converted", slug))
+				fmt.Printf("\t\t\t%s '%s' converted\n", model.ID, slug)
 
 				return nil
 

cmd/validate.go

@@ -20,6 +20,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 
 	"github.com/devrel-blox/drb/blox"
 	"github.com/devrel-blox/drb/config"
@@ -46,11 +47,13 @@ to quickly create a Cobra application.`,
 
 func validateModels(cfg *config.BloxConfig) error {
 	var errors error
+	fmt.Printf("Validating YAML files...\n")
 
 	// We want to validate all the YAML for the models that we're aware of.
 	for _, model := range blox.Models {
 		// Attempt to decode all the YAML files with this directory as model
-		fmt.Printf("Validating %s YAML files in %s\n", model.ID, path.Join(cfg.Base, cfg.Destination, model.Folder))
+
+		fmt.Printf("\t model: %s\n\t\t in: %s\n", model.ID, path.Join(cfg.Base, cfg.Destination, model.Folder))
 
 		filepath.Walk(path.Join(cfg.Base, cfg.Destination, model.Folder),
 			func(path string, info os.FileInfo, err error) error {
@@ -64,7 +67,7 @@ func validateModels(cfg *config.BloxConfig) error {
 				}
 
 				ext := filepath.Ext(path)
-
+				slug := strings.Replace(filepath.Base(path), ext, "", -1)
 				// if ext != cfg.DefaultExtension {
 				// Should be SupportedExtensions?
 				if ext != ".yaml" && ext != ".yml" {
@@ -81,6 +84,7 @@ func validateModels(cfg *config.BloxConfig) error {
 					errors = multierror.Append(errors, multierror.Prefix(err, path))
 					return err
 				}
+				fmt.Printf("\t\t\t%s '%s' validated\n", model.ID, slug)
 
 				return err