Merge branch 'dev'

Author: dwaring87

README.md

@@ -82,8 +82,10 @@ The main usage of the program:
       removeTags|rmt [index] [tags...]    Remove one or more tags from a Task
       renameList|mvl [oldName] [newName]  Rename a List
       reset                               Reset cached task indices
+      setUrl|su [index] [url]             Set the URL of a Task
       tags|t                              Display all tags
       uncomp|unc [indices...]             Mark one or more Tasks as not complete
+      url [options] [index...]            Display the associated URL of a Task
       whoami                              Display RTM user information
       overdue                             Display incomplete tasks that are overdue
 ```

config.json

@@ -20,7 +20,8 @@
       "3": "cyan"
     },
     "completed": "dim",
-    "notes": "reset",
+    "notes": "yellow",
+    "url": "yellow",
     "tags": "magenta",
     "due": "green"
   },

package.json

@@ -37,8 +37,9 @@
     "copy-paste": "^1.3.0",
     "dateformat": "^3.0.2",
     "deepmerge": "^2.0.1",
+    "opn": "^5.4.0",
     "ora": "^1.3.0",
-    "rtm-api": "^1.0.2",
+    "rtm-api": "^1.3.0",
     "window-size": "^1.1.0"
   },
   "devDependencies": {

src/cli.js

@@ -76,6 +76,12 @@ function setup() {
     }
   });
 
+  // Error on Unknown Command
+  program.on('command:*', function () {
+    console.error('Invalid command: %s\nSee --help for a list of available commands.', program.args.join(' '));
+    process.exit(1);
+  });
+
   // Add Program Commands
   parseCommands();
 
@@ -403,23 +409,17 @@ function parseAliases() {
  */
 function start() {
 
-  // Parse the process arguments
-  program.parse(process.argv);
-
-  // Get parsed command
-  let command = global._program.args[global._program.args.length-1];
-
-  // Start interactive mode if no command
-  if ( command === undefined ) {
+  // Start interactive mode
+  if ( process.argv.length <= 2 ) {
     startInteractive();
   }
 
-  // Unknown Command
-  else if ( typeof command === 'string' ) {
-    log.spinner.error('ERROR: Unknown Command');
-    program.help();
+  // Parse the process arguments
+  else {
+    program.parse(process.argv);
   }
 
+
 }
 
 

src/cmd/add.js

@@ -82,10 +82,10 @@ function _processFinished(count, max) {
  * @private
  */
 function _parseTask(task) {
-  task = task.replace(/p:/g, "!");
-  task = task.replace(/l:/g, "#");
-  task = task.replace(/t:/g, "#");
-  task = task.replace(/due:/g, "^");
+  task = task.replace(/(\s+)p:([0-4]{1})($|[\s\r\n]+)/, " !$2$3").trim();
+  task = task.replace(/(\s+)l:([\w\d]+)/, " #$2").trim();
+  task = task.replace(/(\s+)t:([\w\d]+)/g, " #$2").trim();
+  task = task.replace(/(\s+)due:([\w\d]+)/, " ^$2").trim();
   return task;
 }
 

src/cmd/ls.js

@@ -94,6 +94,12 @@ function action(args, env) {
         // Add the Task Name
         log.style(task.name, namestyle);
 
+        // Print URL Indicator
+        let urlstyle = task.isCompleted ? styles.completed : styles.url;
+        if ( task.url !== undefined ) {
+          log.style('+', urlstyle);
+        }
+
         // Print Note Indicators
         let notestyle = task.isCompleted ? styles.completed : styles.notes;
         for ( let i = 0; i < task.notes.length; i++ ) {

src/cmd/lsd.js

@@ -109,6 +109,12 @@ function action(args, env) {
         log.style(' ');
         log.style(task.name, priStyle);
 
+        // Print URL Indicator
+        let urlstyle = task.isCompleted ? styles.completed : styles.url;
+        if ( task.url !== undefined ) {
+          log.style('+', urlstyle);
+        }
+
         // Print Note Indicators
         let notestyle = task.isCompleted ? styles.completed : styles.notes;
         for ( let i = 0; i < task.notes.length; i++ ) {

src/cmd/lsp.js

@@ -83,6 +83,12 @@ function action(args, env) {
         log.style(' ');
         log.style(task.name, priStyle);
 
+        // Print URL Indicator
+        let urlstyle = task.isCompleted ? styles.completed : styles.url;
+        if ( task.url !== undefined ) {
+          log.style('+', urlstyle);
+        }
+
         // Print Note Indicators
         let notestyle = task.isCompleted ? styles.completed : styles.notes;
         for ( let i = 0; i < task.notes.length; i++ ) {

src/cmd/reset.js

@@ -2,6 +2,7 @@
 
 const log = require('../utils/log.js');
 const config = require('../utils/config.js');
+const parseFilter = require('../utils/filter.js');
 const finish = require('../utils/finish.js');
 
 
@@ -14,7 +15,7 @@ function action(args, env) {
     log.spinner.start("Clearing Task Index Cache...");
     user.clearTaskIndexCache();
     log.spinner.start("Rebuilding Task Index Cache...");
-    user.tasks.get(function(err) {
+    user.tasks.get(parseFilter(), function(err) {
       if ( err ) {
         log.spinner.error("Could not rebuild Task Index Cache");
       }

src/cmd/setUrl.js

@@ -0,0 +1,98 @@
+'use strict';
+
+const log = require('../utils/log.js');
+const config = require('../utils/config.js');
+const prompt = require('../utils/prompt.js');
+const finish = require('../utils/finish.js');
+
+
+/**
+ * This command displays a task url
+ * @param args index
+ * @param env
+ */
+function action(args, env) {
+
+  // Prompt for task
+  if ( args.length < 1 ) {
+    prompt('Task:', 'URL:', _promptFinished);
+  }
+
+  // Use provided args
+  else {
+    _process(args[0], args[1]);
+  }
+
+}
+
+
+/**
+ * Process the returned answers
+ * @private
+ */
+function _promptFinished(answers) {
+  for ( let i = 0; i < answers.length; i++ ) {
+    let answer = answers[i];
+    _process(answer[0], answer[1],i+1, answers.length);
+  }
+}
+
+
+/**
+ * Process the request
+ * @private
+ */
+function _process(index, url, count=1, max=1) {
+
+  // Make sure URL starts with http
+  if ( url === undefined || url === "" || url === " " ) {
+    url = "";
+  }
+  else if ( ! (url.startsWith("http://") || url.startsWith("https://")) ) {
+    url = "http://" + url;
+  }
+
+  // Display info
+  log.spinner.start("Updating Task(s)...");
+
+  // Get User
+  config.user(function(user) {
+
+    // Parse arguments
+    index = parseInt(index.trim());
+
+    // Set URL
+    user.tasks.setURL(index, url, function(err) {
+      if ( err ) {
+        log.spinner.error("Could not set URL for Task #" + index + " (" + err.msg + ")");
+      }
+      _processFinished(count, max);
+    });
+
+  });
+
+}
+
+/**
+ * Request Callback
+ * @private
+ */
+function _processFinished(count, max) {
+  log.spinner.start("Updating Task [" + count + "/" + max + "]...");
+
+  // All tasks returned...
+  if ( count === max ) {
+    log.spinner.stop();
+    return finish();
+  }
+
+
+}
+
+
+module.exports = {
+  command: 'setUrl [index] [url]',
+  alias: 'su',
+  description: 'Set the URL of a Task',
+  action: action
+};