Merge pull request #323 from workshopper/update-libraries

Update libraries

Author: ledsun

index.js

@@ -7,7 +7,7 @@ const languages = ['en'].concat(fs.readdirSync(i18nDir)
   .filter((f) => f.match(/\w+\.json/))
   .map((f) => f.replace('.json', ''))
 )
-var jsing = require('workshopper-adventure')({
+const jsing = require('workshopper-adventure')({
   appDir: __dirname,
   languages,
   header: require('workshopper-adventure/default/header'),
@@ -18,8 +18,8 @@ jsing.addAll(require('./menu.json').map(function (name) {
   return {
     name,
     fn: function () {
-      var p = name.toLowerCase().replace(/\s/g, '-')
-      var dir = require('path').join(__dirname, 'problems', p)
+      const p = name.toLowerCase().replace(/\s/g, '-')
+      const dir = require('path').join(__dirname, 'problems', p)
       return problem(dir)
     }
   }

lib/compare-solution.js

@@ -1,29 +1,27 @@
-/* eslint-disable standard/no-callback-literal */
-
 require('colors')
 
-var path = require('path')
-var diff = require('diff')
-var run = require(path.join(__dirname, 'run-solution'))
+const path = require('path')
+const diff = require('diff')
+const run = require(path.join(__dirname, 'run-solution'))
 
 module.exports = function (solution, attempt, i18n, cb) {
   run(solution, i18n, function (err, solutionResult) {
     if (err) {
       console.error(err)
-      return cb(false)
+      return cb(err, false)
     }
 
     run(attempt, i18n, function (err, attemptResult) {
       if (err && err.code !== 8) {
         console.error(err)
-        return cb(false)
+        return cb(err, false)
       }
 
       if (solutionResult === attemptResult) {
-        return cb(true)
+        return cb(err, true)
       }
 
-      cb(false, {
+      cb(null, false, {
         solution: solutionResult,
         attempt: err || attemptResult,
         diff: generateDiff(solutionResult, attemptResult)
@@ -33,9 +31,9 @@ module.exports = function (solution, attempt, i18n, cb) {
 }
 
 function generateDiff (solution, attempt) {
-  var parts = diff.diffChars(solution, attempt)
+  const parts = diff.diffChars(solution, attempt)
 
-  var result = ''
+  let result = ''
 
   parts.forEach(function (part) {
     if (part.added) {

lib/footer.js

@@ -1,4 +1,4 @@
-var path = require('path')
+const path = require('path')
 module.exports = [
   { text: '---', type: 'md' },
   { file: path.join(__dirname, '..', 'i18n', 'footer', '{lang}.md') },

lib/get-file.js

@@ -1,4 +1,4 @@
-var fs = require('fs')
+const fs = require('fs')
 
 module.exports = function (filepath) {
   return fs.readFileSync(filepath, 'utf8')

lib/problem.js

@@ -1,39 +1,37 @@
-/* eslint-disable standard/no-callback-literal */
-
-var path = require('path')
-var getFile = require('./get-file')
-var compare = require('./compare-solution')
+const path = require('path')
+const getFile = require('./get-file')
+const compare = require('./compare-solution')
 
 module.exports = function createProblem (dirname) {
-  var exports = {}
+  const exports = {}
 
-  var problemName = dirname.split(path.sep)
-  var i18n
+  let problemName = dirname.split(path.sep)
+  let i18n
 
   problemName = problemName[problemName.length - 1]
 
   exports.init = function (workshopper) {
     i18n = workshopper.i18n
-    var postfix = workshopper.i18n.lang() === 'en' ? '' : '_' + workshopper.i18n.lang()
+    const postfix = workshopper.i18n.lang() === 'en' ? '' : '_' + workshopper.i18n.lang()
     this.problem = { file: path.join(dirname, 'problem' + postfix + '.md') }
     this.solution = { file: path.join(dirname, 'solution' + postfix + '.md') }
     this.solutionPath = path.resolve(__dirname, '..', 'solutions', problemName, 'index.js')
     this.troubleshootingPath = path.join(__dirname, '..', 'i18n', 'troubleshooting' + postfix + '.md')
   }
 
   exports.verify = function (args, cb) {
-    var attemptPath = path.resolve(process.cwd(), args[0])
-    compare(this.solutionPath, attemptPath, i18n, function (match, obj) {
+    const attemptPath = path.resolve(process.cwd(), args[0])
+    compare(this.solutionPath, attemptPath, i18n, function (_, match, obj) {
       if (match) {
-        return cb(true)
+        return cb(null, true)
       }
 
       if (!obj) {
         // An error occured, we've already printed an error
         return
       }
 
-      var message = getFile(this.troubleshootingPath)
+      let message = getFile(this.troubleshootingPath)
 
       message = message.replace(/%solution%/g, obj.solution)
       message = message.replace(/%attempt%/g, obj.attempt)
@@ -45,7 +43,7 @@ module.exports = function createProblem (dirname) {
         require('./footer.js')
       ]
 
-      cb(false)
+      cb(null, false)
     }.bind(this))
   }
 

lib/run-solution.js

@@ -1,5 +1,5 @@
-var fs = require('fs')
-var exec = require('child_process').exec
+const fs = require('fs')
+const exec = require('child_process').exec
 
 /**
  * @param {!string} filePath