0.6 prepare, progress on create

ShMcK · ShMcK · commit 2ab353749fc6 · 2016-05-31T21:31:58.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.6.0] - WIP
+
 ## [0.5.0] - 2016-05-02
 - bug fixes
 - remove 'chapters', now only 'pages'
diff --git a/lib/cli.js b/lib/cli.js
@@ -9,7 +9,7 @@ var tutorials_1 = require('./tutorials/tutorials');
 var publish_1 = require('./publish/publish');
 var update_1 = require('./update/update');
 program
-    .version('0.3.27')
+    .version('0.6.0')
     .usage('[options] <keywords>')
     .option('-b, --build [path/to/tutorial.md]', 'tutorial markdown file', /^.+\.md$/i)
     .option('-c, --create [name]', 'tutorial name')
diff --git a/lib/create/create.js b/lib/create/create.js
@@ -2,7 +2,7 @@
 var validate_1 = require('./validate');
 var write_demo_1 = require('./write-demo');
 var build_1 = require('../build/build');
-function create(name) {
+function create(name, dir) {
     validate_1.validatePackageName(name);
     process.stdout.write("Creating demo tutorial \"coderoad-" + name + "\"...");
     Promise.all([
diff --git a/lib/create/validate.js b/lib/create/validate.js
@@ -3,7 +3,6 @@ var chalk_1 = require('chalk');
 var validateNpm = require('validate-npm-package-name');
 var lodash_kebabcase_1 = require('lodash.kebabcase');
 function validatePackageName(name) {
-    console.log(lodash_kebabcase_1.default);
     var validated = validateNpm(name);
     if (!validated.validForNewPackages || !validated.validForOldPackages) {
         if (validated.errors) {
diff --git a/lib/create/write-demo.js b/lib/create/write-demo.js
@@ -14,19 +14,25 @@ function createFolder(pathToFolder) {
         fs_1.mkdirSync(pathToFolder);
     }
 }
+var folders = [
+    'tutorial',
+    path_1.join('tutorial', '01'),
+    path_1.join('tutorial', '02')
+];
+var files = [
+    '.gitignore',
+    path_1.join('tutorial', 'tutorial.md'),
+    path_1.join('tutorial', '01', 'page-one.md'),
+    path_1.join('tutorial', '01', '01.spec.js'),
+    path_1.join('tutorial', '01', '02.spec.js'),
+    path_1.join('tutorial', '02', 'page-two.md'),
+    path_1.join('tutorial', '02', '01.spec.js'),
+    path_1.join('tutorial', '02', '02.spec.js')
+];
 function createTutorialMd() {
     return new Promise(function (resolve, reject) {
-        createFile('.gitignore');
-        createFolder('tutorial');
-        createFile(path_1.join('tutorial', 'tutorial.md'));
-        createFolder(path_1.join('tutorial', '01'));
-        createFile(path_1.join('tutorial', '01', 'page-one.md'));
-        createFile(path_1.join('tutorial', '01', '01.spec.js'));
-        createFile(path_1.join('tutorial', '01', '02.spec.js'));
-        createFolder(path_1.join('tutorial', '02'));
-        createFile(path_1.join('tutorial', '02', 'page-two.md'));
-        createFile(path_1.join('tutorial', '02', '01.spec.js'));
-        createFile(path_1.join('tutorial', '02', '02.spec.js'));
+        folders.forEach(function (folder) { return createFolder(folder); });
+        files.forEach(function (file) { return createFile(file); });
         resolve();
     });
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coderoad-cli",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Command line interface for CodeRoad. Build project files.",
   "keywords": [
     "coderoad"
diff --git a/src/cli.ts b/src/cli.ts
@@ -2,6 +2,7 @@
 
 import * as program from 'commander';
 import {grey, green} from 'chalk';
+
 import build from './build/build';
 import create from './create/create';
 import search from './search/search';
@@ -10,7 +11,7 @@ import publish from './publish/publish';
 import {checkForUpdate} from './update/update';
 
 program
-  .version('0.3.27')
+  .version('0.6.0')
   .usage('[options] <keywords>')
   .option('-b, --build [path/to/tutorial.md]',
   'tutorial markdown file', /^.+\.md$/i)
diff --git a/src/create/create.ts b/src/create/create.ts
@@ -2,7 +2,7 @@ import {validatePackageName} from './validate';
 import {createPackageJson, createTutorialMd} from './write-demo';
 import build from '../build/build';
 
-export default function create(name: string): void {
+export default function create(name: string, dir: string): void {
   // check
   validatePackageName(name);
 
diff --git a/src/create/validate.ts b/src/create/validate.ts
@@ -3,7 +3,6 @@ import * as validateNpm from 'validate-npm-package-name';
 import kebabCase from 'lodash.kebabcase';
 
 export function validatePackageName(name: string): void {
-  console.log(kebabCase);
   let validated: Validated = validateNpm(name);
   if (!validated.validForNewPackages || !validated.validForOldPackages) {
     if (validated.errors) {
diff --git a/src/create/write-demo.ts b/src/create/write-demo.ts
@@ -4,7 +4,7 @@ import {fileExists} from '../tools/file';
 
 function createFile(pathToFile: string): void {
   if (!fileExists(pathToFile)) {
-    let inputPath: string = join(__dirname, '..', '..', 'setup', pathToFile);
+    let inputPath = join(__dirname, '..', '..', 'setup', pathToFile);
     let test = readFileSync(inputPath, 'utf8');
     writeFileSync(pathToFile, test, 'utf8');
   }
@@ -16,19 +16,27 @@ function createFolder(pathToFolder: string): void {
   }
 }
 
+const folders = [
+  'tutorial',
+  join('tutorial', '01'),
+  join('tutorial', '02')
+];
+
+const files = [
+  '.gitignore',
+  join('tutorial', 'tutorial.md'),
+  join('tutorial', '01', 'page-one.md'),
+  join('tutorial', '01', '01.spec.js'),
+  join('tutorial', '01', '02.spec.js'),
+  join('tutorial', '02', 'page-two.md'),
+  join('tutorial', '02', '01.spec.js'),
+  join('tutorial', '02', '02.spec.js')
+];
+
 export function createTutorialMd(): void {
   return new Promise((resolve, reject) => {
-    createFile('.gitignore');
-    createFolder('tutorial');
-    createFile(join('tutorial', 'tutorial.md'));
-    createFolder(join('tutorial', '01'));
-    createFile(join('tutorial', '01', 'page-one.md'));
-    createFile(join('tutorial', '01', '01.spec.js'));
-    createFile(join('tutorial', '01', '02.spec.js'));
-    createFolder(join('tutorial', '02'));
-    createFile(join('tutorial', '02', 'page-two.md'));
-    createFile(join('tutorial', '02', '01.spec.js'));
-    createFile(join('tutorial', '02', '02.spec.js'));
+    folders.forEach((folder) => createFolder(folder));
+    files.forEach((file) => createFile(file));
     resolve();
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "coderoad-cli",`
`3`		`- "version": "0.5.2",`
	`3`	`+ "version": "0.6.0",`
`4`	`4`	`"description": "Command line interface for CodeRoad. Build project files.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"coderoad"`