array of hints

ShMcK · ShMcK · commit 81f2649a27cc · 2016-02-25T09:08:34.000-08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coderoad-cli",
-  "version": "0.3.13",
+  "version": "0.3.14",
   "description": "Command line interface for CodeRoad. Build project files.",
   "keywords": [
     "coderoad"
@@ -20,7 +20,7 @@
   "dependencies": {
     "chalk": "1.1.1",
     "commander": "2.9.0",
-    "lodash": "4.5.0",
+    "lodash": "4.5.1",
     "prompt": "1.0.0"
   },
   "devDependencies": {
diff --git a/src/build/parser/actions.js b/src/build/parser/actions.js
@@ -17,7 +17,7 @@ function doAction(type, isArray, actionValue, result, line, index) {
     if (!!isArray) {
         var valueList = actionValue.slice(1, -1).split(',');
         valueList.forEach(function (value) {
-            var value = cleanup_1.trimQuotes(value.trim());
+            var value = cleanup_1.trimQuotes(value.trim(), true);
             result.chapters[index.chapter].pages[index.page].tasks[index.task][type].push(value);
         });
     }
diff --git a/src/build/parser/cleanup.js b/src/build/parser/cleanup.js
@@ -6,22 +6,29 @@ function trimLineBreaks(text) {
     return text;
 }
 exports.trimLineBreaks = trimLineBreaks;
-var quotes = ['\'', '"', '`'];
-function trimQuotes(text) {
+var quotes = ['\'', '"'];
+function trimQuotes(text, quotesOnly) {
     if (!!text.match(/^[\r\n]/)) {
         return text;
     }
     else if (!!text.match(/^\s/)) {
-        return trimQuotes(text.slice(1));
+        return trimQuotes(text.slice(1), quotesOnly);
     }
     else if (!!text.match(/\s$/)) {
-        return trimQuotes(text.slice(0, text.length - 1));
+        return trimQuotes(text.slice(0, text.length - 1), quotesOnly);
     }
-    else if (!!text.match(/^`{3}.+`{3}$/m)) {
-        return trimQuotes(text.slice(3, text.length - 3));
+    else if (quotes.indexOf(text.charAt(0)) > -1 &&
+        quotes.indexOf(text.charAt(text.length - 1)) > -1) {
+        return trimQuotes(text.slice(1, text.length - 1), quotesOnly);
     }
-    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 if (!quotesOnly &&
+        !!text.match(/^`{3}.+`{3}$/m)) {
+        return trimQuotes(text.slice(3, text.length - 3), quotesOnly);
+    }
+    else if (!quotesOnly &&
+        text.charAt(0) === '`' &&
+        text.charAt(text.length - 1) === '`') {
+        return trimQuotes(text.slice(1, text.length - 1), quotesOnly);
     }
     else {
         return text;
diff --git a/src/create/setup/package.json b/src/create/setup/package.json
@@ -14,7 +14,7 @@
     "node" : ">=0.10.3"
   },
   "dependencies": {
-    "mocha-coderoad": "^0.3.1"
+    "mocha-coderoad": "^0.4.2"
   },
   "license": "MIT",
   "config": {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ function doAction(type, isArray, actionValue, result, line, index) {`
`17`	`17`	`if (!!isArray) {`
`18`	`18`	`var valueList = actionValue.slice(1, -1).split(',');`
`19`	`19`	`valueList.forEach(function (value) {`
`20`		`- var value = cleanup_1.trimQuotes(value.trim());`
	`20`	`+ var value = cleanup_1.trimQuotes(value.trim(), true);`
`21`	`21`	`result.chapters[index.chapter].pages[index.page].tasks[index.task][type].push(value);`
`22`	`22`	`});`
`23`	`23`	`}`