Refactor template directory initialization checks

pkg/boilr/configuration.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/tmrts/boilr/pkg/util/exit"
 	"github.com/tmrts/boilr/pkg/util/osutil"
-	"github.com/tmrts/boilr/pkg/util/tlog"
 )
 
 const (
@@ -57,6 +56,10 @@ func TemplatePath(name string) (string, error) {
 	return filepath.Join(Configuration.TemplateDirPath, name), nil
 }
 
+func IsTemplateDirInitialized() (bool, error) {
+	return osutil.DirExists(Configuration.TemplateDirPath)
+}
+
 func init() {
 	homeDir := os.Getenv("HOME")
 	if homeDir == "" {
@@ -67,17 +70,6 @@ func init() {
 	Configuration.FilePath = filepath.Join(homeDir, ConfigDirPath, ConfigFileName)
 	Configuration.TemplateDirPath = filepath.Join(homeDir, ConfigDirPath, TemplateDir)
 
-	IsTemplateDirInitialized, err := osutil.DirExists(Configuration.TemplateDirPath)
-	if err != nil {
-		exit.Error(err)
-	}
-
-	// TODO perform this in related commands only with ValidateInitialization
-	if !IsTemplateDirInitialized {
-		tlog.Warn("Template registry is not initialized. Please run `init` command to create it.")
-		return
-	}
-
 	// Read .config/boilr/config.json if exists
 	// TODO use defaults if config.json doesn't exist
 	hasConfig, err := osutil.FileExists(Configuration.FilePath)

pkg/cmd/delete.go

@@ -20,6 +20,8 @@ var Delete = &cli.Command{
 	Run: func(c *cli.Command, args []string) {
 		MustValidateVarArgs(args, validate.Argument{"template-path", validate.Alphanumeric})
 
+		MustValidateTemplateDir()
+
 		for _, templateName := range args {
 			targetDir := filepath.Join(boilr.Configuration.TemplateDirPath, templateName)
 

pkg/cmd/download.go

@@ -103,6 +103,8 @@ var Download = &cli.Command{
 			{"template-tag", validate.Alphanumeric},
 		})
 
+		MustValidateTemplateDir()
+
 		templateURL, templateName := args[0], args[1]
 
 		targetDir, err := boilr.TemplatePath(templateName)

pkg/cmd/list.go

@@ -42,6 +42,8 @@ var List = &cli.Command{
 	Run: func(c *cli.Command, args []string) {
 		MustValidateArgs(args, []validate.Argument{})
 
+		MustValidateTemplateDir()
+
 		templateNames, err := ListTemplates()
 		if err != nil {
 			exit.Error(fmt.Errorf("list: %s", err))

pkg/cmd/must_validate.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/tmrts/boilr/pkg/boilr"
 	"github.com/tmrts/boilr/pkg/cmd/util"
 	"github.com/tmrts/boilr/pkg/util/exit"
 	"github.com/tmrts/boilr/pkg/util/validate"
@@ -37,3 +38,15 @@ func MustValidateTemplate(path string) {
 		exit.Fatal(fmt.Errorf("validate: %s", ErrTemplateInvalid))
 	}
 }
+
+// MustValidateTemplateDir ensures that template directory is initialized.
+func MustValidateTemplateDir() {
+	isInitialized, err := boilr.IsTemplateDirInitialized()
+	if err != nil {
+		exit.Error(err)
+	}
+
+	if !isInitialized {
+		exit.Error(fmt.Errorf("Template registry is not initialized. Please run `init` command to initialize it."))
+	}
+}

pkg/cmd/rename.go

@@ -30,6 +30,8 @@ var Rename = &cli.Command{
 			{"new-template-tag", validate.UnixPath},
 		})
 
+		MustValidateTemplateDir()
+
 		tmplName, newTmplName := args[0], args[1]
 
 		if ok, err := TemplateInRegistry(tmplName); err != nil {

pkg/cmd/save.go

@@ -25,6 +25,8 @@ var Save = &cli.Command{
 			{"template-tag", validate.Alphanumeric},
 		})
 
+		MustValidateTemplateDir()
+
 		tmplDir, templateName := args[0], args[1]
 
 		MustValidateTemplate(tmplDir)

pkg/cmd/use.go

@@ -34,6 +34,8 @@ var Use = &cli.Command{
 			{"target-dir", validate.UnixPath},
 		})
 
+		MustValidateTemplateDir()
+
 		tmplName, targetDir := args[0], args[1]
 
 		if ok, err := TemplateInRegistry(tmplName); err != nil {