Merge branch 'master' into dev

Author: koddr

.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
 patreon: koddr
-custom: https://paypal.me/koddr
+custom: ["https://www.producthunt.com/posts/create-go-app", "https://paypal.me/koddr"]

.github/stale.yml

@@ -1,5 +1,5 @@
 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 15
+daysUntilStale: 10
 
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 3
@@ -14,7 +14,7 @@ staleLabel: wontfix
 
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
-  👋 Hello. Is this still relevant? If so, what is blocking it? Is there 
+  👋  Hello. Is this still relevant? If so, what is blocking it? Is there 
   anything you can do to help move it forward? 
 
   > This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. 

LICENSE

@@ -1,4 +1,3 @@
-
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -187,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2019-present Vic Shóstak <[email protected]> (https://shostak.dev)
+   Copyright 2021 Vic Shóstak and Create Go App Contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -1,25 +1,28 @@
-.PHONY: clean test security install build release
+.PHONY: clean lint security critic test install build release
 
 clean:
 	rm -rf ./tmp coverage.out
 
-test: clean
-	go test -coverprofile=coverage.out ./...
-	go tool cover -func=coverage.out
-
 lint:
-	golangci-lint run
+	golangci-lint run ./...
 
 security:
 	gosec -quiet ./...
 
-install: security lint test
+critic:
+	gocritic check -enableAll ./...
+
+test: clean lint security critic
+	go test -coverprofile=coverage.out ./...
+	go tool cover -func=coverage.out
+
+install: test
 	CGO_ENABLED=0 go build -ldflags="-s -w" -o $(GOPATH)/bin/cgapp ./cmd/cgapp/main.go
 
-build: security test
+build: test
 	goreleaser --snapshot --skip-publish --rm-dist
 
-release: security test
+release: test
 	git tag -a $(VERSION) -m "$(VERSION)"
 	goreleaser --snapshot --skip-publish --rm-dist
 

README.md

@@ -4,7 +4,7 @@
 </h1>
 <p align="center">Create a new production-ready project with <b>backend</b> (Golang), <b>frontend</b> (JavaScript, TypeScript)<br/>and <b>deploy automation</b> (Ansible, Docker) by running one CLI command.<br/><br/>Focus on <b>writing</b> code and <b>thinking</b> of business-logic! The CLI will take care of the rest.</p>
 
-<p align="center"><a href="https://github.com/create-go-app/cli/releases" target="_blank"><img src="https://img.shields.io/badge/version-v3.1.2-blue?style=for-the-badge&logo=none" alt="cli version" /></a>&nbsp;<a href="https://pkg.go.dev/github.com/create-go-app/cli/v3?tab=doc" target="_blank"><img src="https://img.shields.io/badge/Go-1.17+-00ADD8?style=for-the-badge&logo=go" alt="go version" /></a>&nbsp;<a href="https://gocover.io/github.com/create-go-app/cli/pkg/cgapp" target="_blank"><img src="https://img.shields.io/badge/Go_Cover-89.2%25-success?style=for-the-badge&logo=none" alt="go cover" /></a>&nbsp;<a href="https://goreportcard.com/report/github.com/create-go-app/cli" target="_blank"><img src="https://img.shields.io/badge/Go_report-A+-success?style=for-the-badge&logo=none" alt="go report" /></a>&nbsp;<img src="https://img.shields.io/badge/license-apache_2.0-red?style=for-the-badge&logo=none" alt="license" /></p>
+<p align="center"><a href="https://github.com/create-go-app/cli/releases" target="_blank"><img src="https://img.shields.io/badge/version-v3.2.1-blue?style=for-the-badge&logo=none" alt="cli version" /></a>&nbsp;<a href="https://pkg.go.dev/github.com/create-go-app/cli/v3?tab=doc" target="_blank"><img src="https://img.shields.io/badge/Go-1.17+-00ADD8?style=for-the-badge&logo=go" alt="go version" /></a>&nbsp;<a href="https://gocover.io/github.com/create-go-app/cli/pkg/cgapp" target="_blank"><img src="https://img.shields.io/badge/Go_Cover-89.2%25-success?style=for-the-badge&logo=none" alt="go cover" /></a>&nbsp;<a href="https://goreportcard.com/report/github.com/create-go-app/cli" target="_blank"><img src="https://img.shields.io/badge/Go_report-A+-success?style=for-the-badge&logo=none" alt="go report" /></a>&nbsp;<img src="https://img.shields.io/badge/license-apache_2.0-red?style=for-the-badge&logo=none" alt="license" /></p>
 
 ## ⚡️ Quick start
 
@@ -15,7 +15,7 @@ First of all, [download](https://golang.org/dl/) and install **Go**. Version `1.
 Installation is done by using the [`go install`](https://golang.org/cmd/go/#hdr-Compile_and_install_packages_and_dependencies) command and rename installed binary in `$GOPATH/bin`:
 
 ```bash
-go install github.com/create-go-app/cli/v3/cmd/cgapp
+go install github.com/create-go-app/cli/v3/cmd/cgapp@latest
 ```
 
 Also, macOS and GNU/Linux users available way to install via [Homebrew](https://brew.sh/):

cmd/create.go

@@ -73,7 +73,7 @@ func runCreateCmd(cmd *cobra.Command, args []string) error {
 		// Define variables for better display.
 		backend = fmt.Sprintf(
 			"github.com/create-go-app/%v-go-template",
-			strings.Replace(createAnswers.Backend, "/", "_", -1),
+			strings.ReplaceAll(createAnswers.Backend, "/", "_"),
 		)
 		frontend = createAnswers.Frontend
 		proxy = createAnswers.Proxy
@@ -208,11 +208,12 @@ func runCreateCmd(cmd *cobra.Command, args []string) error {
 	*/
 
 	// Set unused proxy roles.
-	if proxy == "traefik" || proxy == "traefik-acme-dns" {
+	switch proxy {
+	case "traefik", "traefik-acme-dns":
 		proxyList = []string{"nginx"}
-	} else if proxy == "nginx" {
-		proxyList = []string{"traefik"}
-	} else {
+	case "nginx":
+		proxyList = []string{"nginx"}
+	default:
 		proxyList = []string{"traefik", "nginx"}
 	}
 

cmd/root.go

@@ -6,6 +6,7 @@ package cmd
 
 import (
 	"github.com/AlecAivazis/survey/v2"
+	"github.com/create-go-app/cli/v3/pkg/cgapp"
 	"github.com/create-go-app/cli/v3/pkg/registry"
 	"github.com/spf13/cobra"
 )
@@ -48,6 +49,11 @@ frontend (JavaScript, TypeScript) and deploy automation
 A helpful documentation and next steps -> https://create-go.app/`,
 }
 
+func init() {
+	rootCmd.SetOut(cgapp.Stdout)
+	rootCmd.SetErr(cgapp.Stderr)
+}
+
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {

go.mod

@@ -5,6 +5,7 @@ go 1.17
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.2
 	github.com/go-git/go-git/v5 v5.4.2
+	github.com/mattn/go-colorable v0.1.11
 	github.com/spf13/cobra v1.2.1
 )
 

pkg/cgapp/files.go

@@ -8,7 +8,6 @@ import (
 	"embed"
 	"fmt"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -89,7 +88,7 @@ func GenerateFileFromTemplate(fileName string, variables map[string]interface{})
 	_ = file.Close()
 
 	// Rename output file.
-	newFileName := strings.Replace(fileName, ".tmpl", "", -1)
+	newFileName := strings.ReplaceAll(fileName, ".tmpl", "")
 	if errRename := os.Rename(fileName, newFileName); errRename != nil {
 		return ShowError(errRename.Error())
 	}
@@ -100,7 +99,7 @@ func GenerateFileFromTemplate(fileName string, variables map[string]interface{})
 // MakeFile function for single file create.
 func MakeFile(fileName string, fileData []byte) error {
 	// Write to created file.
-	if err := ioutil.WriteFile(fileName, fileData, 0600); err != nil {
+	if err := os.WriteFile(fileName, fileData, 0o600); err != nil {
 		return err
 	}
 
@@ -110,7 +109,7 @@ func MakeFile(fileName string, fileData []byte) error {
 // MakeFolder function for create folder.
 func MakeFolder(folderName string) error {
 	// Check if folder exists, fail if it does.
-	if err := os.Mkdir(folderName, 0750); err != nil {
+	if err := os.Mkdir(folderName, 0o750); err != nil {
 		return err
 	}
 

pkg/cgapp/files_test.go

@@ -89,7 +89,7 @@ func TestMakeFolder(t *testing.T) {
 		},
 	}
 
-	_ = os.Mkdir("cgapp-project", 0750)
+	_ = os.Mkdir("cgapp-project", 0o750)
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -121,7 +121,7 @@ func TestRemoveFolders(t *testing.T) {
 		},
 	}
 
-	_ = os.MkdirAll("../../tmp/folder-1", 0750)
+	_ = os.MkdirAll("../../tmp/folder-1", 0o750)
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -219,7 +219,7 @@ func TestGenerateFileFromTemplate(t *testing.T) {
 		},
 	}
 
-	_ = os.Mkdir("../../tmp", 0750)
+	_ = os.Mkdir("../../tmp", 0o750)
 	_, _ = os.Create("../../tmp/test.txt")
 
 	for _, tt := range tests {