change create folder structure, build with optional params

ShMcK · ShMcK · commit 6c4527ffc9bf · 2016-02-05T17:05:34.000-08:00
diff --git a/cli.js b/cli.js
@@ -9,21 +9,21 @@ var search_1 = require('./src/search/search');
 var tutorials_1 = require('./src/tutorials/tutorials');
 var publish_1 = require('./src/publish/publish');
 program
-    .version('0.3.2')
+    .version('0.3.3')
     .usage('[options] <keywords>')
-    .option('-b, --build [tutorial.md]', 'tutorial markdown file', /^.+\.md$/i)
+    .option('-b, --build [path/to/tutorial.md]', 'tutorial markdown file', /^.+\.md$/i)
     .option('-c, --create [name]', 'tutorial name')
     .option('-p, --publish [version]', 'publish tutorial to npm with new version number')
     .option('-t, --tutorials', 'list of tutorial packages')
     .option('-s, --search [query]', 'search for tutorial package')
     .option('-r, --run', 'run tutorial')
     .parse(process.argv);
-if (!program.args.length && !program.tutorials) {
+if (!program.args.length && !program.tutorials && !program.build) {
     program.help();
 }
 else {
     if (program.build) {
-        var tutorial = program.args[0];
+        var tutorial = program.args[0] || 'tutorial/tutorial.md';
         var output = 'coderoad.json';
         console.log(chalk.grey("building from " + tutorial + "..."));
         build_1.default(tutorial, output);
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coderoad-cli",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Command line interface for CodeRoad. Build project files.",
   "keywords": [
     "coderoad"
diff --git a/src/create/setup/package.json b/src/create/setup/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {},
   "license": "MIT",
   "coderoad": {
-    "testDir": "test",
+    "testDir": "tutorial",
     "testSuffix": ".spec.js"
   }
 }
diff --git a/src/create/setup/tutorial.md b/src/create/setup/tutorial.md
diff --git a/src/create/setup/tutorial/chapter-01/page-01/page-one.md b/src/create/setup/tutorial/chapter-01/page-01/page-one.md
@@ -0,0 +1,10 @@
+### Page One Title
+Page one description.
+
+More about page one.
+
++ write a function that does something.
+@test('chapter-01/page-01/task-01')
+
++ write some other function
+@test('chapter-01/page-01/task-02')
diff --git a/src/create/setup/tutorial/chapter-01/page-01/task-01.spec.js b/src/create/setup/tutorial/chapter-01/page-01/task-01.spec.js
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/chapter-01/page-02/page-two.md b/src/create/setup/tutorial/chapter-01/page-02/page-two.md
@@ -0,0 +1,10 @@
+### Page Two Title
+Page two description.
+
+More about page two.
+
++ write a function that does something.
+@test('chapter-01/page-02/task-01')
+
++ write some other function
+@test('chapter-01/page-02/task-02')
diff --git a/src/create/setup/tutorial/chapter-01/page-02/task-01.spec.js b/src/create/setup/tutorial/chapter-01/page-02/task-01.spec.js
@@ -0,0 +1 @@
+console.log('page one test');
diff --git a/src/create/setup/tutorial/chapter-01/page-02/task-02.spec.js b/src/create/setup/tutorial/chapter-01/page-02/task-02.spec.js
diff --git a/src/create/setup/tutorial/tutorial.md b/src/create/setup/tutorial/tutorial.md
@@ -0,0 +1,9 @@
+# Project Title
+Project description.
+
+## Chapter One Title
+Chapter one description.
+
+@import('tutorial/chapter-01/page-01/page-one')
+
+@import('tutorial/chapter-01/page-02/page-two')
diff --git a/src/create/write-demo.js b/src/create/write-demo.js
@@ -2,14 +2,27 @@
 var fs = require('fs');
 var path = require('path');
 var file_1 = require('../tools/file');
-function createTutorialMd() {
-    if (!file_1.fileExists('tutorial.md')) {
-        console.log('adding tutorial md');
-        var inputPath = path.join(__dirname, './setup/tutorial.md');
-        var tutorial = fs.readFileSync(inputPath, 'utf8');
-        fs.writeFileSync('tutorial.md', tutorial, 'utf8');
+function createFile(pathToFile) {
+    if (!file_1.fileExists(pathToFile)) {
+        var inputPath = path.join(__dirname, 'setup', pathToFile);
+        var test = fs.readFileSync(inputPath, 'utf8');
+        fs.writeFileSync(pathToFile, test, 'utf8');
     }
 }
+function createFolder(pathToFolder) {
+    if (!file_1.fileExists(pathToFolder)) {
+        fs.mkdirSync(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');
+}
 exports.createTutorialMd = createTutorialMd;
 function createPackageJson(name) {
     if (!file_1.fileExists('package.json')) {
@@ -22,13 +35,9 @@ function createPackageJson(name) {
 }
 exports.createPackageJson = createPackageJson;
 function createTestFiles() {
-    if (!file_1.fileExists('./test')) {
-        fs.mkdirSync('./test');
-    }
-    if (!file_1.fileExists('./test/test-example-01.spec.js')) {
-        var inputPath = path.join(__dirname, './setup/test/test-example-01.spec.js');
-        var test = fs.readFileSync(inputPath, 'utf8');
-        fs.writeFileSync('./test/test-example-01.spec.js', test, 'utf8');
-    }
+    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');
 }
 exports.createTestFiles = createTestFiles;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "coderoad-cli",`
`3`		`- "version": "0.3.2",`
	`3`	`+ "version": "0.3.3",`
`4`	`4`	`"description": "Command line interface for CodeRoad. Build project files.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"coderoad"`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"devDependencies": {},`
`11`	`11`	`"license": "MIT",`
`12`	`12`	`"coderoad": {`
`13`		`- "testDir": "test",`
	`13`	`+ "testDir": "tutorial",`
`14`	`14`	`"testSuffix": ".spec.js"`
`15`	`15`	`}`
`16`	`16`	`}`