add-extends-option

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master (unreleased)
 
+- [Commit](https://github.com/Arkweid/lefthook/commit/0940b725729788c334bdd1e983f23e3340b1eef0)
+Option `extends` for top level config added. Now you can merge some settings from different places:
+```yml
+extends: $HOME/work/lefthook-extend.yml
+```
+
 - [Commit](https://github.com/Arkweid/lefthook/commit/83cf818106dbf222ea33ba86aafce8f30d7cb5a9)
 Add examples to generated lefthook.yml
 

cmd/root.go

@@ -17,6 +17,7 @@ const (
  rootExecutionRelPath string = "."
  configFileName string = "lefthook"
  configLocalFileName string = "lefthook-local"
+ configExtendsOption string = "extends"
  configExtension string = ".yml"
  defaultFilePermission os.FileMode = 0755
  defaultDirPermission os.FileMode = 0666
@@ -87,6 +88,16 @@ func initConfig() {
  viper.SetConfigName(configLocalFileName)
  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)
+ }
+
  viper.AutomaticEnv()
 }
 
@@ -112,6 +123,14 @@ func check(e error) {
  }
 }
 
+func isConfigExtends() bool {
+ return viper.GetString(configExtendsOption) != ""
+}
+
+func getExtendsPath() string {
+ return viper.GetString(configExtendsOption)
+}
+
 // EnableColors shows is colors supported for current output or not.
 // If `colors` explicitly specified in config, will return this value.
 // Otherwise enabled for TTY and disabled for non-terminal output.

docs/full_guide.md

@@ -218,6 +218,8 @@ If we have a lot of commands and scripts we can tag them and run skip commands w
 For example, if we have `lefthook.yml` like this:
 
 ```yml
+# lefthook.yml
+
 pre-push:
  commands:
  packages-audit:
@@ -241,6 +243,8 @@ pre-push:
 ## Piped option
 If any command in the sequence fails, the other will not be executed.
 ```yml
+# lefthook.yml
+
 database:
  piped: true
  commands:
@@ -252,6 +256,15 @@ database:
  run: rake db:seed
 ```
 
+## Extends option
+If you need to extend config from some another place, just add top level:
+```yml
+# lefthook.yml
+
+extends: $HOME/work/lefthook-extend.yml
+```
+NOTE: File for extend should have name NOT a "lefthook.yml"
+
 ## Referencing commands from lefthook.yml
 
 If you have the following config
@@ -333,6 +346,8 @@ lefthook run lint
 
 ```yml
 # lefthook.yml
+color: false
+extends: $HOME/work/lefthook-extend.yml
 
 pre-commit:
  commands: