remove error messages & loading duplicate tutorials

ShMcK · ShMcK · commit 835b2fd16b13 · 2016-08-09T20:22:47.000-07:00
diff --git a/lib/tutorials/find-tutorials.js b/lib/tutorials/find-tutorials.js
@@ -10,7 +10,7 @@ function findTutorials(dir, deps) {
             .map(function (name) {
             var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');
             if (!node_file_exists_1.default(pathToTutorialPackageJson)) {
-                console.log("Error with " + name + ": no package.json file found. " + is_tutorial_1.tutorialError);
+                console.log("Error with " + name + ": no package.json file found.");
                 return {
                     name: name,
                     version: 'NOT INSTALLED'
diff --git a/lib/tutorials/index.js b/lib/tutorials/index.js
@@ -8,9 +8,17 @@ function tutorials(dir) {
         console.log(chalk_1.red("No package.json available"));
         return null;
     }
+    var removeDups = {};
     return ([]
         .concat(find_tutorials_1.default(dir, pj.dependencies))
-        .concat(find_tutorials_1.default(dir, pj.devDependencies)));
+        .concat(find_tutorials_1.default(dir, pj.devDependencies))
+        .filter(function (tutorial) {
+        if (!removeDups.hasOwnProperty(tutorial.name) && removeDups[tutorial.name] !== tutorial.version) {
+            removeDups[tutorial.name] = tutorial.version;
+            return true;
+        }
+        return false;
+    }));
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = tutorials;
diff --git a/lib/tutorials/is-tutorial.js b/lib/tutorials/is-tutorial.js
@@ -2,11 +2,9 @@
 var path_1 = require('path');
 var fs_1 = require('fs');
 var node_file_exists_1 = require('node-file-exists');
-exports.tutorialError = 'This is an error with the tutorial itself';
 function isTutorial(dir, name) {
     var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');
     if (!node_file_exists_1.default(pathToTutorialPackageJson)) {
-        console.log("Error with " + name + ": no package.json file found. " + exports.tutorialError);
         return false;
     }
     var pj = JSON.parse(fs_1.readFileSync(pathToTutorialPackageJson, 'utf8'));
@@ -15,12 +13,10 @@ function isTutorial(dir, name) {
     }
     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 (!pj.config || !pj.config.runner) {
-        console.log("Error with " + name + ": no test runner specified. " + exports.tutorialError);
         return false;
     }
     return true;
diff --git a/src/tutorials/find-tutorials.ts b/src/tutorials/find-tutorials.ts
@@ -1,7 +1,7 @@
 import {join} from 'path';
 import {readFileSync} from 'fs';
 import fileExists from 'node-file-exists';
-import {isTutorial, tutorialError} from './is-tutorial';
+import {isTutorial} from './is-tutorial';
 // import {canUpdateTutorial} from './update';
 
 export default function findTutorials(
@@ -20,7 +20,7 @@ export default function findTutorials(
         // no package.json
         if (!fileExists(pathToTutorialPackageJson)) {
           console.log(
-            `Error with ${name}: no package.json file found. ${tutorialError}`
+            `Error with ${name}: no package.json file found.`
           );
           return {
             name,
diff --git a/src/tutorials/index.ts b/src/tutorials/index.ts
@@ -10,8 +10,17 @@ export default function tutorials(dir: string): string[] {
     return null;
   }
 
+  let removeDups = {};
+
   return ([]
     .concat(findTutorials(dir, pj.dependencies))
     .concat(findTutorials(dir, pj.devDependencies))
+    .filter((tutorial) => {
+      if (!removeDups.hasOwnProperty(tutorial.name) && removeDups[tutorial.name] !== tutorial.version) {
+        removeDups[tutorial.name] = tutorial.version;
+        return true;
+      }
+      return false;
+    })
   );
 }
diff --git a/src/tutorials/is-tutorial.ts b/src/tutorials/is-tutorial.ts
@@ -2,15 +2,15 @@ import {join} from 'path';
 import {readFileSync} from 'fs';
 import fileExists from 'node-file-exists';
 
-export const tutorialError = 'This is an error with the tutorial itself';
+// export const tutorialError = 'This is an error with the tutorial itself';
 
 export function isTutorial(dir: string, name: string): boolean {
   // has package.json
   const pathToTutorialPackageJson = join(
     dir, 'node_modules', name, 'package.json'
   );
   if (!fileExists(pathToTutorialPackageJson)) {
-    console.log(`Error with ${name}: no package.json file found. ${tutorialError}`);
+    // console.log(`Error with ${name}: no package.json file found. ${tutorialError}`);
     return false;
   }
   // main path to coderoad.json
@@ -25,11 +25,11 @@ export function isTutorial(dir: string, name: string): boolean {
     dir, 'node_modules', name, pj.main
   );
   if (!fileExists(pathToCoderoadJson)) {
-    console.log(`Error with ${name}: no coderoad.json file. ${tutorialError}`);
+    // console.log(`Error with ${name}: no coderoad.json file. ${tutorialError}`);
     return false;
   };
   if (!pj.config || !pj.config.runner) {
-    console.log(`Error with ${name}: no test runner specified. ${tutorialError}`);
+    // console.log(`Error with ${name}: no test runner specified. ${tutorialError}`);
     return false;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,9 @@`
`2`	`2`	`var path_1 = require('path');`
`3`	`3`	`var fs_1 = require('fs');`
`4`	`4`	`var node_file_exists_1 = require('node-file-exists');`
`5`		`-exports.tutorialError = 'This is an error with the tutorial itself';`
`6`	`5`	`function isTutorial(dir, name) {`
`7`	`6`	`var pathToTutorialPackageJson = path_1.join(dir, 'node_modules', name, 'package.json');`
`8`	`7`	`if (!node_file_exists_1.default(pathToTutorialPackageJson)) {`
`9`		`- console.log("Error with " + name + ": no package.json file found. " + exports.tutorialError);`
`10`	`8`	`return false;`
`11`	`9`	`}`
`12`	`10`	`var pj = JSON.parse(fs_1.readFileSync(pathToTutorialPackageJson, 'utf8'));`
`@@ -15,12 +13,10 @@ function isTutorial(dir, name) {`
`15`	`13`	`}`
`16`	`14`	`var pathToCoderoadJson = path_1.join(dir, 'node_modules', name, pj.main);`
`17`	`15`	`if (!node_file_exists_1.default(pathToCoderoadJson)) {`
`18`		`- console.log("Error with " + name + ": no coderoad.json file. " + exports.tutorialError);`
`19`	`16`	`return false;`
`20`	`17`	`}`
`21`	`18`	`;`
`22`	`19`	`if (!pj.config \|\| !pj.config.runner) {`
`23`		`- console.log("Error with " + name + ": no test runner specified. " + exports.tutorialError);`
`24`	`20`	`return false;`
`25`	`21`	`}`
`26`	`22`	`return true;`