Merge pull request #4 from travbale/main

feat: add template registry for handling template files

Author: neptship

cmd/add.go

@@ -2,10 +2,11 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/neptunsk1y/ignore/version"
-	"github.com/spf13/cobra"
 	"log"
 	"os"
+
+	"github.com/neptunsk1y/ignore/internal/ignore"
+	"github.com/spf13/cobra"
 )
 
 var addCommand = &cobra.Command{
@@ -21,35 +22,24 @@ var addCommand = &cobra.Command{
 				log.Fatal("Error:", err)
 			}
 		}
-		dirname, err := os.UserHomeDir()
-		if err != nil {
-			log.Fatal(err)
-		}
-		_, err = version.Latest()
-		if err != nil {
-			fmt.Println("Error version check")
-		}
-		pathTemplateFile := dirname + "/go/pkg/mod/github.com/neptunsk1y/ignore@v" + version.Version + "/templates/" + args[1] + ".gitignore"
-		if _, err = os.Stat(pathTemplateFile); err != nil {
-			if os.IsNotExist(err) {
-				log.Fatal("The template does not exist")
-			} else {
-				log.Fatal("Error:", err)
-			}
-		}
-		templateFile, err := os.ReadFile(pathTemplateFile)
-		if err != nil {
-			log.Fatal("Error reading the file")
+
+		tr := ignore.NewTemplateRegistry()
+		template := args[1]
+		if !tr.HasTemplate(template) {
+			log.Fatal("template does not exist")
 		}
+
 		file, err := os.OpenFile(pathFile, os.O_APPEND|os.O_WRONLY, 0666)
 		if err != nil {
 			log.Fatal(err)
 		}
 		defer file.Close()
-		if _, err := file.WriteString("\n" + string(templateFile)); err != nil {
+
+		err = tr.CopyTemplate(template, file)
+		if err != nil {
 			log.Fatal(err)
 		}
-		fmt.Println(args[1] + " template has been added to ." + args[0] + "ignore")
+		fmt.Printf("%s template has been added to .%signore\n", template, args[0])
 	},
 }
 

cmd/list.go

@@ -2,21 +2,19 @@ package cmd
 
 import (
 	"fmt"
+
+	"github.com/neptunsk1y/ignore/internal/ignore"
 	"github.com/spf13/cobra"
-	"log"
-	"os"
 )
 
 var listCommand = &cobra.Command{
 	Use:   "list",
 	Short: "available templates for .ignore files",
 	Run: func(cmd *cobra.Command, args []string) {
-		files, err := os.ReadDir("templates/")
-		if err != nil {
-			log.Fatal(err)
-		}
-		for _, file := range files {
-			fmt.Printf("%s  ", file.Name()[:len(file.Name())-10])
+		tr := ignore.NewTemplateRegistry()
+		templates := tr.List()
+		for _, template := range templates {
+			fmt.Printf("%s  ", template)
 		}
 	},
 }

internal/ignore/templates.go

@@ -0,0 +1,55 @@
+package ignore
+
+import (
+	"bytes"
+	"embed"
+	"fmt"
+	"io"
+	"io/fs"
+	"path/filepath"
+	"strings"
+)
+
+//go:embed templates/*
+var templates embed.FS
+
+// TemplateRegistry is a collection of all ignore templates available for use.
+type TemplateRegistry struct {
+	templates fs.FS
+}
+
+// NewTemplateRegistry creates a new instance of TemplateRegistry.
+func NewTemplateRegistry() *TemplateRegistry {
+	return &TemplateRegistry{templates: templates}
+}
+
+// HasTemplate indicates if the registry contains a spcfic template.
+func (tr *TemplateRegistry) HasTemplate(name string) bool {
+	_, err := fs.Stat(tr.templates, fmt.Sprintf("templates/%s.gitignore", name))
+	return err == nil
+}
+
+// List returns a list of all templates contained in the registry.
+func (tr *TemplateRegistry) List() []string {
+	var templates []string
+	fs.WalkDir(tr.templates, ".", func(path string, d fs.DirEntry, _ error) error {
+		if d.IsDir() {
+			return nil
+		}
+		template := strings.TrimSuffix(filepath.Base(path), ".gitignore")
+		templates = append(templates, template)
+		return nil
+	})
+	return templates
+}
+
+// CopyTemplate copys the contents of a template corresponding to the
+// provided name to the provided writer.
+func (tr *TemplateRegistry) CopyTemplate(name string, dst io.Writer) error {
+	b, err := fs.ReadFile(tr.templates, fmt.Sprintf("templates/%s.gitignore", name))
+	if err != nil {
+		return err
+	}
+	io.Copy(dst, bytes.NewReader(b))
+	return nil
+}