Add extend option for local and global configuration

Author: kriskbx

include/file-config.js

@@ -4,7 +4,6 @@ const config = require('./config');
 const yaml = require('read-yaml');
 const hash = require('hash-sum');
 const Fs = require('./filesystem');
-const extend = require('util')._extend;
 
 /**
  * file config with local and global configuration files
@@ -46,9 +45,20 @@ class fileConfig extends config {
      */
     parseLocal() {
         try {
-            let global = this.parseGlobal();
-            let local = yaml.sync(this.local, {});
-            return extend(global, local);
+            let local = Object.assign({extend: true}, yaml.sync(this.local, {}));
+
+            if (local.extend === true) {
+                local = Object.assign(this.parseGlobal(), local);
+            } else if (local.extend) {
+                try {
+                    local = Object.assign(yaml.sync(local.extend, {}), local);
+                } catch (e) {
+                    console.log(`Error parsing configuration: "${local.extend}"`);
+                    process.exit(1);
+                }
+            }
+
+            return local;
         } catch (e) {
             console.log(`Error parsing configuration: "${this.local}"`);
             process.exit(1);

readme.md

@@ -141,9 +141,9 @@ gtt config
 gtt config --local
 ```
 
-If a local configuration file is present it's used instead of the global one.
-So you can use gtt on a per project basis. Make sure to add .gtt.yml to your 
-gitignore file if using a local configuration.
+If a local configuration file is present it will extend of the global one and overwrites global settings.
+If you don't want to extend the global configuration file, set the `extend` option in your local config to `false`.
+So you can use gtt easily on a per project basis. Make sure to add .gtt.yml to your gitignore file if using a local configuration.
 
 ### II) time tracking
 
@@ -576,6 +576,12 @@ _parallel: 20
 # Change rows per page (max. 100)
 # defaults to 100
 _perPage: 100
+
+# Only works if using a local configuration file!
+# Extend the global configuration if set to true, pass a string to extend 
+# the configuration file stored at the given path
+# defaults to true
+extend: true
 ```
 
 ### Time format