feature: Support remote scripts

Signed-off-by: Valentin Kiselev <mrexox@evilmartians.com>
evilmartians · Nov 1, 2022 · 95811e7 · 95811e7
1 parent ccb67cc
commit 95811e7
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/internal/config/load.go b/internal/config/load.go
@@ -94,6 +94,7 @@ func mergeAll(fs afero.Fs, path string) (*viper.Viper, error) {
 	return extends, nil
 }
 
+// mergeRemote merges remote config to the current one.
 func mergeRemote(fs afero.Fs, v *viper.Viper) error {
 	var remote Remote
 	err := v.UnmarshalKey("remote", &remote)
@@ -123,7 +124,10 @@ func mergeRemote(fs afero.Fs, v *viper.Viper) error {
 		return nil
 	}
 
-	if err := merge(fs, configPath, v); err != nil {
+	// TODO: Rewrite using common merge()
+	v.SetConfigName("remote")
+	v.SetConfigFile(configPath)
+	if err := v.MergeInConfig(); err != nil {
 		return err
 	}
 
@@ -139,6 +143,7 @@ func extend(fs afero.Fs, v *viper.Viper) error {
 	return nil
 }
 
+// FIXME: Use MergeInConfig because MergeConfigMap destroys scripts names.
 func merge(fs afero.Fs, path string, v *viper.Viper) error {
 	name := strings.TrimSuffix(filepath.Base(path), filepath.Ext(path))
 

diff --git a/internal/git/remote.go b/internal/git/remote.go
@@ -30,6 +30,17 @@ func RemoteFolder(url string) (string, error) {
 	), nil
 }
 
+func (r *Repository) RemoteFolder(url string) string {
+	remotesPath := filepath.Join(r.InfoPath, remotesFolder)
+
+	return filepath.Join(
+		remotesPath,
+		filepath.Base(
+			strings.TrimSuffix(url, filepath.Ext(url)),
+		),
+	)
+}
+
 // SyncRemote clones or pulls the latest changes for a git repository that was
 // specified as a remote config repository. If successful, the path to the root
 // of the repository will be returned.

diff --git a/internal/lefthook/run.go b/internal/lefthook/run.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -70,7 +71,7 @@ func (l *Lefthook) Run(hookName string, gitArgs []string) error {
 	// This line controls updating the git hook if config has changed
 	if err = l.createHooksIfNeeded(cfg, false); err != nil {
 		log.Warn(
-			`⚠️ There was a problem with synchronizing git hooks.
+			`⚠️  There was a problem with synchronizing git hooks.
 Run 'lefthook install' manually.`,
 		)
 	}
@@ -92,11 +93,24 @@ Run 'lefthook install' manually.`,
 	resultChan := make(chan runner.Result, len(hook.Commands)+len(hook.Scripts))
 	run := runner.NewRunner(l.Fs, l.repo, hook, gitArgs, resultChan, logSettings)
 
-	go func() {
-		run.RunAll(
-			hookName,
-			[]string{cfg.SourceDir, cfg.SourceDirLocal},
+	sourceDirs := []string{
+		filepath.Join(l.repo.RootPath, cfg.SourceDir),
+		filepath.Join(l.repo.RootPath, cfg.SourceDirLocal),
+	}
+
+	if cfg.Remote.Configured() {
+		// Apend only source_dir, because source_dir_local doesn't make sense
+		sourceDirs = append(
+			sourceDirs,
+			filepath.Join(
+				l.repo.RemoteFolder(cfg.Remote.GitURL),
+				cfg.SourceDir,
+			),
 		)
+	}
+
+	go func() {
+		run.RunAll(hookName, sourceDirs)
 		close(resultChan)
 	}()
 

diff --git a/internal/lefthook/runner/runner.go b/internal/lefthook/runner/runner.go
@@ -71,7 +71,7 @@ func (r *Runner) RunAll(hookName string, sourceDirs []string) {
 	scriptDirs := make([]string, len(sourceDirs))
 	for _, sourceDir := range sourceDirs {
 		scriptDirs = append(scriptDirs, filepath.Join(
-			r.repo.RootPath, sourceDir, hookName,
+			sourceDir, hookName,
 		))
 	}