fix lint errors && update readme file

Author: blackmarllbor0

README.md

@@ -27,10 +27,14 @@ to be called. For example `cps my-app`.
 
 ### What does this program?
 
-`cps` creates a root project structure, with ready-made 
-templates. It also creates a main package with the template
-output **Hello!** and a **go.mod** file with the project 
-name and your locale language version.
+1. Basic structure taken from the standards;
+2. Layout of the main file;
+3. File `go.mod` with project name;
+4. Makefile with parameters:
+   1. build: builds the application;
+   2. run: start the app in dev mode;
+   3. test: rub all tests;
+   4. lint: checks your project for design errors;
 
 ### What is expected next?
 

internal/app/dir/dir.go

@@ -60,10 +60,8 @@ func (d *Dirs) createProjectDir() error {
 	return nil
 }
 
-// TODO calculated cyclomatic complexity for function createProjectDirs is 13,
-// max is 10.
 func (d *Dirs) createProjectDirs() error {
-	projectDirs := [4]string{cmdDir, pkgDir, internalDir, cfgDir}
+	projectDirs := [3]string{cmdDir, internalDir, cfgDir}
 
 	for i := 0; i < len(projectDirs); i++ {
 		currentDir := projectDirs[i]
@@ -80,32 +78,12 @@ func (d *Dirs) createProjectDirs() error {
 		}
 
 		// depending on the current directory being created, create files or subdirectories.
-		switch currentDir {
-		case cmdDir:
-			if err := d.file.GenerateMainFile(dir + "/" + d.projectName + ".go"); err != nil {
-				return err
-			}
-		case internalDir:
-			if err := d.createInternalSubDir(); err != nil {
-				return err
-			}
-		case cfgDir:
-			if err := d.file.GenerateCfgFile(dir); err != nil {
-				return err
-			}
+		if err := d.createFilesInSubdirs(currentDir, dir); err != nil {
+			return err
 		}
 	}
 
-	currentDir, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-
-	if err := d.file.GenerateGoModFile(currentDir+"/"+d.projectName, d.isCurrentDir); err != nil {
-		return err
-	}
-
-	if err := d.file.GenerateMakefile(d.projectName, d.isCurrentDir); err != nil {
+	if err := d.file.GenerateFilesInMainDir(d.projectName, d.isCurrentDir); err != nil {
 		return err
 	}
 
@@ -132,3 +110,22 @@ func (d *Dirs) createInternalSubDir() error {
 
 	return nil
 }
+
+func (d *Dirs) createFilesInSubdirs(currentDir, dir string) error {
+	switch currentDir {
+	case cmdDir:
+		if err := d.file.GenerateMainFile(dir + fmt.Sprintf("/%s", d.projectName) + ".go"); err != nil {
+			return err
+		}
+	case internalDir:
+		if err := d.createInternalSubDir(); err != nil {
+			return err
+		}
+	case cfgDir:
+		if err := d.file.GenerateCfgFile(dir); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}

internal/app/file/file.go

@@ -84,6 +84,10 @@ func (fl File) GenerateGoModFile(dir string, isCurrentDir bool) error {
 }
 
 func (fl File) GenerateMakefile(projectName string, isCurrentDir bool) error {
+	if !isCurrentDir {
+		projectName = path.Base(projectName)
+	}
+
 	content := fmt.Sprintf(
 		"PROJECT_NAME = %s\n"+
 			"PROJECT_PATH = cmd/$(PROJECT_NAME).go\n\n"+
@@ -107,3 +111,24 @@ func (fl File) GenerateMakefile(projectName string, isCurrentDir bool) error {
 
 	return nil
 }
+
+func (fl File) GenerateFilesInMainDir(projectName string, isCurrentDir bool) error {
+	currentDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	if !isCurrentDir {
+		currentDir += fmt.Sprintf("/%s", projectName)
+	}
+
+	if err := fl.GenerateGoModFile(currentDir, isCurrentDir); err != nil {
+		return err
+	}
+
+	if err := fl.GenerateMakefile(currentDir, isCurrentDir); err != nil {
+		return err
+	}
+
+	return nil
+}