Merge pull request #8 from git-chglog/feat/0.0.3

v0.0.3

Makefile

@@ -11,6 +11,7 @@ clean:
 	rm -rf ./dist/
 	rm -rf ./git-chglog
 	rm -rf $(GOPATH)/bin/git-chglog
+	rm -rf cover.out
 
 .PHONY: bulid
 build:
@@ -20,10 +21,12 @@ build:
 test:
 	go test -v `go list ./... | grep -v /vendor/`
 
+.PHONY: coverage
+coverage:
+	goverage -coverprofile=cover.out `go list ./... | grep -v /vendor/`
+	go tool cover -func=cover.out
+	@rm -rf cover.out
+
 .PHONY: install
 install:
 	go install ./cmd/git-chglog
-
-.PHONY: chglog
-chglog:
-	git-chglog -c ./.chglog/config.yml

cmd/git-chglog/builder.go

@@ -0,0 +1,6 @@
+package main
+
+// Builder ...
+type Builder interface {
+	Build(*Answer) (string, error)
+}

cmd/git-chglog/cli.go

@@ -12,7 +12,7 @@ import (
 
 // CLI ...
 type CLI struct {
-	ctx              *Context
+	ctx              *CLIContext
 	fs               FileSystem
 	logger           *Logger
 	configLoader     ConfigLoader
@@ -22,8 +22,7 @@ type CLI struct {
 
 // NewCLI ...
 func NewCLI(
-	ctx *Context,
-	fs FileSystem,
+	ctx *CLIContext, fs FileSystem,
 	configLoader ConfigLoader,
 	generator Generator,
 ) *CLI {

cmd/git-chglog/cli_test.go

@@ -40,7 +40,7 @@ func TestCLIForStdout(t *testing.T) {
 	}
 
 	c := NewCLI(
-		&Context{
+		&CLIContext{
 			WorkingDir: "/",
 			ConfigPath: "/.chglog/config.yml",
 			OutputPath: "",
@@ -108,7 +108,7 @@ func TestCLIForFile(t *testing.T) {
 	}
 
 	c := NewCLI(
-		&Context{
+		&CLIContext{
 			WorkingDir: "/",
 			ConfigPath: "/.chglog/config.yml",
 			OutputPath: "/dir/to/CHANGELOG.tpl",

cmd/git-chglog/config.go

@@ -70,7 +70,7 @@ type Config struct {
 }
 
 // Normalize ...
-func (config *Config) Normalize(ctx *Context) error {
+func (config *Config) Normalize(ctx *CLIContext) error {
 	err := mergo.Merge(config, &Config{
 		Bin:      "git",
 		Template: "CHANGELOG.tpl.md",
@@ -148,7 +148,7 @@ func (config *Config) normalizeStyleOfGitHub() {
 }
 
 // Convert ...
-func (config *Config) Convert(ctx *Context) *chglog.Config {
+func (config *Config) Convert(ctx *CLIContext) *chglog.Config {
 	info := config.Info
 	opts := config.Options
 

cmd/git-chglog/config_builder.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	"fmt"
+	"strings"
+)
+
+// ConfigBuilder ...
+type ConfigBuilder interface {
+	Builder
+}
+
+type configBuilderImpl struct{}
+
+// NewConfigBuilder ...
+func NewConfigBuilder() ConfigBuilder {
+	return &configBuilderImpl{}
+}
+
+// Build ...
+func (*configBuilderImpl) Build(ans *Answer) (string, error) {
+	var msgFormat *CommitMessageFormat
+
+	for _, f := range formats {
+		if f.Display == ans.CommitMessageFormat {
+			msgFormat = f
+			break
+		}
+	}
+
+	if msgFormat == nil {
+		return "", fmt.Errorf("\"%s\" is an invalid commit message format", ans.CommitMessageFormat)
+	}
+
+	repoURL := strings.TrimRight(ans.RepositoryURL, "/")
+	if repoURL == "" {
+		repoURL = "\"\""
+	}
+
+	config := fmt.Sprintf(`style: %s
+template: %s
+info:
+  title: CHANGELOG
+  repository_url: %s
+options:
+  commits:
+    # filters:
+    #   Type:
+    #     - feat
+    #     - fix
+    #     - perf
+    #     - refactor
+  commit_groups:
+    # title_maps:
+    #   feat: Features
+    #   fix: Bug Fixes
+    #   perf: Performance Improvements
+    #   refactor: Code Refactoring
+  header:
+    pattern: "%s"
+    pattern_maps:%s
+  notes:
+    keywords:
+      - BREAKING CHANGE`,
+		ans.Style,
+		defaultTemplateFilename,
+		repoURL,
+		msgFormat.Pattern,
+		msgFormat.PatternMapString(),
+	)
+
+	return config, nil
+}

cmd/git-chglog/config_builder_mock.go

@@ -0,0 +1,9 @@
+package main
+
+type mockConfigBuilderImpl struct {
+	ReturnBuild func(*Answer) (string, error)
+}
+
+func (m *mockConfigBuilderImpl) Build(ans *Answer) (string, error) {
+	return m.ReturnBuild(ans)
+}

cmd/git-chglog/config_builder_test.go

@@ -0,0 +1,62 @@
+package main
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestConfigBulider(t *testing.T) {
+	assert := assert.New(t)
+	builder := NewConfigBuilder()
+
+	out, err := builder.Build(&Answer{
+		RepositoryURL:       "https://github.com/git-chglog/git-chglog/git-chglog/",
+		Style:               styleNone,
+		CommitMessageFormat: fmtGitBasic.Display,
+		Template:            tplStandard,
+	})
+
+	assert.Nil(err)
+	assert.Contains(out, "style: none")
+	assert.Contains(out, "template: CHANGELOG.tpl.md")
+	assert.Contains(out, "  repository_url: https://github.com/git-chglog/git-chglog/git-chglog")
+	assert.Contains(out, fmt.Sprintf("    pattern: \"%s\"", fmtGitBasic.Pattern))
+	assert.Contains(out, fmt.Sprintf(
+		`    pattern_maps:
+      - %s
+      - %s`,
+		fmtGitBasic.PatternMaps[0],
+		fmtGitBasic.PatternMaps[1],
+	))
+}
+
+func TestConfigBuliderEmptyRepoURL(t *testing.T) {
+	assert := assert.New(t)
+	builder := NewConfigBuilder()
+
+	out, err := builder.Build(&Answer{
+		RepositoryURL:       "",
+		Style:               styleNone,
+		CommitMessageFormat: fmtGitBasic.Display,
+		Template:            tplStandard,
+	})
+
+	assert.Nil(err)
+	assert.Contains(out, "  repository_url: \"\"")
+}
+
+func TestConfigBuliderInvalidFormat(t *testing.T) {
+	assert := assert.New(t)
+	builder := NewConfigBuilder()
+
+	_, err := builder.Build(&Answer{
+		RepositoryURL:       "",
+		Style:               styleNone,
+		CommitMessageFormat: "",
+		Template:            tplStandard,
+	})
+
+	assert.Contains(err.Error(), "invalid commit message format")
+}

cmd/git-chglog/config_test.go

@@ -16,7 +16,7 @@ func TestConfigNormalize(t *testing.T) {
 		},
 	}
 
-	err := config.Normalize(&Context{
+	err := config.Normalize(&CLIContext{
 		ConfigPath: "/test/config.yml",
 	})
 
@@ -30,7 +30,7 @@ func TestConfigNormalize(t *testing.T) {
 		Template: "/CHANGELOG.tpl.md",
 	}
 
-	err = config.Normalize(&Context{
+	err = config.Normalize(&CLIContext{
 		ConfigPath: "/test/config.yml",
 	})
 

cmd/git-chglog/context.go

@@ -4,8 +4,8 @@ import (
 	"io"
 )
 
-// Context ...
-type Context struct {
+// CLIContext ...
+type CLIContext struct {
 	WorkingDir string
 	Stdout     io.Writer
 	Stderr     io.Writer
@@ -16,3 +16,10 @@ type Context struct {
 	NoEmoji    bool
 	Query      string
 }
+
+// InitContext ...
+type InitContext struct {
+	WorkingDir string
+	Stdout     io.Writer
+	Stderr     io.Writer
+}

cmd/git-chglog/fs.go

@@ -2,13 +2,16 @@ package main
 
 import (
 	"io"
+	"io/ioutil"
 	"os"
 )
 
 // FileSystem ...
 type FileSystem interface {
+	Exists(path string) bool
 	MkdirP(path string) error
 	Create(name string) (File, error)
+	WriteFile(path string, content []byte) error
 }
 
 // File ...
@@ -25,6 +28,11 @@ var fs = &osFileSystem{}
 
 type osFileSystem struct{}
 
+func (*osFileSystem) Exists(path string) bool {
+	_, err := os.Stat(path)
+	return err == nil
+}
+
 func (*osFileSystem) MkdirP(path string) error {
 	if _, err := os.Stat(path); os.IsNotExist(err) {
 		return os.MkdirAll(path, os.ModePerm)
@@ -35,3 +43,7 @@ func (*osFileSystem) MkdirP(path string) error {
 func (*osFileSystem) Create(name string) (File, error) {
 	return os.Create(name)
 }
+
+func (*osFileSystem) WriteFile(path string, content []byte) error {
+	return ioutil.WriteFile(path, content, os.ModePerm)
+}

cmd/git-chglog/fs_mock.go

@@ -1,8 +1,14 @@
 package main
 
 type mockFileSystem struct {
-	ReturnMkdirP func(string) error
-	ReturnCreate func(string) (File, error)
+	ReturnExists    func(string) bool
+	ReturnMkdirP    func(string) error
+	ReturnCreate    func(string) (File, error)
+	ReturnWriteFile func(string, []byte) error
+}
+
+func (m *mockFileSystem) Exists(path string) bool {
+	return m.ReturnExists(path)
 }
 
 func (m *mockFileSystem) MkdirP(path string) error {
@@ -13,6 +19,10 @@ func (m *mockFileSystem) Create(name string) (File, error) {
 	return m.ReturnCreate(name)
 }
 
+func (m *mockFileSystem) WriteFile(path string, content []byte) error {
+	return m.ReturnWriteFile(path, content)
+}
+
 type mockFile struct {
 	File
 	ReturnWrite func([]byte) (int, error)