Merge branch 'develop' of https://github.com/cocoide/commitify into develop

Author: {cocoide}

.github/workflows/release.yml

@@ -15,10 +15,6 @@ jobs:
         with:
           fetch-depth: 0 # Changelog を正しく動作させるために必要
 
-      - name: Install GoReleaser and mockgen
-        run: go get github.com/golang/mock/mockgen
-        env:
-          GO111MODULE: on
       # Go をセットアップ
       - uses: actions/setup-go@v3
         with:

Makefile

@@ -1,5 +1,4 @@
 .PHONY: test
 
 test:
-	go generate ./...
 	go test -v ./internal/service

cmd/config.go

@@ -127,17 +127,14 @@ func (cm configModel) View() string {
 	switch cm.configKeySelected {
 	// 設定項目を選んでいない時
 	case false:
-		white := color.New(color.FgWhite).SprintFunc()
-		b.WriteString(white("設定項目を選んでください:\n"))
-		b.WriteString(white("  ↑↓の矢印キーで項目を移動、Enterで選択\n"))
+		b.WriteString(color.WhiteString("設定項目を選んでください:\n"))
+		b.WriteString(color.WhiteString("  ↑↓の矢印キーで項目を移動、Enterで選択\n"))
 
 		for i, choice := range configKey {
-			cyan := color.New(color.FgCyan).SprintFunc()
-			hiCyan := color.New(color.FgHiCyan).SprintFunc()
 			if i == cm.configKeyIndex {
-				b.WriteString(fmt.Sprintf(hiCyan("➡️  %s\n"), choice))
+				b.WriteString(fmt.Sprintf(color.HiCyanString("➡️  %s\n"), choice))
 			} else {
-				b.WriteString(fmt.Sprintf(cyan("    %s\n"), choice))
+				b.WriteString(fmt.Sprintf(color.CyanString("    %s\n"), choice))
 			}
 		}
 
@@ -146,26 +143,22 @@ func (cm configModel) View() string {
 		// 選択肢のない項目はテキストエリアを表示
 		switch len(configOption[cm.configKeyIndex]) {
 		case 0:
-			white := color.New(color.FgWhite).SprintFunc()
-			b.WriteString(white(fmt.Sprintf(
+			b.WriteString(color.WhiteString(fmt.Sprintf(
 				"ここに%sを入力: %s\n",
 				configKey[cm.configKeyIndex],
 				cm.textInput.View(),
 			)))
-			b.WriteString(white("  Enterキーで確定"))
+			b.WriteString(color.WhiteString("  Enterキーで確定"))
 
 		default:
-			white := color.New(color.FgWhite).SprintFunc()
-			b.WriteString(white("設定内容を選んでください:\n"))
-			b.WriteString(white("  ↑↓の矢印キーで項目を移動、Enterで選択\n"))
+			b.WriteString(color.WhiteString("設定内容を選んでください:\n"))
+			b.WriteString(color.WhiteString("  ↑↓の矢印キーで項目を移動、Enterで選択\n"))
 
 			for i, option := range configOptionLabel[cm.configKeyIndex] {
-				cyan := color.New(color.FgCyan).SprintFunc()
-				hiCyan := color.New(color.FgHiCyan).SprintFunc()
 				if i == cm.configOptionIndex {
-					b.WriteString(fmt.Sprintf(hiCyan("➡️  %s\n"), option))
+					b.WriteString(fmt.Sprintf(color.HiCyanString("➡️  %s\n"), option))
 				} else {
-					b.WriteString(fmt.Sprintf(cyan("    %s\n"), option))
+					b.WriteString(fmt.Sprintf(color.CyanString("    %s\n"), option))
 				}
 			}
 		}

cmd/docs.go

@@ -4,8 +4,6 @@ Copyright © 2023 NAME HERE <EMAIL ADDRESS>
 package cmd
 
 import (
-	"fmt"
-
 	"github.com/cocoide/commitify/static"
 	"github.com/fatih/color"
 	"github.com/spf13/cobra"
@@ -17,9 +15,7 @@ var docsCmd = &cobra.Command{
 	Short: "Document of commitify",
 	Run: func(cmd *cobra.Command, args []string) {
 		b, _ := static.Logo.ReadFile("logo.txt")
-		cyan := color.New(color.FgCyan).SprintFunc()
-		logo := cyan(string(b))
-		fmt.Println(logo)
+		color.Cyan(string(b))
 	},
 }
 

cmd/suggest.go

@@ -73,28 +73,23 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 func (m *model) View() string {
 	if m.errorMsg != "" {
-		red := color.New(color.FgRed).SprintFunc()
-		return fmt.Sprintf(red(m.errorMsg))
+		return color.RedString(m.errorMsg)
 	}
 	if m.isLoading {
 		return "🌎 Generating commit messages ..."
 	}
 	var b strings.Builder
 	if m.errorMsg != "" {
-		red := color.New(color.FgRed).SprintFunc()
-		b.WriteString(red(m.errorMsg) + "\n\n")
+		b.WriteString(color.RedString(m.errorMsg) + "\n\n")
 	}
-	white := color.New(color.FgWhite).SprintFunc()
-	b.WriteString(white("🍕Please select an option:"))
-	b.WriteString(white("\n  Use arrow ↑↓ to navigate and press Enter to select.\n\n"))
+	b.WriteString(color.WhiteString("🍕Please select an option:"))
+	b.WriteString(color.WhiteString("\n  Use arrow ↑↓ to navigate and press Enter to select.\n\n"))
 
 	for i, choice := range m.choices {
-		cyan := color.New(color.FgCyan).SprintFunc()
-		hiCyan := color.New(color.FgHiCyan).SprintFunc()
 		if i == m.currentIdx {
-			b.WriteString(fmt.Sprintf(hiCyan("➡️  %s\n"), choice))
+			b.WriteString(fmt.Sprintf(color.HiCyanString("➡️  %s\n"), choice))
 		} else {
-			b.WriteString(fmt.Sprintf(cyan("    %s\n"), choice))
+			b.WriteString(fmt.Sprintf(color.CyanString("    %s\n"), choice))
 		}
 	}
 	return b.String()

internal/gateway/openai.go

@@ -8,7 +8,6 @@ import (
 	"github.com/sashabaranov/go-openai"
 )
 
-//go:generate mockgen -source=openai.go -destination=../../mock/openai.go
 type OpenAIGateway interface {
 	GetAnswerFromPrompt(prompt string, variability float32) (string, error)
 	AsyncGetAnswerFromPrompt(prompt string, variability float32) <-chan string