Add project argument to resume command. Refactor resume method to be more readable. Add sort method to frameCollection

Author: kriskbx

src/gtt-resume.js

@@ -7,14 +7,17 @@ const Cli = require('./include/cli');
 const Tasks = require('./include/tasks');
 
 program
-  .option('--verbose', 'show verbose output')
-  .parse(process.argv);
+    .arguments('[project]')
+    .option('--verbose', 'show verbose output')
+    .parse(process.argv);
 
 Cli.verbose = program.verbose;
 
-let config = new Config(process.cwd()),
-  tasks = new Tasks(config);
+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}`))

src/gtt.js

@@ -9,7 +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', 'resume monitoring time for last stopped record')
+    .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;
                     }
@@ -178,22 +178,18 @@ class tasks {
      *
      * @returns {Promise}
      */
-   resume() {
+    resume() {
         return new Promise((resolve, reject) => {
-            let project;
-            let frames = new FrameCollection(this.config).frames
-            if (project = this.config.get('project')) {
-              frames = frames.filter(frame => frame.project == project)
-            }
-            const last = frames.filter(frame => frame.stop)
-              .sort((a, b) => -1 * a.stop.localeCompare(b.stop))[0]
-            if (last) {
-              this.start(last.project, last.resource.type, last.resource.id)
-                .then(frames => resolve(frames))
-                .catch(error => reject(error))
-            } else {
-              reject("No recent entry found for project")
-            }
+            let frames = new FrameCollection(this.config);
+
+            frames
+                .filter(frame => frame.project === this.config.get('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));
         });
     }
 

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) {