derive git branch name automatically when possible, eat the errors fo…

…r external calls to rely on the locally sourced information when needed

cmd/generate.go

@@ -49,21 +49,21 @@ func GenerateCommand() *cobra.Command {
 
 	var projectName string
 	var githubRepo string
+	var gitBranch string
 
 	if err != nil {
 		log.Println(err)
 	} else {
 		projectName = p.Name
 		githubRepo = p.GithubRepo
+		gitBranch = p.GitBranch
 	}
 
 	path, err := os.Getwd()
 	if err != nil {
 		log.Println(err)
 	}
 
-	var gitBranch string = "main"
-
 	generateCmd.Flags().String("project-name", projectName, "Project and binary name, current folder name by default")
 	generateCmd.Flags().String("github-repo", githubRepo, "Github repo in form user/repo")
 	generateCmd.Flags().String("git-branch", gitBranch, "Git branch to refer in the readme")

internal/project/project.go

@@ -2,6 +2,7 @@ package project
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -13,6 +14,7 @@ import (
 type Project struct {
 	Name       string
 	GithubRepo string
+	GitBranch  string
 }
 
 func ResolveProjectFromCwd() (*Project, error) {
@@ -26,12 +28,19 @@ func ResolveProjectFromCwd() (*Project, error) {
 	currentRepo, err := resolveGitRepo()
 
 	if err != nil {
-		return nil, errors.Wrapf(err, "Failed to resolve github repo")
+		fmt.Fprintln(os.Stderr, "Failed to resolve github repo, it will have to be specified manually")
+	}
+
+	currentBranch, err := resolveGitBranch()
+
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "Failed to resolve current git branch, it will have to be specified manually")
 	}
 
 	return &Project{
 		Name:       cwdFolder,
 		GithubRepo: currentRepo,
+		GitBranch:  currentBranch,
 	}, nil
 }
 
@@ -54,3 +63,21 @@ func resolveGitRepo() (string, error) {
 
 	return repo, nil
 }
+
+func resolveGitBranch() (string, error) {
+	cmd := exec.Command("git", "branch", "--no-color", "--show-current")
+
+	var out bytes.Buffer
+	cmd.Stdout = &out
+
+	err := cmd.Run()
+
+	if err != nil {
+		return "", err
+	}
+
+	branch := out.String()
+	branch = strings.TrimSpace(branch)
+
+	return branch, nil
+}