Restructure packages

command.go → command/command.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"strings"
@@ -10,7 +10,7 @@ type Command struct {
 	Output string
 }
 
-func newCommand(args []string) *Command {
+func NewCommand(args []string) *Command {
 	envs, commandArgs := splitArgsToEnvsAndCommand(args)
 	return &Command{
 		Envs: envs,
@@ -20,12 +20,13 @@ func newCommand(args []string) *Command {
 
 func splitArgsToEnvsAndCommand(args []string) ([]string, []string) {
 	equalNotFound := false
-	return splitStringsInto2(args, func(arg string) bool {
+	var a, b []string
+	for _, arg := range args {
 		if !equalNotFound && strings.Contains(arg, "=") {
-			return true
+			a = append(a, arg)
 		} else {
-			equalNotFound = true
-			return false
+			b = append(b, arg)
 		}
-	})
+	}
+	return a, b
 }

command_test.go → command/command_test.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"fmt"

runner.go → command/runner.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 type Runner interface {
 	Run(c *Command) error

standard_runner.go → command/standard_runner.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"bytes"
@@ -13,7 +13,7 @@ type StandardRunner struct {
 
 var _ Runner = (*StandardRunner)(nil)
 
-func newStandardRunner(debugLog bool) *StandardRunner {
+func NewStandardRunner(debugLog bool) *StandardRunner {
 	return &StandardRunner{
 		debugLog: debugLog,
 	}

tmux_runner.go → command/tmux_runner.go

@@ -1,4 +1,4 @@
-package main
+package command
 
 import (
 	"bytes"
@@ -25,7 +25,7 @@ type TmuxRunner struct {
 
 var _ Runner = (*TmuxRunner)(nil)
 
-func newTmuxRunner(debugLog bool) *TmuxRunner {
+func NewTmuxRunner(debugLog bool) *TmuxRunner {
 	doneStringPrefix := "git-exec-done"
 	return &TmuxRunner{
 		session:        "git-exec-session",

commit_message.go → core/commit_message.go

@@ -1,10 +1,12 @@
-package main
+package core
 
 import (
 	"bytes"
 	"fmt"
 	"strings"
 	"text/template"
+
+	"github.com/akm/git-exec/command"
 )
 
 type commitMessage struct {
@@ -17,7 +19,7 @@ type commitMessage struct {
 	Body     string
 }
 
-func newCommitMessage(command *Command, options *Options) *commitMessage {
+func newCommitMessage(command *command.Command, options *Options) *commitMessage {
 	argParts := make([]string, len(command.Args))
 	for i, arg := range command.Args {
 		if strings.Contains(arg, " ") && !(strings.HasPrefix(arg, "'") && strings.HasSuffix(arg, "'")) {

commit_message_test.go → core/commit_message_test.go

@@ -1,9 +1,11 @@
-package main
+package core
 
 import (
 	"os"
 	"testing"
 
+	"github.com/akm/git-exec/command"
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -87,7 +89,7 @@ func TestCommitMessage(t *testing.T) {
 			getLocation, bkGetLocation = func() (string, error) { return ptn.location, nil }, getLocation
 			defer func() { getLocation = bkGetLocation }()
 
-			command := &Command{Envs: ptn.envs, Args: ptn.args, Output: ptn.output}
+			command := &command.Command{Envs: ptn.envs, Args: ptn.args, Output: ptn.output}
 			commitMsg := newCommitMessage(command, newOptions())
 
 			actual, err := commitMsg.Build()

core/help.go

@@ -0,0 +1,30 @@
+package core
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/akm/git-exec/opts"
+)
+
+func Help() {
+	firstLine := `Usage: git-exec [options ...] [key=value ...] <command> [args ...]`
+	examples := `Examples:
+* Specify environment variables.
+	git exec FOO=fooooo make args1 args2
+
+* Use shell to work with redirect operator.
+	git exec /bin/bash -c 'echo "foo" >> README.md'
+
+* Use interactive mode for command which requires input such as "npx sv create" for SvelteKit.
+	git exec -i npx sv create my-app
+`
+	optionItems, envVarItems := opts.HelpItemsAndEnvVarMappings[Options](defaultOptions, optionTypes)
+
+	options := "Options:\n" + strings.Join(optionItems, "\n")
+	envVars := "Environment variable mapping:\n" + strings.Join(envVarItems, "\n")
+
+	// git-exec は <command>よりも前に 複数のキーと値の組み合わせを指定可能で、
+	// <command> 以後は 複数の引数を指定可能です。
+	fmt.Println(firstLine + "\n\n" + options + "\n\n" + envVars + "\n\n" + examples)
+}

location.go → core/location.go

@@ -1,4 +1,4 @@
-package main
+package core
 
 import (
 	"os"

core/options.go

@@ -0,0 +1,87 @@
+package core
+
+import (
+	"github.com/akm/git-exec/git"
+	"github.com/akm/git-exec/opts"
+)
+
+type Options struct {
+	Help      bool
+	Version   bool
+	Directory string
+	Emoji     string
+	Prompt    string
+	Template  string
+
+	git.GuardOptions
+
+	DebugLog    bool
+	Interactive bool
+}
+
+var defaultOptions = &Options{
+	Help:        false,
+	Version:     false,
+	Directory:   "",
+	Emoji:       "🤖",
+	Prompt:      "$",
+	Template:    `{{.Emoji}} [{{.Location}}] {{.Prompt}} {{.Command}}`,
+	DebugLog:    false,
+	Interactive: false,
+}
+
+var optionTypes = func() []*opts.Definition[Options] {
+	f := opts.NewFactory[Options]("GIT_EXEC_")
+
+	return []*opts.Definition[Options]{
+		f.String("-C", "--directory", "Specify the directory where the command is executed.",
+			func(o *Options) string { return o.Directory },
+			func(o *Options, v string) { o.Directory = v },
+		).WithoutEnv(),
+		f.String("-e", "--emoji", "Specify the emoji used in commit message.",
+			func(o *Options) string { return o.Emoji },
+			func(o *Options, v string) { o.Emoji = v },
+		),
+		f.String("-p", "--prompt", "Specify the prompt used in commit message.",
+			func(o *Options) string { return o.Prompt },
+			func(o *Options, v string) { o.Prompt = v },
+		),
+		f.String("-t", "--template", "Specify the template to build commit message.",
+			func(o *Options) string { return o.Template },
+			func(o *Options, v string) { o.Template = v },
+		),
+
+		f.Bool("", "--skip-guard", "Skip the guard check for uncommitted changes and untracked files before executing command.",
+			func(o *Options) bool { return o.SkipGuard },
+			func(o *Options) { o.SkipGuard = true },
+		),
+		f.Bool("", "--skip-guard-uncommitted-changes", "Skip the guard check for uncommitted changes before executing command.",
+			func(o *Options) bool { return o.SkipGuardUncommittedChanges },
+			func(o *Options) { o.SkipGuardUncommittedChanges = true },
+		),
+		f.Bool("", "--skip-guard-untracked-files", "Skip the guard check for untracked files before executing command.",
+			func(o *Options) bool { return o.SkipGuardUntrackedFiles },
+			func(o *Options) { o.SkipGuardUntrackedFiles = true },
+		),
+
+		f.Bool("-D", "--debug-log", "Output debug log.",
+			func(o *Options) bool { return o.DebugLog },
+			func(o *Options) { o.DebugLog = true },
+		),
+		f.Bool("-i", "--interactive", "Interactive mode for command which requires input. tmux is required to use.",
+			func(o *Options) bool { return o.Interactive },
+			func(o *Options) { o.Interactive = true },
+		),
+
+		f.Bool("-h", "--help", "Show this message.", nil, func(o *Options) { o.Help = true }).WithoutEnv(),
+		f.Bool("-v", "--version", "Show version.", nil, func(o *Options) { o.Version = true }).WithoutEnv(),
+	}
+}()
+
+func newOptions() *Options {
+	return opts.NewOptions(optionTypes, defaultOptions)
+}
+
+func ParseOptions(args []string) (*Options, []string, error) {
+	return opts.Parse(defaultOptions, optionTypes, args...)
+}

options_test.go → core/options_test.go

@@ -1,4 +1,4 @@
-package main
+package core
 
 import (
 	"fmt"
@@ -189,7 +189,7 @@ func TestParseOptions(t *testing.T) {
 				defer func() { os.Setenv(key, envBackup) }()
 			}
 
-			options, commandArgs, err := parseOptions(ptn.args)
+			options, commandArgs, err := ParseOptions(ptn.args)
 			assert.Equal(t, ptn.options, options)
 			assert.Equal(t, ptn.commandArgs, commandArgs)
 			if ptn.error == "" {

core/run.go

@@ -0,0 +1,91 @@
+package core
+
+import (
+	"fmt"
+	"log/slog"
+	"os"
+
+	"github.com/akm/git-exec/command"
+	"github.com/akm/git-exec/git"
+)
+
+func Run(options *Options, commandArgs []string) error {
+	var guardMessage string
+	if guardResult, err := git.Guard(&options.GuardOptions); err != nil {
+		return err
+	} else if guardResult != nil {
+		if guardResult.Skipped {
+			guardMessage = guardResult.Format()
+			fmt.Fprintf(os.Stderr, "Guard skipped: %s\n", guardMessage)
+		} else {
+			return fmt.Errorf("Quit processing because %s", guardResult.Format())
+		}
+	}
+
+	cmd := command.NewCommand(commandArgs)
+	var runner command.Runner
+	if options.Interactive {
+		runner = command.NewTmuxRunner(options.DebugLog)
+	} else {
+		runner = command.NewStandardRunner(options.DebugLog)
+	}
+
+	var commitMessage *commitMessage
+	if err := changeDir((options.Directory), func() error {
+		if err := runner.Run(cmd); err != nil {
+			slog.Error("Command execution failed", "error", err)
+			return fmt.Errorf("Command execution failed: %+v\n%s", err, cmd.Output)
+		}
+		commitMessage = newCommitMessage(cmd, options)
+		return nil
+	}); err != nil {
+		return err
+	}
+
+	if err := git.Add(); err != nil {
+		return err
+	}
+
+	if guardMessage != "" {
+		commitMessage.Body = guardMessage + "\n\n" + commitMessage.Body
+	}
+
+	// 3. "git commit" を以下のオプションと標準力を指定して実行する。
+	msg, err := commitMessage.Build()
+	if err != nil {
+		return fmt.Errorf("Failed to build commit message: %+v", err)
+	}
+
+	if err := git.Commit(msg); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func changeDir(dir string, cb func() error) (rerr error) {
+	if dir == "" {
+		return cb()
+	}
+	var origDir string
+	if dir != "" {
+		{
+			var err error
+			origDir, err = os.Getwd()
+			if err != nil {
+				return fmt.Errorf("Failed to get current directory: %s", err.Error())
+			}
+		}
+		if err := os.Chdir(dir); err != nil {
+			return fmt.Errorf("Failed to change directory: %s", err.Error())
+		}
+	}
+	if origDir != "" {
+		defer func() {
+			if err := os.Chdir(origDir); err != nil {
+				rerr = fmt.Errorf("Failed to change directory: %s", err.Error())
+			}
+		}()
+	}
+	return cb()
+}

add.go → git/add.go

@@ -1,16 +1,16 @@
-package main
+package git
 
 import (
 	"fmt"
 	"os/exec"
 )
 
-func add() error {
-	uncommittedChanges, err := uncommittedChanges()
+func Add() error {
+	uncommittedChanges, err := UncommittedChanges()
 	if err != nil {
 		return fmt.Errorf("git diff failed: %+v", err)
 	}
-	untrackedFiles, err := untrackedFiles()
+	untrackedFiles, err := UntrackedFiles()
 	if err != nil {
 		return fmt.Errorf("git ls-files failed: %+v", err)
 	}