Add remove_time_spent command

Author: kriskbx

gtt.js

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

include/config.js

@@ -18,7 +18,7 @@ const defaults = {
     recordColumns: ['user', 'date', 'type', 'iid', 'time'],
     userColumns: false,
     dateFormat: 'DD.MM.YYYY HH:mm:ss',
-    timeFormat: '[%sign][%days>d ][%hours>h ][%minutes>m ][%seconds>s]',
+    timeFormat: Time.defaultTimeFormat,
     output: 'table',
     excludeByLabels: false,
     includeByLabels: false,

models/hasTimes.js

@@ -6,6 +6,7 @@ const Time = require('./time');
 
 const regex = /added (.*) of time spent/i;
 const subRegex = /subtracted (.*) of time spent/i;
+const removeRegex = /Removed time spent/i;
 
 /**
  * base model for models that have times
@@ -53,8 +54,14 @@ class hasTimes extends Base {
         let timeSpent = 0;
         let timeUsers = {};
 
+        // sort by created at
+        this.notes.sort((a, b) => {
+            if (a.created_at === b.created_at) return 0;
+            return moment(a.created_at).isBefore(b.created_at) ? -1 : 1;
+        });
+
         let promise = this.parallel(this.notes, (note, done) => {
-            let created = moment(note.created_at), match, subMatch;
+            let created = moment(note.created_at), match, subMatch, removeMatch;
 
             if (
                 // filter out user notes
@@ -64,11 +71,13 @@ class hasTimes extends Base {
             // filter out times that are not in the given time frame
             !(created.isSameOrAfter(this.config.get('from')) && created.isSameOrBefore(this.config.get('to'))) ||
             // filter out notes that are no time things
-            !(match = regex.exec(note.body)) && !(subMatch = subRegex.exec(note.body))
+            !(match = regex.exec(note.body)) && !(subMatch = subRegex.exec(note.body)) && !(removeMatch = removeRegex.exec(note.body))
             ) return done();
 
             if (!timeUsers[note.author.username]) timeUsers[note.author.username] = 0;
-            let time = new Time(match ? match[1] : `-${subMatch[1]}`, note, this, this.config);
+
+            let timeString = match ? match[1] : (subMatch ? `-${subMatch[1]}` : `-${Time.toHumanReadable(timeSpent, this.config.get('hoursPerDay'))}`);
+            let time = new Time(timeString, note, this, this.config);
 
             timeSpent += time.seconds;
             timeUsers[note.author.username] += time.seconds;

models/time.js

@@ -1,6 +1,7 @@
 const _ = require('underscore');
 const moment = require('moment');
 
+const defaultTimeFormat = '[%sign][%days>d ][%hours>h ][%minutes>m ][%seconds>s]';
 const mappings = ['complete', 'sign', 'days', 'hours', 'minutes', 'seconds'];
 const regex = /^(?:([-])\s*)?(?:(\d+)d\s*)?(?:(\d+)h\s*)?(?:(\d+)m\s*)?(?:(\d+)s\s*)?$/;
 const conditionalRegex = /(\[\%([^\>\]]*)\>([^\]]*)\])/ig;
@@ -31,6 +32,10 @@ class time {
     /*
      * properties
      */
+    static get defaultTimeFormat() {
+        return defaultTimeFormat;
+    }
+
     get user() {
         return this.data.author.username;
     }
@@ -51,7 +56,6 @@ class time {
         return time.toHumanReadable(this.seconds, this._hoursPerDay, this._timeFormat);
     }
 
-
     get _timeFormat() {
         return this.config && this.config.get('timeFormat') ? this.config.get('timeFormat') : '';
     }
@@ -85,7 +89,7 @@ class time {
      * @param format
      * @returns {string}
      */
-    static toHumanReadable(input, hoursPerDay = 8, format = '') {
+    static toHumanReadable(input, hoursPerDay = 8, format = time.defaultTimeFormat) {
         let sign = parseInt(input) < 0 ? '-' : '', output = format, match;
         input = Math.abs(input);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab-time-tracker",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A CLI that makes working with GitLabs time tracking feature more enjoyable",
   "main": "gtt.js",
   "scripts": {},