pass in configuration as object for cli method calls

ShMcK · ShMcK · commit 2105c872bc7a · 2016-08-13T16:21:50.000-07:00
diff --git a/lib/build/index.js b/lib/build/index.js
@@ -19,8 +19,8 @@ function parseAndBuild(dir, lines) {
     };
     return info_1.info({ dir: dir, result: result, lines: lines, index: index });
 }
-function build(dir, filePath, output) {
-    if (output === void 0) { output = './coderoad.json'; }
+function build(_a) {
+    var dir = _a.dir, filePath = _a.filePath, _b = _a.output, output = _b === void 0 ? './coderoad.json' : _b;
     filePath = path_1.join(dir, filePath);
     output = path_1.join(dir, output);
     if (!validate.filePath(filePath)) {
diff --git a/lib/cli.js b/lib/cli.js
@@ -23,17 +23,17 @@ program
     .parse(process.argv);
 update_1.default();
 if (program.build) {
-    var tutorial = program.args[0] || 'tutorial/tutorial.md';
+    var tutorialPath = program.args[0] || 'tutorial/tutorial.md';
     var output = 'coderoad.json';
-    process.stdout.write(chalk_1.grey("building coderoad.json for " + tutorial + "..."));
-    if (!build_1.default(process.cwd(), tutorial, output)) {
+    process.stdout.write(chalk_1.grey("building coderoad.json for " + tutorialPath + "..."));
+    if (!build_1.default({ dir: process.cwd(), filePath: tutorialPath, output: output })) {
         result_1.fail();
     }
 }
 else if (program.create) {
     var packageName = program.args[0];
     process.stdout.write("Creating demo tutorial \"coderoad-" + packageName + "\"...");
-    if (!create_1.default(process.cwd(), packageName)) {
+    if (!create_1.default({ dir: process.cwd(), name: packageName })) {
         result_1.fail();
     }
 }
@@ -43,7 +43,7 @@ else if (program.search) {
 }
 else if (program.tutorials) {
     process.stdout.write("List of tutorial packages in this directory...");
-    var tuts = tutorials_1.default(process.cwd());
+    var tuts = tutorials_1.default({ dir: process.cwd() });
     if (!tuts) {
         result_1.fail();
     }
@@ -61,7 +61,7 @@ else if (program.tutorials) {
 }
 else if (program.publish) {
     var version = program.args[0];
-    publish_1.default(version);
+    publish_1.default({ version: version });
 }
 else if (program.validate) {
     if (!validate_1.default()) {
diff --git a/lib/create/index.js b/lib/create/index.js
@@ -2,7 +2,8 @@
 var validate_1 = require('./validate');
 var write_demo_1 = require('./write-demo');
 var chalk_1 = require('chalk');
-function create(dir, name) {
+function create(_a) {
+    var dir = _a.dir, name = _a.name;
     return Promise.all([
         validate_1.validatePackageName(name),
         write_demo_1.createPackageJson(dir, name),
diff --git a/lib/publish/index.js b/lib/publish/index.js
@@ -1,7 +1,8 @@
 "use strict";
 var chalk_1 = require('chalk');
 var validate_1 = require('./validate');
-function publish(version) {
+function publish(_a) {
+    var version = _a.version;
     validate_1.default(version);
     process.stdout.write("Publishing package version \"" + version + "\"... \n");
     console.log(chalk_1.yellow('Publish feature not implemented yet.\n'));
diff --git a/lib/tutorials/index.js b/lib/tutorials/index.js
@@ -2,7 +2,8 @@
 var chalk_1 = require('chalk');
 var find_tutorials_1 = require('./find-tutorials');
 var getJson_1 = require('../utils/getJson');
-function tutorials(dir) {
+function tutorials(_a) {
+    var dir = _a.dir;
     var pj = getJson_1.default(dir, 'package.json');
     if (!pj) {
         console.log(chalk_1.red("No package.json available"));
diff --git a/src/build/index.ts b/src/build/index.ts
@@ -21,7 +21,9 @@ function parseAndBuild(dir: string, lines: string[]): CR.Output {
   return info({ dir, result, lines, index });
 }
 
-export default function build(dir: string, filePath: string, output = './coderoad.json'): boolean {
+export default function build({
+  dir, filePath, output = './coderoad.json'
+}): boolean {
 
   filePath = join(dir, filePath);
   output = join(dir, output);
diff --git a/src/cli.ts b/src/cli.ts
@@ -29,19 +29,19 @@ program
 checkForUpdate();
 
 if (program.build) {
-  const tutorial = program.args[0] || 'tutorial/tutorial.md';
+  const tutorialPath = program.args[0] || 'tutorial/tutorial.md';
   const output = 'coderoad.json';
-  process.stdout.write(grey(`building coderoad.json for ${tutorial}...`));
+  process.stdout.write(grey(`building coderoad.json for ${tutorialPath}...`));
   // run build
-  if (!build(process.cwd(), tutorial, output)) {
+  if (!build({ dir: process.cwd(), filePath: tutorialPath, output })) {
     fail();
   }
 
 } else if (program.create) {
   const packageName = program.args[0];
   process.stdout.write(`Creating demo tutorial "coderoad-${packageName}"...`);
   // run create
-  if (!create(process.cwd(), packageName)) {
+  if (!create({ dir: process.cwd(), name: packageName })) {
     fail();
   }
 
@@ -52,7 +52,7 @@ if (program.build) {
 } else if (program.tutorials) {
   // run find tutorials
   process.stdout.write(`List of tutorial packages in this directory...`);
-  const tuts = tutorials(process.cwd());
+  const tuts = tutorials({ dir: process.cwd() });
   if (!tuts) {
     fail();
   } else {
@@ -68,7 +68,7 @@ if (program.build) {
 
 } else if (program.publish) {
   const version = program.args[0];
-  publish(version);
+  publish({ version });
 
 } else if (program.validate) {
   if (!validate()) {
diff --git a/src/create/index.ts b/src/create/index.ts
@@ -4,7 +4,7 @@ import {createPackageJson, createTutorialMd} from './write-demo';
 import {red, yellow} from 'chalk';
 // import build from '../build';
 
-export default function create(dir: string, name: string): boolean | Promise<boolean> {
+export default function create({ dir, name }): boolean | Promise<boolean> {
 
   // npm package
   return Promise.all([
diff --git a/src/publish/index.ts b/src/publish/index.ts
@@ -1,7 +1,7 @@
 import {yellow} from 'chalk';
 import validateVersion from './validate';
 
-export default function publish(version: string): void {
+export default function publish({ version }): void {
   validateVersion(version);
   process.stdout.write(`Publishing package version "${version}"... \n`);
   console.log(yellow('Publish feature not implemented yet.\n'));
diff --git a/src/tutorials/index.ts b/src/tutorials/index.ts
@@ -2,7 +2,7 @@ import {red} from 'chalk';
 import findTutorials from './find-tutorials';
 import getJson from '../utils/getJson';
 
-export default function tutorials(dir: string): string[] {
+export default function tutorials({ dir }): string[] {
   const pj: PackageJson = getJson(dir, 'package.json');
 
   if (!pj) {

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,17 @@ program`
`23`	`23`	`.parse(process.argv);`
`24`	`24`	`update_1.default();`
`25`	`25`	`if (program.build) {`
`26`		`- var tutorial = program.args[0] \|\| 'tutorial/tutorial.md';`
	`26`	`+ var tutorialPath = program.args[0] \|\| 'tutorial/tutorial.md';`
`27`	`27`	`var output = 'coderoad.json';`
`28`		`- process.stdout.write(chalk_1.grey("building coderoad.json for " + tutorial + "..."));`
`29`		`- if (!build_1.default(process.cwd(), tutorial, output)) {`
	`28`	`+ process.stdout.write(chalk_1.grey("building coderoad.json for " + tutorialPath + "..."));`
	`29`	`+ if (!build_1.default({ dir: process.cwd(), filePath: tutorialPath, output: output })) {`
`30`	`30`	`result_1.fail();`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`else if (program.create) {`
`34`	`34`	`var packageName = program.args[0];`
`35`	`35`	`process.stdout.write("Creating demo tutorial \"coderoad-" + packageName + "\"...");`
`36`		`- if (!create_1.default(process.cwd(), packageName)) {`
	`36`	`+ if (!create_1.default({ dir: process.cwd(), name: packageName })) {`
`37`	`37`	`result_1.fail();`
`38`	`38`	`}`
`39`	`39`	`}`
`@@ -43,7 +43,7 @@ else if (program.search) {`
`43`	`43`	`}`
`44`	`44`	`else if (program.tutorials) {`
`45`	`45`	`process.stdout.write("List of tutorial packages in this directory...");`
`46`		`- var tuts = tutorials_1.default(process.cwd());`
	`46`	`+ var tuts = tutorials_1.default({ dir: process.cwd() });`
`47`	`47`	`if (!tuts) {`
`48`	`48`	`result_1.fail();`
`49`	`49`	`}`
`@@ -61,7 +61,7 @@ else if (program.tutorials) {`
`61`	`61`	`}`
`62`	`62`	`else if (program.publish) {`
`63`	`63`	`var version = program.args[0];`
`64`		`- publish_1.default(version);`
	`64`	`+ publish_1.default({ version: version });`
`65`	`65`	`}`
`66`	`66`	`else if (program.validate) {`
`67`	`67`	`if (!validate_1.default()) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,9 @@ function parseAndBuild(dir: string, lines: string[]): CR.Output {`
`21`	`21`	`return info({ dir, result, lines, index });`
`22`	`22`	`}`
`23`	`23`
`24`		`-export default function build(dir: string, filePath: string, output = './coderoad.json'): boolean {`
	`24`	`+export default function build({`
	`25`	`+ dir, filePath, output = './coderoad.json'`
	`26`	`+}): boolean {`
`25`	`27`
`26`	`28`	`filePath = join(dir, filePath);`
`27`	`29`	`output = join(dir, output);`