Support templates and Git args in setup

Author: mrexox

internal/log/setup.go

@@ -0,0 +1,10 @@
+package log
+
+import "github.com/charmbracelet/lipgloss"
+
+func LogSetup() {
+	Styled().
+		WithLeftBorder(lipgloss.ThickBorder(), ColorYellow).
+		WithPadding(execLogPadding).
+		Info(Yellow("setup ❯ "))
+}

internal/run/controller/command/build_command.go

@@ -1,11 +1,8 @@
 package command
 
 import (
-	"strconv"
 	"strings"
 
-	"github.com/alessio/shellescape"
-
 	"github.com/evilmartians/lefthook/v2/internal/config"
 	"github.com/evilmartians/lefthook/v2/internal/run/controller/command/replacer"
 	"github.com/evilmartians/lefthook/v2/internal/run/controller/filter"
@@ -86,21 +83,15 @@ func (b *Builder) buildCommand(params *JobParams) ([]string, []string, error) {
 
 // buildReplacer creates the replacer with all supported templates for files and arguments.
 func (b *Builder) buildReplacer(params *JobParams) replacer.Replacer {
-	predefined := make(map[string]string)
-	predefined["{0}"] = strings.Join(b.opts.GitArgs, " ")
-	for i, arg := range b.opts.GitArgs {
-		predefined["{"+strconv.Itoa(i+1)+"}"] = arg
-	}
-	for key, replacement := range b.opts.Templates {
-		predefined["{"+key+"}"] = replacement
-	}
-	predefined["{lefthook_job_name}"] = shellescape.Quote(params.Name)
-
 	if len(b.opts.ForceFiles) > 0 {
-		return replacer.NewMocked(b.opts.ForceFiles, predefined)
+		return replacer.NewMocked(b.opts.ForceFiles).
+			AddTemplates(b.opts.Templates).
+			AddGitArgs(b.opts.GitArgs)
 	}
 
-	return replacer.New(b.git, params.Root, params.FilesCmd, predefined)
+	return replacer.New(b.git, params.Root, params.FilesCmd).
+		AddTemplates(b.opts.Templates).
+		AddGitArgs(b.opts.GitArgs)
 }
 
 func (b *Builder) buildFilter(params *JobParams) *filter.Filter {

internal/run/controller/command/replacer/replacer.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"regexp"
 	"runtime"
+	"strconv"
 	"strings"
 
 	"github.com/alessio/shellescape"
@@ -31,7 +32,6 @@ func New(
 	git *git.Repository,
 	root string,
 	filesCmd string,
-	templates map[string]string,
 ) Replacer {
 	var (
 		staged = git.StagedFiles
@@ -56,11 +56,35 @@ func New(
 			config.SubAllFiles:    all,
 			config.SubFiles:       cmd,
 		},
-		templates: templates,
 	}
 }
 
-func NewMocked(files []string, templates map[string]string) Replacer {
+func (r Replacer) AddTemplates(templates map[string]string) Replacer {
+	if r.templates == nil {
+		r.templates = make(map[string]string)
+	}
+
+	for key, replacement := range templates {
+		r.templates["{"+key+"}"] = replacement
+	}
+
+	return r
+}
+
+func (r Replacer) AddGitArgs(args []string) Replacer {
+	if r.templates == nil {
+		r.templates = make(map[string]string)
+	}
+
+	r.templates["{0}"] = strings.Join(args, " ")
+	for i, arg := range args {
+		r.templates["{"+strconv.Itoa(i+1)+"}"] = arg
+	}
+
+	return r
+}
+
+func NewMocked(files []string) Replacer {
 	forceFilesFn := func() ([]string, error) { return files, nil } //nolint:unparam
 
 	return Replacer{
@@ -71,7 +95,6 @@ func NewMocked(files []string, templates map[string]string) Replacer {
 			config.SubAllFiles:    forceFilesFn,
 			config.SubFiles:       forceFilesFn,
 		},
-		templates: templates,
 	}
 }
 

internal/run/controller/command/replacer/replacer_test.go

@@ -212,9 +212,11 @@ func Test_ReplaceAndSplit_CustomTemplates(t *testing.T) {
 		assert := assert.New(t)
 
 		// Create a replacer with custom templates (note: keys include braces)
-		r := NewMocked([]string{"file1.js"}, map[string]string{
-			"{use-mise}": `eval "$(mise env)"`,
-		})
+		r := NewMocked([]string{"file1.js"}).AddTemplates(
+			map[string]string{
+				"use-mise": `eval "$(mise env)"`,
+			},
+		)
 
 		// Discover templates in the command (use empty filter)
 		emptyFilter := &filter.Filter{}
@@ -233,7 +235,7 @@ func Test_ReplaceAndSplit_CustomTemplates(t *testing.T) {
 		assert := assert.New(t)
 
 		// Create a replacer with a file that needs escaping
-		r := NewMocked([]string{"file with spaces.js"}, map[string]string{})
+		r := NewMocked([]string{"file with spaces.js"})
 
 		// Discover templates in the command (use empty filter)
 		emptyFilter := &filter.Filter{}

internal/run/controller/controller.go

@@ -72,11 +72,9 @@ func (c *Controller) RunHook(ctx context.Context, opts Options, hook *config.Hoo
 		}
 	}
 
-	log.StopSpinner()
-	if err := c.setup(ctx, hook.Setup); err != nil {
+	if err := c.setup(ctx, opts, hook.Setup); err != nil {
 		log.Warnf("Failed to run setup: %s\n", err)
 	}
-	log.StartSpinner()
 
 	if !opts.DisableTTY && !hook.Follow {
 		log.StartSpinner()

internal/run/controller/setup.go

@@ -2,22 +2,42 @@ package controller
 
 import (
 	"context"
+	"os"
 
 	"github.com/evilmartians/lefthook/v2/internal/config"
+	"github.com/evilmartians/lefthook/v2/internal/log"
+	"github.com/evilmartians/lefthook/v2/internal/run/controller/command/replacer"
 	"github.com/evilmartians/lefthook/v2/internal/run/controller/exec"
+	"github.com/evilmartians/lefthook/v2/internal/system"
 )
 
-func (c *Controller) setup(ctx context.Context, setupInstructions []*config.SetupInstruction) error {
+func (c *Controller) setup(
+	ctx context.Context,
+	opts Options,
+	setupInstructions []*config.SetupInstruction,
+) error {
 	if len(setupInstructions) == 0 {
 		return nil
 	}
 
+	log.StopSpinner()
+	defer log.StartSpinner()
+
+	replacer := replacer.New(c.git, "", "").
+		AddTemplates(opts.Templates).
+		AddGitArgs(opts.GitArgs)
+
 	commands := make([]string, 0, len(setupInstructions))
 	for _, instr := range setupInstructions {
-		commands = append(commands, instr.Run)
+		if err := replacer.Discover(instr.Run, nil); err != nil {
+			return err
+		}
+
+		rawCommands, _ := replacer.ReplaceAndSplit(instr.Run, system.MaxCmdLen())
+		commands = append(commands, rawCommands...)
 	}
 
-	return c.run(ctx, "setup", true, exec.Options{
-		Commands: commands,
-	})
+	log.LogSetup()
+
+	return c.executor.Execute(ctx, exec.Options{Commands: commands}, system.NullReader, os.Stdout)
 }