Merge branch 'zealot128-os-gtt-resume'

Author: kriskbx

readme.md

@@ -782,12 +782,6 @@ report.mergeRequests.forEach(mergeRequest => {
 It can include times outside the queried time frame. `spent` on the other hand
 is the total amount of time spent in the given time frame.
 
-#### Why 'total spent' and 'spent' are showing different amounts.
-
-gtt can only track time records from notes/comments. If you start your 
-issue or merge request with `/spend [time]` in its description, gtt won't
-take it into consideration (for now).
-
 ## contributing
 
 I would love to integrate unit testing in this project, but unfortunately my knowledge of 

src/gtt-resume.js

@@ -0,0 +1,24 @@
+const program = require('commander');
+const colors = require('colors');
+const moment = require('moment');
+
+const Config = require('./include/file-config');
+const Cli = require('./include/cli');
+const Tasks = require('./include/tasks');
+
+program
+    .arguments('[project]')
+    .option('--verbose', 'show verbose output')
+    .parse(process.argv);
+
+Cli.verbose = program.verbose;
+
+let config = new Config(process.cwd()).set('project', program.args[0]),
+    tasks = new Tasks(config);
+
+if (!config.get('project'))
+    Cli.error('No project set');
+
+tasks.resume()
+    .then(frame => console.log(`Starting project ${config.get('project').magenta} ${frame.resource.type.blue} ${('#' + frame.resource.id).blue} at ${moment().format('HH:mm').green}`))
+    .catch(error => Cli.error(error));

src/gtt.js

@@ -9,6 +9,7 @@ program
     .command('create [project] [title]', 'start monitoring time for the given project and create a new issue or merge request with the given title')
     .command('status', 'shows if time monitoring is running')
     .command('stop', 'stop monitoring time')
+    .command('resume [project]', 'resume monitoring time for last stopped record')
     .command('cancel', 'cancel and discard active monitoring time')
     .command('log', 'log recorded time records')
     .command('sync', 'sync local time records to GitLab')

src/include/tasks.js

@@ -115,7 +115,7 @@ class tasks {
             resource.createTime(Math.ceil(time))
                 .then(() => resource.getNotes())
                 .then(() => {
-                    if(frame.resource.new) {
+                    if (frame.resource.new) {
                         delete frame.resource.new;
                         frame.resource.id = resource.data.iid;
                     }
@@ -174,6 +174,28 @@ class tasks {
         });
     }
 
+    /**
+     *
+     * @returns {Promise}
+     */
+    resume() {
+        return new Promise((resolve, reject) => {
+            let project = this.config.get('project'),
+                frames = new FrameCollection(this.config);
+
+            if (!project) return reject("No project set.");
+
+            frames
+                .filter(frame => frame.project === project)
+                .sort((a, b) => moment(a.stop).isBefore(moment(b.stop)) ? 1 : -1);
+
+            let last = frames.frames[0];
+            this.start(last.project, last.resource.type, last.resource.id)
+                .then(frame => resolve(frame))
+                .catch(error => reject(error));
+        });
+    }
+
     /**
      *
      * @param project

src/models/frameCollection.js

@@ -18,6 +18,12 @@ class frameCollection extends Base {
                 .filter(frame => frame);
     }
 
+    sort(func) {
+        this.frames.sort(func);
+
+        return this;
+    }
+
     filter(func) {
         let arr = [];
 
@@ -29,9 +35,11 @@ class frameCollection extends Base {
             if (func(frame)) {
                 arr.push(frame);
             }
-
-            this.frames = arr;
         });
+
+        this.frames = arr;
+
+        return this;
     }
 
     forEach(iterator) {