slightly revised the structure, and also added the creation of a local git repository. We need to finalise tests for it

Author: blackmarllbor0

cmd/create-project-struct.go

@@ -2,17 +2,25 @@ package main
 
 import (
 	"github.com/blackmarllboro/create-project-struct/internal/app/dir"
+	"github.com/blackmarllboro/create-project-struct/internal/app/file"
+	"github.com/blackmarllboro/create-project-struct/internal/pkg/args"
+	"github.com/blackmarllboro/create-project-struct/internal/pkg/git"
+	"github.com/blackmarllboro/create-project-struct/internal/pkg/log"
 
-	"github.com/charmbracelet/log"
+	l "github.com/charmbracelet/log"
 )
 
 func main() {
-	logger := log.New()
+	logger := log.NewLogger(l.New())
 
-	project := dir.NewDirs()
+	project := dir.NewDirs(file.NewFile(), args.ProjectName{})
 	if err := project.CreateProject(); err != nil {
 		logger.Error(err)
 	}
 
+	if err := git.CreateLocalGitRepository(args.ProjectName{}); err != nil {
+		logger.Error(err)
+	}
+
 	logger.Info("the project dir has been successfully created")
 }

internal/app/dir/dir.go

@@ -3,11 +3,11 @@ package dir
 import (
 	"errors"
 	"fmt"
+	"github.com/blackmarllboro/create-project-struct/internal/pkg/args"
 	"os"
 	"path"
 
 	"github.com/blackmarllboro/create-project-struct/internal/app/file"
-	"github.com/blackmarllboro/create-project-struct/internal/pkg/args"
 )
 
 const perm = 0755 // Access rights to create folders
@@ -25,10 +25,11 @@ type Dirs struct {
 	projectName  string
 	isCurrentDir bool
 	file         *file.File
+	name         args.GetProjectName
 }
 
-func NewDirs() *Dirs {
-	return &Dirs{file: file.NewFile()}
+func NewDirs(f *file.File, p args.ProjectName) *Dirs {
+	return &Dirs{file: f, name: p}
 }
 
 func (d *Dirs) CreateProject() error {
@@ -44,7 +45,7 @@ func (d *Dirs) CreateProject() error {
 }
 
 func (d *Dirs) createProjectDir() error {
-	projectDir, currentDir, err := args.GetProjectName()
+	projectDir, currentDir, err := d.name.GetProjectName()
 	d.projectName = path.Base(projectDir)
 	d.isCurrentDir = currentDir
 	if err != nil {

internal/pkg/args/args.go

@@ -5,11 +5,13 @@ import (
 	"os"
 )
 
+type ProjectName struct{}
+
 // GetProjectName function for getting the project name. The name is specified
 // via a command line argument. Set the argument "." to create a project in the
 // current directory. Boolean value returns true if the application is created in
 // the current directory.
-func GetProjectName() (string, bool, error) {
+func (p ProjectName) GetProjectName() (string, bool, error) {
 	if len(os.Args) < 2 {
 		return "", false, errors.New("the project name has not been transferred")
 	}

internal/pkg/args/interface.go

@@ -0,0 +1,5 @@
+package args
+
+type GetProjectName interface {
+	GetProjectName() (string, bool, error)
+}

internal/pkg/args/tests/args_test.go

@@ -8,9 +8,11 @@ import (
 )
 
 func TestGetProjectName(t *testing.T) {
+	projName := args.ProjectName{}
+
 	t.Log("no project name provided")
 	{
-		projectName, _, err := args.GetProjectName()
+		projectName, _, err := projName.GetProjectName()
 		if err != nil {
 			t.Fatalf("Expected an error, got nil")
 		}
@@ -23,7 +25,7 @@ func TestGetProjectName(t *testing.T) {
 	t.Log("projectName is \".\"")
 	{
 		os.Args = []string{"cmd", "."}
-		projectName, isCurrentDir, err := args.GetProjectName()
+		projectName, isCurrentDir, err := projName.GetProjectName()
 		if err != nil {
 			t.Fatalf("Expected an error, got nil")
 		}
@@ -46,7 +48,7 @@ func TestGetProjectName(t *testing.T) {
 	{
 		testProjectName := "test_project"
 		os.Args = []string{"cmd", testProjectName}
-		projectName, isCurrentDir, err := args.GetProjectName()
+		projectName, isCurrentDir, err := projName.GetProjectName()
 		if err != nil {
 			t.Fatalf("Expected an error, got nil")
 		}

internal/pkg/git/git.go

@@ -1,12 +1,25 @@
 package git
 
 import (
+	"fmt"
+	"github.com/blackmarllboro/create-project-struct/internal/pkg/args"
+	"os"
 	"os/exec"
 )
 
-func CreateLocalGitRepository() error {
-	cmd := exec.Command("git", "init")
+func CreateLocalGitRepository(projectName args.GetProjectName) error {
+	name, isCurrentDir, err := projectName.GetProjectName()
+	if err != nil {
+		return err
+	}
 
+	if !isCurrentDir {
+		if err := os.Chdir(fmt.Sprintf("./%s", name)); err != nil {
+			return err
+		}
+	}
+
+	cmd := exec.Command("git", "init")
 	if err := cmd.Run(); err != nil {
 		return err
 	}

internal/pkg/git/tests/git_test.go

@@ -0,0 +1,30 @@
+package tests
+
+import (
+	"github.com/blackmarllboro/create-project-struct/internal/pkg/git"
+	"github.com/blackmarllboro/create-project-struct/internal/pkg/git/tests/mock"
+
+	"os"
+	"testing"
+)
+
+// TODO we need to figure out how to create and navigate to the test dirs.
+func TestCreateLocalGitRepository_CurrentDir(t *testing.T) {
+	if err := os.Mkdir(mock.TestDir, 0755); err != nil {
+		t.Fatalf("Failed to create test directory: %v", err)
+	}
+	defer os.RemoveAll(mock.TestDir)
+
+	if err := os.Chdir(mock.TestDir); err != nil {
+		t.Fatalf("Expected no error, but got: %s", err)
+	}
+
+	if err := git.CreateLocalGitRepository(mock.IsCurrentDirIsTrue{}); err != nil {
+		t.Fatalf("Expected no error, but got: %s", err)
+	}
+
+	_, err := os.Stat(mock.TestDir)
+	if os.IsNotExist(err) {
+		t.Fatal(".git directory not found in the expected location")
+	}
+}

internal/pkg/git/tests/mock/name.go

@@ -0,0 +1,15 @@
+package mock
+
+type IsCurrentDirIsFalse struct{}
+
+const TestDir = "test_dir"
+
+func (i IsCurrentDirIsFalse) GetProjectName() (string, bool, error) {
+	return TestDir, false, nil
+}
+
+type IsCurrentDirIsTrue struct{}
+
+func (i IsCurrentDirIsTrue) GetProjectName() (string, bool, error) {
+	return TestDir, false, nil
+}

internal/interfaces.go renamed to internal/pkg/log/interface.go

@@ -1,4 +1,4 @@
-package internal
+package log
 
 type Logger interface {
 	Info(msg interface{}, keyvals ...interface{})

internal/pkg/log/log.go

@@ -0,0 +1,9 @@
+package log
+
+type Log struct {
+	Logger
+}
+
+func NewLogger(logger Logger) *Log {
+	return &Log{Logger: logger}
+}