From 79f1a3690e7d3b4e7a84a325c19a018b67cdd830 Mon Sep 17 00:00:00 2001
From: timoknapp <mail@timoknapp.com>
Date: Tue, 8 Dec 2020 22:09:30 +0100
Subject: [PATCH] chore: now also check for changelog config 'prettify' flag

---
 pkg/generator/changelog_generator.go | 22 +++++++++++++++++++---
 pkg/generator/changelog_types.go     | 24 ++++++++++++------------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkg/generator/changelog_generator.go b/pkg/generator/changelog_generator.go
index 02d6631..0a3b1fe 100644
--- a/pkg/generator/changelog_generator.go
+++ b/pkg/generator/changelog_generator.go
@@ -27,9 +27,21 @@ func formatCommit(c *semrel.Commit) string {
 
 var CGVERSION = "dev"
 
-type DefaultChangelogGenerator struct{}
+type DefaultChangelogGenerator struct {
+	prettifyOutput bool
+}
 
 func (g *DefaultChangelogGenerator) Init(m map[string]string) error {
+	prettifyOutput := false
+
+	prettifyConfig := m["prettify"]
+
+	if prettifyConfig == "true" {
+		prettifyOutput = true
+	}
+
+	g.prettifyOutput = prettifyOutput
+
 	return nil
 }
 
@@ -41,7 +53,7 @@ func (g *DefaultChangelogGenerator) Version() string {
 	return CGVERSION
 }
 
-func (*DefaultChangelogGenerator) Generate(changelogConfig *generator.ChangelogGeneratorConfig) string {
+func (g *DefaultChangelogGenerator) Generate(changelogConfig *generator.ChangelogGeneratorConfig) string {
 	ret := fmt.Sprintf("## %s (%s)\n\n", changelogConfig.NewVersion, time.Now().UTC().Format("2006-01-02"))
 	clTypes := NewChangelogTypes()
 	for _, commit := range changelogConfig.Commits {
@@ -62,7 +74,11 @@ func (*DefaultChangelogGenerator) Generate(changelogConfig *generator.ChangelogG
 		if ct.Content == "" {
 			continue
 		}
-		ret += fmt.Sprintf("#### %s\n\n%s\n", ct.Text, ct.Content)
+		prettifyPrefix := ""
+		if g.prettifyOutput {
+			prettifyPrefix = ct.Emoji
+		}
+		ret += fmt.Sprintf("#### %s%s\n\n%s\n", prettifyPrefix, ct.Text, ct.Content)
 	}
 	return ret
 }
diff --git a/pkg/generator/changelog_types.go b/pkg/generator/changelog_types.go
index 4ea54e7..6c9a6ad 100644
--- a/pkg/generator/changelog_types.go
+++ b/pkg/generator/changelog_types.go
@@ -33,61 +33,61 @@ var defaultTypes = ChangelogTypes{
 	{
 		Type:  "%%bc%%",
 		Text:  "Breaking Changes",
-		Emoji: "📣",
+		Emoji: "📣 ",
 	},
 	{
 		Type:  "feat",
 		Text:  "Feature",
-		Emoji: "🎁",
+		Emoji: "🎁 ",
 	},
 	{
 		Type:  "fix",
 		Text:  "Bug Fixes",
-		Emoji: "🐞",
+		Emoji: "🐞 ",
 	},
 	{
 		Type:  "revert",
 		Text:  "Reverts",
-		Emoji: "🔙",
+		Emoji: "🔙 ",
 	},
 	{
 		Type:  "perf",
 		Text:  "Performance Improvements",
-		Emoji: "📈",
+		Emoji: "📈 ",
 	},
 	{
 		Type:  "docs",
 		Text:  "Documentation",
-		Emoji: "📄",
+		Emoji: "📄 ",
 	},
 	{
 		Type:  "test",
 		Text:  "Tests",
-		Emoji: "🔎",
+		Emoji: "🔎 ",
 	},
 	{
 		Type:  "refactor",
 		Text:  "Code Refactoring",
-		Emoji: "🔀",
+		Emoji: "🔀 ",
 	},
 	{
 		Type:  "style",
 		Text:  "Styles",
-		Emoji: "🎨",
+		Emoji: "🎨 ",
 	},
 	{
 		Type:  "chore",
 		Text:  "Chores",
-		Emoji: "🚧",
+		Emoji: "🚧 ",
 	},
 	{
 		Type:  "build",
 		Text:  "Build",
-		Emoji: "📦",
+		Emoji: "📦 ",
 	},
 	{
 		Type:  "ci",
 		Text:  "CI",
-		Emoji: "🔁",
+		Emoji: "🔁 ",
 	},
 }
-- 
GitLab