refactor: コミットを実行する処理をsuggest_cmd_serviceに移植

mochi-yu · mochi-yu · commit cf05d15a09f2 · 2023-10-04T17:54:19.000+09:00
diff --git a/cmd/suggest.go b/cmd/suggest.go
@@ -14,7 +14,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/cocoide/commitify/internal/service"
-	"github.com/cocoide/commitify/util"
 )
 
 var (
@@ -69,7 +68,7 @@ func (sm *suggestModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				sm.currentIdx++
 			}
 		case tea.KeyEnter:
-			if err := util.ExecCommitMessage(sm.choices[sm.currentIdx]); err != nil {
+			if err := sm.scs.SubmitCommit(sm.choices[sm.currentIdx]); err != nil {
 				sm.errorMsg = "コミットに失敗: " + err.Error()
 				return sm, tea.Quit
 			}
diff --git a/internal/service/suggest_cmd.go b/internal/service/suggest_cmd.go
@@ -2,6 +2,7 @@ package service
 
 import (
 	"log"
+	"os/exec"
 
 	"github.com/cocoide/commitify/internal/entity"
 	"github.com/cocoide/commitify/internal/gateway"
@@ -42,3 +43,11 @@ func (scs *SuggestCmdService) GenerateCommitMessages() ([]string, error) {
 
 	return scs.ais.FetchCommitMessages(fileDiffStr)
 }
+
+func (scs *SuggestCmdService) SubmitCommit(commitMessage string) error {
+	cmd := exec.Command("git", "commit", "-m", commitMessage)
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/util/exec.go b/util/exec.go

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ import (`
`14`	`14`	`"github.com/spf13/cobra"`
`15`	`15`
`16`	`16`	`"github.com/cocoide/commitify/internal/service"`
`17`		`- "github.com/cocoide/commitify/util"`
`18`	`17`	`)`
`19`	`18`
`20`	`19`	`var (`
`@@ -69,7 +68,7 @@ func (sm *suggestModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {`
`69`	`68`	`sm.currentIdx++`
`70`	`69`	`}`
`71`	`70`	`case tea.KeyEnter:`
`72`		`- if err := util.ExecCommitMessage(sm.choices[sm.currentIdx]); err != nil {`
	`71`	`+ if err := sm.scs.SubmitCommit(sm.choices[sm.currentIdx]); err != nil {`
`73`	`72`	`sm.errorMsg = "コミットに失敗: " + err.Error()`
`74`	`73`	`return sm, tea.Quit`
`75`	`74`	`}`