prepare 0.8 release

ShMcK · ShMcK · commit da75146cdf19 · 2016-08-13T15:59:48.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.7.0] - WIP
+## [0.8.0] - 2016-08-13
+- parser fixes and updates
+- sample tutorial updated for mocha-coderoad@0.10
+
+## [0.7.0] - 2016-07-28
 - validate function for package.json & coderoad.json
 - repair README creator on build
 
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # CodeRoad CLI
-Command line interface for [CodeRoad](http://coderoad.github.io). See the [docs](https://coderoad.github.io/docs) for more.
+Command line interface for [CodeRoad](http://coderoad.github.io). See the [docs](https://coderoad.github.io/tutorial-docs.html) for more.
 
 ### Install
 
-Use [CodeRoad CLI](https://github.com/coderoad/coderoad-cli) to setup and build a project data file.
+Use CodeRoad CLI to setup and build a project data file.
 
 Install *CodeRoad-CLI*. Make sure [NodeJS](nodejs.org) is already installed
 
@@ -33,12 +33,13 @@ Running **create** generates:
   "main": "coderoad.json",
   "keywords": ["coderoad", "tutorial"],
   "dependencies": {
-      "mocha-coderoad": "^0.3.1"
+      "mocha-coderoad": "0.10.0"
   },
   "config": {
+      "language": "JS",
       "dir": "tutorial",
       "runner": "mocha-coderoad",
-      "testSuffix": ".spec.js"
+      "testSuffix": ".js"
   }
 }
 ```
@@ -93,8 +94,6 @@ Inside of your demo root directory, connect the link.
 
 Open *Atom-Coderoad* to view your tutorial. Your package should appear as a loaded package. Click on it.
 
-![CodeRoad Loaded Packages](https://coderoad.github.io/img/docs/loaded-packages.png)
-
 Reload *Atom* to view changes. You can use the Atom [command-palette](https://atom.io/docs/latest/getting-started-atom-basics#command-palette) to find "reload" or simply use the reload hot-key.
 
 * Windows & Linux: alt-ctrl-r
diff --git a/lib/build/parser/actions.js b/lib/build/parser/actions.js
@@ -1,40 +1,51 @@
 "use strict";
 var cleanup_1 = require('./cleanup');
 var match_1 = require('./match');
-function doAction(type, isArray, actionValue, result, line, _a) {
-    var page = _a.page, task = _a.task;
+function doAction(_a) {
+    var type = _a.type, isArray = _a.isArray, actionValue = _a.actionValue, result = _a.result, page = _a.page, task = _a.task;
     if (result.pages[page].tasks[task][type] === undefined) {
         result.pages[page].tasks[task][type] = [];
     }
-    var current = result.pages[page].tasks[task][type];
+    var current = new Set(result.pages[page].tasks[task][type]);
     if (!!isArray) {
-        var values_1 = cleanup_1.trimArray(actionValue);
-        values_1.forEach(function (value) {
-            if (current.indexOf(value) === -1 && values_1.indexOf(value) === -1) {
-                result.pages[page].tasks[task][type].push(value);
-            }
+        var values = cleanup_1.trimArray(actionValue);
+        values.forEach(function (v) {
+            current.add(v);
         });
     }
     else {
-        if (current.indexOf(actionValue) === -1) {
-            result.pages[page].tasks[task][type].push(actionValue);
-        }
+        current.add(actionValue);
     }
+    result.pages[page].tasks[task][type] = Array.from(current);
     return result;
 }
-function addToTasks(result, line, index) {
+function addToTasks(_a) {
+    var result = _a.result, line = _a.line, _b = _a.index, page = _b.page, task = _b.task;
     var action = match_1.isAction(line);
-    var page = index.page, task = index.task;
     var currentTask = result.pages[page].tasks[task];
     var trimmedContent = line.slice(action.length + 2, line.length - 1);
     var actionValue = cleanup_1.trimQuotes(trimmedContent);
     var isActionArray = match_1.isArray(cleanup_1.trimQuotes(actionValue));
     switch (action) {
         case 'test':
-            result = doAction('tests', isActionArray, actionValue, result, line, index);
+            result = doAction({
+                type: 'tests',
+                isArray: isActionArray,
+                actionValue: actionValue,
+                result: result,
+                page: page,
+                task: task,
+            });
             break;
         case 'hint':
-            result = doAction('hints', isActionArray, actionValue, result, line, index);
+            result = doAction({
+                type: 'hints',
+                isArray: isActionArray,
+                actionValue: actionValue,
+                result: result,
+                page: page,
+                task: task,
+            });
             break;
         case 'continue':
             break;
@@ -44,8 +55,8 @@ function addToTasks(result, line, index) {
             }
             if (!!isActionArray) {
                 var arrayOfActions = JSON.parse(isActionArray);
-                arrayOfActions.forEach(function (value) {
-                    value = cleanup_1.trimCommandValue(cleanup_1.trimQuotes(value.trim()));
+                arrayOfActions.forEach(function (v) {
+                    var value = cleanup_1.trimCommandValue(cleanup_1.trimQuotes(v.trim()));
                     result.pages[page].tasks[task].actions.push(value);
                 });
             }
diff --git a/lib/build/parser/cleanup.js b/lib/build/parser/cleanup.js
@@ -1,8 +1,14 @@
 "use strict";
 function bracketTracker(line) {
-    var l = (line.match(/\(/g) || []).length;
-    var r = (line.match(/\)/g) || []).length;
-    return l - r;
+    return line.split('').reduce(function (t, c) {
+        switch (c) {
+            case '(':
+                return t + 1;
+            case ')':
+                return t - 1;
+        }
+        return t;
+    }, 0);
 }
 exports.bracketTracker = bracketTracker;
 function trimLineBreaks(text) {
diff --git a/lib/build/parser/task.js b/lib/build/parser/task.js
@@ -42,7 +42,7 @@ function task(_a) {
                 }
                 else {
                     currentAction += line;
-                    result = actions_1.addToTasks(result, currentAction, index);
+                    result = actions_1.addToTasks({ result: result, line: currentAction, index: index });
                     currentAction = null;
                     bracketCount = 0;
                 }
@@ -62,7 +62,7 @@ function task(_a) {
                 currentAction = line;
                 bracketCount = cleanup_1.bracketTracker(line);
                 if (bracketCount === 0) {
-                    result = actions_1.addToTasks(result, currentAction, index);
+                    result = actions_1.addToTasks({ result: result, line: currentAction, index: index });
                     currentAction = null;
                 }
                 continue;
diff --git a/package.json b/package.json
@@ -1,10 +1,14 @@
 {
   "name": "coderoad-cli",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "Command line interface for CodeRoad. Build project files.",
   "keywords": [
     "coderoad"
   ],
+  "homepage": "https://github.com/coderoad/coderoad-cli#readme",
+  "bugs": {
+    "url": "https://github.com/coderoad/coderoad-cli/issues"
+  },
   "license": "ISC",
   "author": "Shawn McKay <shawn.j.mckay@gmail.com>",
   "files": [
@@ -20,22 +24,26 @@
   "directories": {
     "test": "test"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/coderoad/coderoad-cli.git"
+  },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
     "atom-plugin-command-line": "1.0.2",
     "chalk": "1.1.3",
     "commander": "2.9.0",
-    "lodash.kebabcase": "4.0.1",
+    "lodash.kebabcase": "4.1.0",
     "node-file-exists": "1.1.0",
     "prompt": "1.0.0",
     "sort-package-json": "^1.4.0",
     "validate-npm-package-name": "2.2.2"
   },
   "devDependencies": {
     "chai": "3.5.0",
-    "mocha": "2.5.3"
+    "mocha": "3.0.2"
   },
   "preferGlobal": true
 }
diff --git a/setup/tutorial/01/01.js b/setup/tutorial/01/01.js
@@ -1,4 +1,4 @@
-const expect = require('chai').expect;
+const { expect } = require('chai');
 
 const page = require('BASE/page-01.js');
 
diff --git a/src/build/parser/actions.ts b/src/build/parser/actions.ts
@@ -2,8 +2,7 @@ import {trimQuotes, trimCommandValue, trimArray} from './cleanup';
 import {isAction, isArray} from './match';
 
 function doAction({
-  type, isArray, actionValue, result,
-  index: {page, task}
+  type, isArray, actionValue, result, page, task
 }): CR.Output {
   // set to array
   if (result.pages[page].tasks[task][type] === undefined) {
@@ -24,9 +23,8 @@ function doAction({
   return result;
 }
 
-export function addToTasks({ result, line, index }) {
+export function addToTasks({ result, line, index: {page, task} }) {
   let action: CR.TaskAction | string = isAction(line);  // 'action'|'test'|'hint'|'openConsole'
-  const {page, task} = index;
   let currentTask: CR.Task = result.pages[page].tasks[task];
   let trimmedContent: string = line.slice(action.length + 2, line.length - 1); // content between brackets
   let actionValue: string = trimQuotes(trimmedContent);
@@ -38,7 +36,8 @@ export function addToTasks({ result, line, index }) {
         isArray: isActionArray,
         actionValue,
         result,
-        index
+        page,
+        task,
       });
       break;
     case 'hint':
@@ -47,7 +46,8 @@ export function addToTasks({ result, line, index }) {
         isArray: isActionArray,
         actionValue,
         result,
-        index
+        page,
+        task,
       });
       break;
     case 'continue':
diff --git a/src/build/parser/cleanup.ts b/src/build/parser/cleanup.ts
@@ -1,7 +1,13 @@
 export function bracketTracker(line: string): number {
-  let l = (line.match(/\(/g) || []).length;
-  let r = (line.match(/\)/g) || []).length;
-  return l - r;
+  return line.split('').reduce((t, c) => {
+    switch (c) {
+      case '(':
+        return t + 1;
+      case ')':
+        return t - 1;
+    }
+    return t;
+  }, 0);
 }
 
 export function trimLineBreaks(text: string): string {
diff --git a/src/build/parser/task.ts b/src/build/parser/task.ts
@@ -4,9 +4,7 @@ import { addToTasks } from './actions';
 import { trimLeadingSpaces, bracketTracker, trimValue } from './cleanup';
 import { loadImport } from './import';
 
-export function task({
-  dir, result, lines, index
-}) {
+export function task({ dir, result, lines, index }) {
   result.pages[index.page].tasks.push({
     description: trimLeadingSpaces(Match.task(lines[0]))
   });
diff --git a/src/typings/globals.d.ts b/src/typings/globals.d.ts
@@ -16,3 +16,7 @@ interface Validated {
 declare module 'validate-npm-package-name' {
   export default function validateNpm(name: string): Validated;
 }
+
+declare var Set: {
+    new <T>(): Set<T>;
+}
diff --git a/test/build-cleanup.spec.js b/test/build-cleanup.spec.js
diff --git a/test/hint.spec.js b/test/hint.spec.js
diff --git a/test/test.spec.js b/test/test.spec.js

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ function task(_a) {`
`42`	`42`	`}`
`43`	`43`	`else {`
`44`	`44`	`currentAction += line;`
`45`		`- result = actions_1.addToTasks(result, currentAction, index);`
	`45`	`+ result = actions_1.addToTasks({ result: result, line: currentAction, index: index });`
`46`	`46`	`currentAction = null;`
`47`	`47`	`bracketCount = 0;`
`48`	`48`	`}`
`@@ -62,7 +62,7 @@ function task(_a) {`
`62`	`62`	`currentAction = line;`
`63`	`63`	`bracketCount = cleanup_1.bracketTracker(line);`
`64`	`64`	`if (bracketCount === 0) {`
`65`		`- result = actions_1.addToTasks(result, currentAction, index);`
	`65`	`+ result = actions_1.addToTasks({ result: result, line: currentAction, index: index });`
`66`	`66`	`currentAction = null;`
`67`	`67`	`}`
`68`	`68`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const expect = require('chai').expect;`
	`1`	`+const { expect } = require('chai');`
`2`	`2`
`3`	`3`	`const page = require('BASE/page-01.js');`
`4`	`4`