added another layout, also wrote a class for accessing the folder with layouts

Author: blackmarllborooo

cmd/create-project-struct.go

@@ -1,15 +1,6 @@
 package main
 
-import (
-	"log"
-
-	"github.com/blackmarllboro/create-project-struct/internal/pkg/temp"
-)
-
 func main() {
-	if _, err := temp.GetTemplateByAlias(temp.MAIN); err != nil {
-		log.Println(err)
-	}
 	//logger := log.NewLogger(l.New())
 	//
 	//projName := args.ProjectName{}

internal/app/file/file.go

@@ -8,6 +8,8 @@ import (
 	"github.com/blackmarllboro/create-project-struct/pkg/version"
 )
 
+// TODO need to works on layouts.
+
 type File struct{}
 
 func NewFile() *File {

internal/pkg/args/tests/args_test.go renamed to internal/pkg/args/args_test.go

@@ -1,14 +1,12 @@
-package tests
+package args
 
 import (
 	"os"
 	"testing"
-
-	"github.com/blackmarllboro/create-project-struct/internal/pkg/args"
 )
 
 func TestGetProjectName(t *testing.T) {
-	projName := args.ProjectName{}
+	projName := ProjectName{}
 
 	t.Log("no project name provided")
 	{

internal/pkg/args/tests/mocks/GetProjectName.go renamed to internal/pkg/args/mocks/GetProjectName.go

@@ -12,4 +12,4 @@ type IsCurrentDirIsTrue struct{}
 
 func (i IsCurrentDirIsTrue) GetProjectName() (string, bool, error) {
 	return "", true, nil
-}
+}

internal/pkg/git/tests/git_test.go renamed to internal/pkg/git/git_test.go

@@ -1,13 +1,13 @@
-package tests
+package git
 
 import (
 	"fmt"
 	"os"
 	"testing"
 
+	"github.com/blackmarllboro/create-project-struct/internal/pkg/args/mocks"
+
 	"github.com/blackmarllboro/create-project-struct/internal/pkg/args"
-	"github.com/blackmarllboro/create-project-struct/internal/pkg/args/tests/mocks"
-	"github.com/blackmarllboro/create-project-struct/internal/pkg/git"
 )
 
 func TestCreateLocalGitRepository(t *testing.T) {
@@ -44,7 +44,7 @@ func TestCreateLocalGitRepository(t *testing.T) {
 
 			t.Log("create repository in dir: ", dataT.name)
 			{
-				if err := git.CreateLocalGitRepository(dataT.mock); err != nil {
+				if err := CreateLocalGitRepository(dataT.mock); err != nil {
 					t.Fatalf("Expected no error, but got: %s", err)
 				}
 			}

internal/pkg/temp/temp.go

@@ -1,52 +1,64 @@
 package temp
 
 import (
-	"errors"
-	"io/fs"
-	"log"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
 	"path/filepath"
 )
 
 const (
 	MAIN = "main.go"
-	MAKE = "make"
-	LINT = "lint"
+	MAKE = "Makefile"
+	LINT = ".golangci.yml"
 )
 
-// TODO we need to improve performance and fix minor errors.
+type Template struct{}
 
-func GetTemplateByAlias(alias string) (string, error) {
+func NewTemplate() *Template {
+	return &Template{}
+}
+
+func (t Template) GetTemplateByAlias(fileName string) (string, error) {
 	var pathToTemp string
 
-	err := filepath.WalkDir("../../../", func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
+	tempDir, err := t.getTemplateDir()
+	if err != nil {
+		return "", fmt.Errorf("fail to get template dir, err: %v", err)
+	}
+
+	filesInDirectory, err := ioutil.ReadDir(path.Base(tempDir))
+	if err != nil {
+		return "", fmt.Errorf("could not read dir, maybe there are no files threr, err: %v", err)
+	}
 
-		if d.IsDir() && d.Name() == alias {
-			files, err := filepath.Glob(filepath.Join(path, "*"))
-			if err != nil {
-				return err
-			}
-
-			for _, fl := range files {
-				if filepath.Base(fl) == alias {
-					log.Println(filepath.Base(fl))
-					pathToTemp = fl
-				} else {
-					return errors.New("template with such alias does not exist")
-				}
-
-				break
-			}
+	for _, file := range filesInDirectory {
+		if file.Name() == fileName {
+			pathToTemp = filepath.Join(tempDir, file.Name())
 		}
 
-		return nil
-	})
+		break
+	}
+
+	if pathToTemp == "" {
+		return "", fmt.Errorf("file with name \"%s\" not found, err: %v", fileName, err)
+	}
+
+	return pathToTemp, nil
+}
 
+func (Template) getTemplateDir() (string, error) {
+	exePath, err := os.Executable()
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("unable to get path to executable file, err: %v", err)
+	}
+
+	targetDir := filepath.Join(exePath, "template")
+
+	if _, err := os.Stat(targetDir); os.IsNotExist(err) {
+		return "", fmt.Errorf("directory \"%s\" not found, err: %v", targetDir, err)
 	}
 
-	return pathToTemp, err
+	return targetDir, nil
 }

internal/pkg/temp/temp_test.go

@@ -0,0 +1,63 @@
+package temp
+
+import (
+	"testing"
+)
+
+// TODO need to write tests.
+
+func TestTemplate_GetTemplateByAlias(t *testing.T) {
+	type args struct {
+		fileName string
+	}
+
+	tests := []struct {
+		name    string
+		args    args
+		want    string
+		wantErr bool
+	}{
+		{},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t1 *testing.T) {
+			t := Template{}
+			got, err := t.GetTemplateByAlias(tt.args.fileName)
+			if (err != nil) != tt.wantErr {
+				t1.Errorf("GetTemplateByAlias() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t1.Errorf("GetTemplateByAlias() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}
+
+func TestTemplate_getTemplateDir(t *testing.T) {
+	tests := []struct {
+		name    string
+		want    string
+		wantErr bool
+	}{
+		{
+			name:    "test",
+			want:    "test",
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			te := Template{}
+			got, err := te.getTemplateDir()
+			if (err != nil) != tt.wantErr {
+				t.Errorf("getTemplateDir() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if got != tt.want {
+				t.Errorf("getTemplateDir() got = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

template/Makefile

@@ -0,0 +1,19 @@
+PROJECT_NAME = $(project_name)
+PROJECT_PATH = cmd/$(PROJECT_NAME).go
+
+.PHONY:run
+run:
+	go run $(PROJECT_PATH)
+
+.PHONY:build
+build:
+	go build -o bin/$(PROGRAM_NAME) $(PROJECT_PATH)
+
+.PHONY:test
+test:
+	go test ./...
+
+.PHONY:lint
+lint:
+	golangci-lint run
+