fix line breaks in actions

Author: ShMcK

README.md

@@ -31,7 +31,7 @@ Command line interface for [CodeRoad](http://coderoad.github.io).
 ```
   "name": "coderoad-$my-tutorial-name$",
   "main": "coderoad.json",
-  "keywords": ["coderoad"],
+  "keywords": ["coderoad", "tutorial"],
   "coderoad": {
       "testDir": "test",
       "testSuffix": ".spec.js"

cli.js

@@ -10,7 +10,7 @@ var tutorials_1 = require('./src/tutorials/tutorials');
 var publish_1 = require('./src/publish/publish');
 var docs_1 = require('./src/docs/docs');
 program
-    .version('0.3.7')
+    .version('0.3.8')
     .usage('[options] <keywords>')
     .option('-b, --build [path/to/tutorial.md]', 'tutorial markdown file', /^.+\.md$/i)
     .option('-c, --create [name]', 'tutorial name')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coderoad-cli",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Command line interface for CodeRoad. Build project files.",
   "keywords": [
     "coderoad"

src/build/parser/actions.js

@@ -10,19 +10,12 @@ function trimCommandValue(text) {
     return command.action + '(\'' + command.value + '\')';
 }
 exports.trimCommandValue = trimCommandValue;
-function getContentInBrackets(text) {
-    if (text.charAt(0) === '(' && text.charAt(text.length - 1) === ')') {
-        return text.slice(1, text.length - 1);
-    }
-    return '';
-}
 function addToTasks(result, line, index) {
     var match = Match.isAction(line);
     var action = match.action;
     var task = result.chapters[index.chapter].pages[index.page].tasks[index.task];
-    var trimmedAction = getContentInBrackets(match.content);
+    var trimmedAction = line.slice(action.length + 2, line.length - 1);
     var actionValue = cleanup_1.trimQuotes(trimmedAction);
-    3;
     var isActionArray = Match.isArray(cleanup_1.trimQuotes(actionValue));
     switch (action) {
         case 'test':

src/build/parser/brackets.js

@@ -0,0 +1,57 @@
+"use strict";
+exports.Brackets = {
+    trim: function (text) {
+        text = text.trim();
+        var firstBracket = text.charAt(0).match(/["']/);
+        if (firstBracket && !!text.charAt(text.length - 1).match(firstBracket[0])) {
+            text = text.substring(1, text.length - 1);
+        }
+        return text;
+    },
+    addBreak: function (char, index) {
+        switch (char) {
+            case '(':
+                this.round += 1;
+                break;
+            case ')':
+                this.round -= 1;
+                break;
+            case '[':
+                this.square += 1;
+                break;
+            case ']':
+                this.square -= 1;
+                break;
+            case '{':
+                this.curly += 1;
+                break;
+            case '}':
+                this.curly -= 1;
+                break;
+            default:
+                break;
+        }
+        if (char === ',' &&
+            this.round === 0 && this.square === 0 && this.curly === 0) {
+            this.params.push(this.trim(this.current));
+            this.current = '';
+        }
+        else {
+            this.current += char;
+        }
+    },
+    getParams: function (text) {
+        this.reset();
+        for (var i = 0; i < text.length; i++) {
+            this.addBreak(text[i], i);
+        }
+        return this.params.concat(this.trim(this.current));
+    },
+    reset: function () {
+        this.round = 0;
+        this.square = 0;
+        this.curly = 0;
+        this.current = '';
+        this.params = [];
+    }
+};

src/build/parser/cleanup.js

@@ -6,18 +6,19 @@ function trimLineBreaks(text) {
     return text;
 }
 exports.trimLineBreaks = trimLineBreaks;
+var quotes = ['\'', '"', '`'];
 function trimQuotes(text) {
     if (!!text.match(/^\s/)) {
         return trimQuotes(text.slice(1));
     }
-    else if (!!text.match(/\s$/)) {
-        return trimQuotes(text.slice(0, -1));
+    else if (!!text.match(/\s$/m)) {
+        return trimQuotes(text.slice(0, text.length - 1));
     }
-    else if (!!text.match(/^`{3}.+`{3}$/)) {
-        return trimQuotes(text.slice(3, -3));
+    else if (!!text.match(/^`{3}.+`{3}$/m)) {
+        return trimQuotes(text.slice(3, text.length - 3));
     }
-    else if (!!text.match(/^['"`].+['"`]$/)) {
-        return trimQuotes(text.slice(1, -1));
+    else if (quotes.indexOf(text.charAt(0)) > -1 && quotes.indexOf(text.charAt(text.length - 1)) > -1) {
+        return trimQuotes(text.slice(1, text.length - 1));
     }
     else {
         return text;

src/build/parser/match.js

@@ -36,7 +36,7 @@ exports.isArray = function (line) {
     return isMatch ? isMatch[0] : false;
 };
 exports.isAction = function (line) {
-    var match = line.match(/^@(action|test|hint)(.+)$/);
+    var match = line.match(/^@(action|test|hint)/);
     return !!match ? {
         action: match[1],
         content: match[2]

src/build/parser/task.js

@@ -15,7 +15,7 @@ function task(result, lines, index) {
         description: cleanup_1.trimLeadingSpaces(Match.task(lines[0]))
     });
     index.task += 1;
-    var inCodeBlock = false;
+    var inExpCodeBlock = false;
     var currentAction = null;
     var bracketCount = 0;
     var i = 0;
@@ -27,23 +27,25 @@ function task(result, lines, index) {
             lines = import_1.loadImport(lines, importFile);
         }
         else {
-            var finishedAction = (bracketTracker(line) + bracketCount) === 0;
-            if (!!currentAction && !finishedAction) {
-                currentAction += line;
-                bracketCount += bracketTracker(line);
-            }
-            else if (!!currentAction) {
-                currentAction += line;
-                result = actions_1.addToTasks(result, currentAction, index);
-                currentAction = null;
-                bracketCount = 0;
+            if (!!currentAction) {
+                var finishedAction = (bracketTracker(line) + bracketCount) === 0;
+                if (!finishedAction) {
+                    currentAction += line + '\n';
+                    bracketCount += bracketTracker(line);
+                }
+                else {
+                    currentAction += line;
+                    result = actions_1.addToTasks(result, currentAction, index);
+                    currentAction = null;
+                    bracketCount = 0;
+                }
             }
             else {
                 var isAction = Match.isAction(line);
                 if (!isAction && !!Match.codeBlock(line)) {
-                    inCodeBlock = !inCodeBlock;
+                    inExpCodeBlock = !inExpCodeBlock;
                 }
-                if (!inCodeBlock) {
+                if (!inExpCodeBlock) {
                     if (!!isAction) {
                         currentAction = line;
                         bracketCount = bracketTracker(line);