swap out workshopper for workshopper-adventure

Author: achingbrain

i18n/en.json

@@ -1,5 +1,6 @@
 {
   "title": "NodeBot Workshop",
+  "subtitle": "Make your Ardunio alive with Johnny-Five",
   "exercise": {
     "blink_blink": "Blink Blink",
     "servo_wave": "Servo Wave",
@@ -10,12 +11,5 @@
     "robot_arm": "Robot Arm",
     "remote_temperature": "Remote Temperature",
     "fire_alarm": "Fire Alarm"
-  },
-  "common": {
-    "exercise": {
-      "pass": {},
-      "fail": {}
-    }
-  },
-  "exercises": {}
+  }
 }

i18n/ja.json

@@ -1,5 +1,5 @@
 {
-  "title": "JavaScriptでのハードウェア制御を楽しもう！",
+  "subtitle": "JavaScriptでのハードウェア制御を楽しもう！",
   "exercise": {
     "blink_blink": "Lチカ",
     "servo_wave": "サーボウェーブ",
@@ -10,12 +10,5 @@
     "robot_arm": "ロボットアーム",
     "remote_temperature": "遠隔地の温度",
     "fire_alarm": "火災報知器"
-  },
-  "common": {
-    "exercise": {
-      "pass": {},
-      "fail": {}
-    }
-  },
-  "exercises": {}
+  }
 }

nodebot-workshop.js

@@ -1,23 +1,13 @@
 #!/usr/bin/env node
 
-const workshopper = require('workshopper')
-    , path        = require('path')
-    , name        = 'nodebot-workshop'
-    , title       = 'Nodebot Workshop'
-    , subtitle    = '\x1b[23mSelect an exercise and hit \x1b[3mEnter\x1b[23m to begin'
+const workshop = require('workshopper-adventure')({
+  appDir: __dirname,
+  languages: ['en', 'ja'],
+  menu: {fg: 'black', bg: /^win/.test(process.platform) ? 'yellow' : 220},
+  header: require('workshopper-adventure/default/header'),
+  footer: require('workshopper-adventure/default/footer')
+})
 
-function fpath (f) {
-  return path.join(__dirname, f)
-}
+workshop.addAll(require('./exercises/menu.json'))
 
-workshopper({
-    name        : name
-  , title       : title
-  , subtitle    : subtitle
-  , exerciseDir : fpath('./exercises/')
-  , appDir      : __dirname
-  , languages   : ['en', 'ja']
-  , helpFile    : fpath('help.txt')
-  , menuItems   : []
-  , menu        : {fg: 'black', bg: /^win/.test(process.platform) ? 'yellow' : 220}
-})
+workshop.execute(process.argv.slice(2))

package.json

@@ -40,7 +40,7 @@
     "johnny-five": "^0.9.11",
     "proxyquire": "^1.0.0",
     "sinon": "^1.9",
-    "workshopper": "^2.7.0",
+    "workshopper-adventure": "^4.4.6",
     "workshopper-exercise": "^2.5.3"
   },
   "optionalDependencies": {

tests/verify-solutions.js

@@ -13,7 +13,8 @@
  * Test all the exercises defined in `menu.json` have valid solutions. Run them in series, in a child process.
  *
  */
-const workshopper = require('workshopper')
+const workshopper = require('workshopper-adventure')
+  , workshopperUtils = require('workshopper-adventure/util')
   , spawn       = require('child_process').spawn
   , async       = require('async')
   , path        = require('path')
@@ -40,24 +41,31 @@ var nodebot = workshopper({
   , helpFile    : fpath('help.txt')
   , menuItems   : []
   , menu        : {fg: "black", bg: 220}
+  , menuFactory: {
+      options: {},
+      create: function () {
+        return true
+      }
+    }
 })
+nodebot.addAll(require('../exercises/menu.json'))
 
 function testSolution(name) {
 
   if(fs.existsSync(name)){ // we got a file name not an exercise name
     name = nameFromPath(name)
   }
 
-  console.log(nodebot.dirFromName(name))
-
   nodebot.getData = function(){
     return name
   }
 
   var exercise = nodebot.loadExercise(name)
-  var solution = path.relative(__dirname, nodebot.dirFromName(name) + '/solution/solution.js')
 
-  nodebot.execute(exercise, 'verify', [solution])
+  var solution = path.relative(__dirname, path.join(__dirname, '..', 'exercises', workshopperUtils.dirFromName(name), 'solution', 'solution.js'))
+
+  nodebot.execute(['select', name])
+  nodebot.execute(['verify', solution])
 }
 
 if (process.argv.length > 2){