Merge pull request #126 from Evilweed/feat/multiple-extends

Feature: Ability to use multiple extends

cmd/cmd_test.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"bytes"
 	"os"
 	"path/filepath"
 	"testing"
@@ -33,7 +34,7 @@ func TestInstallCmdExecutor(t *testing.T) {
 		"prepare-commit-msg",
 	}
 
-	files, err := afero.ReadDir(fs,getGitHooksDir())
+	files, err := afero.ReadDir(fs, getGitHooksDir())
 	assert.NoError(t, err)
 
 	actualFiles := []string{}
@@ -89,6 +90,30 @@ func TestAddCmdExecutor(t *testing.T) {
 	assert.Equal(t, expectedDirs, actualDirs, "Haven`t renamed file with .old extension")
 }
 
+func TestExtendsProperty(t *testing.T) {
+	var yamlExample = "extends:"
+	var yamlExampleArray = []byte(yamlExample + "\n- c1.yml\n- c2.yml")
+	var yamlExampleString = []byte(yamlExample + " 'c3.yml'")
+
+	var expectedPathsArray = []string{"c1.yml", "c2.yml"}
+	var expectedPathsString = []string{"c3.yml"}
+	viper.SetConfigType("yaml")
+
+	viper.ReadConfig(bytes.NewBuffer([]byte("")))
+	assert.False(t, isConfigExtends(), "Should not detect extends property")
+
+	viper.ReadConfig(bytes.NewBuffer(yamlExampleString))
+	paths := getExtendsPath()
+
+	assert.True(t, isConfigExtends(), "Should detect extends property")
+	assert.Equal(t, paths, expectedPathsString, "Extends path does not match for string value")
+
+	viper.ReadConfig(bytes.NewBuffer(yamlExampleArray))
+	paths = getExtendsPath()
+	assert.Equal(t, paths, expectedPathsArray, "Extends path does not match for array value")
+
+}
+
 func presetConfig(fs afero.Fs) {
 	viper.SetDefault(configSourceDirKey, ".lefthook")
 

cmd/root.go

@@ -93,13 +93,15 @@ func initConfig() {
 	viper.MergeInConfig()
 
 	if isConfigExtends() {
-		filename := filepath.Base(getExtendsPath())
-		extension := filepath.Ext(getExtendsPath())
-		name := filename[0 : len(filename)-len(extension)]
-		viper.SetConfigName(name)
-		viper.AddConfigPath(filepath.Dir(getExtendsPath()))
-		err := viper.MergeInConfig()
-		check(err)
+		for _, path := range getExtendsPath() {
+			filename := filepath.Base(path)
+			extension := filepath.Ext(path)
+			name := filename[0 : len(filename)-len(extension)]
+			viper.SetConfigName(name)
+			viper.AddConfigPath(filepath.Dir(path))
+			err := viper.MergeInConfig()
+			check(err)
+		}
 	}
 
 	viper.AutomaticEnv()
@@ -133,11 +135,11 @@ func check(e error) {
 }
 
 func isConfigExtends() bool {
-	return viper.GetString(configExtendsOption) != ""
+	return len(viper.GetStringSlice(configExtendsOption)) > 0
 }
 
-func getExtendsPath() string {
-	return viper.GetString(configExtendsOption)
+func getExtendsPath() []string {
+	return viper.GetStringSlice(configExtendsOption)
 }
 
 // EnableColors shows is colors supported for current output or not.

docs/full_guide.md

@@ -261,9 +261,11 @@ If you need to extend config from some another place, just add top level:
 ```yml
 # lefthook.yml
 
-extends: $HOME/work/lefthook-extend.yml
+extends: 
+  - $HOME/work/lefthook-extend.yml
+  - $HOME/work/lefthook-extend-2.yml
 ```
-NOTE: File for extend should have name NOT a "lefthook.yml"
+NOTE: Files for extend should have name NOT a "lefthook.yml" and should be unique.
 
 ## Referencing commands from lefthook.yml