update tutorial create

ShMcK · ShMcK · commit 8086c613c6bd · 2016-02-21T17:25:15.000-08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coderoad-cli",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "description": "Command line interface for CodeRoad. Build project files.",
   "keywords": [
     "coderoad"
@@ -20,8 +20,8 @@
   "dependencies": {
     "chalk": "1.1.1",
     "commander": "2.9.0",
-    "lodash": "4.2.1",
-    "prompt": "^0.2.14"
+    "lodash": "4.5.0",
+    "prompt": "1.0.0"
   },
   "devDependencies": {
     "chai": "3.5.0",
diff --git a/src/create/setup/package.json b/src/create/setup/package.json
@@ -2,15 +2,24 @@
   "name": "coderoad-package-name",
   "version": "0.1.0",
   "description": "Coderoad tutorial",
-  "author": "",
+  "author": "Name <email> (site)",
   "contributers": [],
   "main": "coderoad.json",
+  "files": [
+    "coderoad.json",
+    "tutorial"
+  ],
   "keywords": ["coderoad", "tutorial"],
-  "dependencies": {},
-  "devDependencies": {},
+  "engines": {
+    "node" : ">=0.10.3"
+  },
+  "dependencies": {
+    "mocha-coderoad": "^0.3.1"
+  },
   "license": "MIT",
-  "coderoad": {
+  "config": {
     "testDir": "tutorial",
-    "testSuffix": ".spec.js"
+    "testSuffix": ".spec.js",
+    "testRunner": "mocha-coderoad"
   }
 }
diff --git a/src/create/setup/tutorial/1/01/01.spec.js b/src/create/setup/tutorial/1/01/01.spec.js
@@ -1,23 +1,23 @@
 var expect = require('chai').expect;
-var context = require('test-context');
-var filePath = '../../../example.js';
-context(filePath);
 
-describe('addOne', function() {
+var loadJS = require('./common/loadJS').default;
+loadJS('page-01.js')
+
+describe('01 addOne', function() {
 
   it('doesn\'t exist', function() {
     expect(addOne).to.not.be.undefined;
   });
 
-  it('doesn\'t take any parameters', function() {
-    expect(addOne.length).to.be.above(0);
+  it('should take a parameter', function() {
+    expect(addOne).to.have.length(1);
   });
 
   it('doesn\'t return anything', function() {
     expect(addOne(1)).to.exist;
   });
 
-  it('doesn\'t output a number', function() {
+  it('should output a number', function() {
     expect(addOne(1)).to.be.a('number');
   });
 
diff --git a/src/create/setup/tutorial/1/01/02.spec.js b/src/create/setup/tutorial/1/01/02.spec.js
@@ -0,0 +1,20 @@
+describe('02 subtractOne', function() {
+
+  it('doesn\'t exist', function () {
+    expect(subtractOne).to.not.be.undefined;
+  });
+
+  it('should take a parameter', function() {
+    expect(subtractOne).to.have.length(1);
+  });
+
+  it('should output a number', function () {
+    expect(subtractOne(1)).to.be.a('number');
+  });
+
+  it('doesn\'t subtract 1', function() {
+    expect(subtractOne(1)).to.equal(0);
+    expect(subtractOne(10)).to.equal(9);
+  });
+
+});
diff --git a/src/create/setup/tutorial/1/01/page-one.md b/src/create/setup/tutorial/1/01/page-one.md
@@ -16,7 +16,19 @@ function doSomething(parameter) {
 Try making your own basic functions.
 
 + write a function `addOne` that adds one to a number
-@test('chapter-01/page-01/task-01')
+@test('1/01/01')
+@action(open('page-01.js'))
+@action(set(
+```
+// addOne
+```  
+))
 
 + write a function `subtractOne` that subtracts one from a number
-@test('chapter-01/page-01/task-02')
+@test('1/01/02')
+@action(insert(
+```
+
+// subtractOne
+```  
+))
diff --git a/src/create/setup/tutorial/1/02/01.spec.js b/src/create/setup/tutorial/1/02/01.spec.js
@@ -1,15 +1,17 @@
 var expect = require('chai').expect;
-var context = require('test-context');
-context('../../../example.js');
 
-describe('divideOne', function() {
+var loadJS = require('./common/loadJS').default;
+loadJS('page-02.js')
+
+
+describe('01 divideOne', function() {
 
   it('doesn\'t exist', function () {
     expect(divideOne).to.not.be.undefined;
   });
 
-  it('doesn\'t take any parameters', function() {
-    expect(divideOne.length).to.be.above(0);
+  it('should take a parameter', function() {
+    expect(divideOne).to.have.length(1);
   });
 
   it('doesn\'t output a number', function () {
diff --git a/src/create/setup/tutorial/1/02/02.spec.js b/src/create/setup/tutorial/1/02/02.spec.js
@@ -1,18 +1,14 @@
-var expect = require('chai').expect;
-var context = require('test-context');
-context('../../../example.js');
-
-describe('multiplyOne', function() {
+describe('02 multiplyOne', function() {
 
   it('doesn\'t exist', function () {
     expect(multiplyOne).to.not.be.undefined;
   });
 
-  it('doesn\'t take any parameters', function() {
-    expect(multiplyOne.length).to.be.above(0);
+  it('should take a parameter', function() {
+    expect(multiplyOne).to.have.length(1);
   });
 
-  it('doesn\'t output a number', function () {
+  it('should output a number', function () {
     expect(multiplyOne(1)).to.be.a('number');
   });
 
diff --git a/src/create/setup/tutorial/1/02/page-two.md b/src/create/setup/tutorial/1/02/page-two.md
@@ -4,7 +4,19 @@ Writing basic functions continued.
 We'll write two more basic functions, this time without any help.
 
 + write a function `divideOne` divides a number by 1
-@test('chapter-01/page-02/task-01')
+@test('1/02/01')
+@action(open('page-02.js'))
+@action(set(
+```
+// divideOne
+```  
+))
 
 + write a function `mutiplyone` that multiplies a number by 1
-@test('chapter-01/page-02/task-02')
+@test('1/02/02')
+@action(insert(
+```
+
+// multiplyOne
+```  
+))
diff --git a/src/create/setup/tutorial/chapter-01/page-01/task-02.spec.js b/src/create/setup/tutorial/chapter-01/page-01/task-02.spec.js
diff --git a/src/create/setup/tutorial/common/loadJS.js b/src/create/setup/tutorial/common/loadJS.js
@@ -0,0 +1,11 @@
+"use strict";
+var vm = require('vm');
+var fs = require('fs');
+var path = require('path');
+function loadContext(pathToContext) {
+    var absPath = path.join(process.env.DIR, pathToContext);
+    var context = fs.readFileSync(absPath, 'utf8');
+    vm.runInThisContext(context);
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = loadContext;
diff --git a/src/create/setup/tutorial/tutorial.md b/src/create/setup/tutorial/tutorial.md
@@ -4,6 +4,6 @@ Project description.
 ## Chapter One Title
 Chapter one description.
 
-@import('tutorial/chapter-01/page-01/page-one')
+@import('tutorial/1/01/page-one')
 
-@import('tutorial/chapter-01/page-02/page-two')
+@import('tutorial/1/02/page-two')
diff --git a/src/create/write-demo.js b/src/create/write-demo.js
@@ -17,11 +17,11 @@ function createFolder(pathToFolder) {
 function createTutorialMd() {
     createFolder('tutorial');
     createFile('tutorial/tutorial.md');
-    createFolder('tutorial/chapter-01');
-    createFolder('tutorial/chapter-01/page-01');
-    createFile('tutorial/chapter-01/page-01/page-one.md');
-    createFolder('tutorial/chapter-01/page-02');
-    createFile('tutorial/chapter-01/page-02/page-two.md');
+    createFolder('tutorial/1');
+    createFolder('tutorial/1/01');
+    createFile('tutorial/1/01/page-one.md');
+    createFolder('tutorial/1/02');
+    createFile('tutorial/1/02/page-two.md');
 }
 exports.createTutorialMd = createTutorialMd;
 function createPackageJson(name) {
@@ -35,9 +35,9 @@ function createPackageJson(name) {
 }
 exports.createPackageJson = createPackageJson;
 function createTestFiles() {
-    createFile('tutorial/chapter-01/page-01/task-01.spec.js');
-    createFile('tutorial/chapter-01/page-01/task-02.spec.js');
-    createFile('tutorial/chapter-01/page-02/task-01.spec.js');
-    createFile('tutorial/chapter-01/page-02/task-02.spec.js');
+    createFile('tutorial/1/01/01.spec.js');
+    createFile('tutorial/1/01/02.spec.js');
+    createFile('tutorial/1/02/01.spec.js');
+    createFile('tutorial/1/02/02.spec.js');
 }
 exports.createTestFiles = createTestFiles;
