Merge branch 'attiks-GTT-12'

Author: kriskbx

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:8.2.1-alpine
 
-ENV GTT_VERSION 1.5.5
+ENV GTT_VERSION 1.6.0
 
 RUN yarn global add --prefix /usr/local "gitlab-time-tracker@$GTT_VERSION"
 

gtt.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const version = '1.5.5';
+const version = '1.6.0';
 const program = require('commander');
 
 program

include/file-config.js

@@ -45,7 +45,20 @@ class fileConfig extends config {
      */
     parseLocal() {
         try {
-            return yaml.sync(this.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);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab-time-tracker",
-  "version": "1.5.5",
+  "version": "1.6.0",
   "description": "A command line interface for GitLabs time tracking feature.",
   "bugs": {
     "url": "https://github.com/kriskbx/gitlab-time-tracker/issues"

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

upgrade.md

@@ -1,5 +1,10 @@
 # gtt
 
+### upgrading from < 1.5.* to 1.6.*
+
+Starting with version `1.6` the local configuration file will extend the global configuration by default. If you
+don't want this behaviour, make sure to use `extend: false` in your local config.
+
 ### upgrading from 0.*
 
 I built gtt originally in PHP because I'm a PHP dev and I chose the language I'm most familiar