fix tutorial list bug if no pj.main

Author: ShMcK

lib/cli.js

@@ -15,7 +15,7 @@ program
     .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('-t, --tutorials', 'list of local tutorial packages')
     .option('-s, --search [query]', 'search for tutorial package')
     .option('-r, --run', 'run tutorial')
     .parse(process.argv);
@@ -47,9 +47,14 @@ else if (program.tutorials) {
     }
     else {
         process.stdout.write('\n');
-        tuts.forEach(function (tut) {
-            process.stdout.write("  " + tut.name + " : " + tut.version + "\n");
-        });
+        if (tuts.length < 1) {
+            process.stdout.write(chalk_1.yellow("  No tutorials in this directory."));
+        }
+        else {
+            tuts.forEach(function (tut) {
+                process.stdout.write("  " + tut.name + " : " + tut.version + "\n");
+            });
+        }
     }
 }
 else if (program.publish) {

lib/tutorials/is-tutorial.js

@@ -9,18 +9,17 @@ function isTutorial(dir, name) {
         console.log("Error with " + name + ": no package.json file found. " + exports.tutorialError);
         return false;
     }
-    var packageJson = JSON.parse(fs_1.readFileSync(pathToTutorialPackageJson, 'utf8'));
-    if (!packageJson.main && packageJson.main.match(/coderoad.json$/)) {
-        console.log("Error with " + name + ": main does not load a coderoad.json file. " + exports.tutorialError);
+    var pj = JSON.parse(fs_1.readFileSync(pathToTutorialPackageJson, 'utf8'));
+    if (!pj.hasOwnProperty('main') || !pj.main.match(/coderoad.json$/)) {
         return false;
     }
-    var pathToCoderoadJson = path_1.join(dir, 'node_modules', name, packageJson.main);
+    var pathToCoderoadJson = path_1.join(dir, 'node_modules', name, pj.main);
     if (!node_file_exists_1.default(pathToCoderoadJson)) {
         console.log("Error with " + name + ": no coderoad.json file. " + exports.tutorialError);
         return false;
     }
     ;
-    if (!packageJson.config || !packageJson.config.runner) {
+    if (!pj.config || !pj.config.runner) {
         console.log("Error with " + name + ": no test runner specified. " + exports.tutorialError);
         return false;
     }

src/cli.ts

@@ -1,7 +1,7 @@
 #! /usr/bin/env node
 
 import * as program from 'commander';
-import {grey} from 'chalk';
+import {grey, yellow} from 'chalk';
 import {success, fail} from './result';
 
 import build from './build';
@@ -19,7 +19,7 @@ program
   .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('-t, --tutorials', 'list of local tutorial packages')
   .option('-s, --search [query]', 'search for tutorial package')
   .option('-r, --run', 'run tutorial')
   .parse(process.argv);
@@ -55,9 +55,13 @@ if (program.build) {
     fail();
   } else {
     process.stdout.write('\n');
-    tuts.forEach((tut) => {
-      process.stdout.write(`  ${tut.name} : ${tut.version}\n`);
-    });
+    if (tuts.length < 1) {
+      process.stdout.write(yellow(`  No tutorials in this directory.`));
+    } else {
+      tuts.forEach((tut) => {
+        process.stdout.write(`  ${tut.name} : ${tut.version}\n`);
+      });
+    }
   }
 
 } else if (program.publish) {

src/list/list.ts

@@ -9,6 +9,8 @@ export default function findTutorials(
 ): Tutorial.Info[] {
   if (!!deps && Object.keys(deps).length > 0) {
     return (Object.keys(deps)
+      // map over possible tutorials
+      // filter to only packages with a coderoad.json file
       .filter((name: string) => isTutorial(dir, name))
       .map(function(name: string) {
         const pathToTutorialPackageJson = join(

src/tutorials/find-tutorials.ts

@@ -14,20 +14,21 @@ export function isTutorial(dir: string, name: string): boolean {
     return false;
   }
   // main path to coderoad.json
-  let packageJson = JSON.parse(readFileSync(pathToTutorialPackageJson, 'utf8'));
-  if (!packageJson.main && packageJson.main.match(/coderoad.json$/)) {
-    console.log(`Error with ${name}: main does not load a coderoad.json file. ${tutorialError}`);
+  let pj = JSON.parse(readFileSync(pathToTutorialPackageJson, 'utf8'));
+
+  if (!pj.hasOwnProperty('main') || !pj.main.match(/coderoad.json$/)) {
+    // console.log(`Error with ${name}: main does not load a coderoad.json file. ${tutorialError}`);
     return false;
   }
   // coderoad.json file exists
   let pathToCoderoadJson = join(
-    dir, 'node_modules', name, packageJson.main
+    dir, 'node_modules', name, pj.main
   );
   if (!fileExists(pathToCoderoadJson)) {
     console.log(`Error with ${name}: no coderoad.json file. ${tutorialError}`);
     return false;
   };
-  if (!packageJson.config || !packageJson.config.runner) {
+  if (!pj.config || !pj.config.runner) {
     console.log(`Error with ${name}: no test runner specified. ${tutorialError}`);
     return false;
   }

src/tutorials/is-tutorial.ts

@@ -31,7 +31,6 @@
         "src/create/index.ts",
         "src/create/validate.ts",
         "src/create/write-demo.ts",
-        "src/list/list.ts",
         "src/packageJson/get.ts",
         "src/publish/index.ts",
         "src/publish/validate.ts",
@@ -41,11 +40,13 @@
         "src/tutorials/index.ts",
         "src/tutorials/is-tutorial.ts",
         "src/tutorials/update.ts",
+        "src/typings/atom-plugin-command-line/index.d.ts",
         "src/typings/chalk/chalk.d.ts",
         "src/typings/commander/commander.d.ts",
         "src/typings/cr.d.ts",
         "src/typings/es6-promise/es6-promise.d.ts",
         "src/typings/globals.d.ts",
+        "src/typings/node-file-exists/index.d.ts",
         "src/typings/node/node.d.ts",
         "src/typings/prompt/prompt.d.ts",
         "src/typings/tsd.d.ts",