workshopper · martinheidegger · Oct 21, 2015 · Oct 21, 2015 · Aug 19, 2016 · Oct 21, 2015
diff --git a/bin/scope-chains-closures b/bin/scope-chains-closures
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('../scope-chains-closures.js').execute(process.argv.slice(2));
diff --git a/exercises/closures/fail.md → exercises/closures/en/fail.md b/exercises/closures/fail.md → exercises/closures/en/fail.md
diff --git a/exercises/closures/pass.md → exercises/closures/en/pass.md b/exercises/closures/pass.md → exercises/closures/en/pass.md
diff --git a/exercises/closures/problem.md → exercises/closures/en/problem.md b/exercises/closures/problem.md → exercises/closures/en/problem.md
@@ -1,5 +1,3 @@
-# Closures
-
 Closures are an important part of the Javascript language. They are what enables
 the callback-last programming most prominent in node, and provide an excellent
 mechanism for handling the asynchronous nature of most Javascript tasks.

diff --git a/exercises/closures/solution.md → exercises/closures/en/solution.md b/exercises/closures/solution.md → exercises/closures/en/solution.md
diff --git a/exercises/garbage-collection/fail.md → exercises/garbage-collection/en/fail.md b/exercises/garbage-collection/fail.md → exercises/garbage-collection/en/fail.md
diff --git a/exercises/garbage-collection/pass.md → exercises/garbage-collection/en/pass.md b/exercises/garbage-collection/pass.md → exercises/garbage-collection/en/pass.md
diff --git a/exercises/garbage-collection/problem.md → exercises/garbage-collection/en/problem.md b/exercises/garbage-collection/problem.md → exercises/garbage-collection/en/problem.md
@@ -1,5 +1,3 @@
-# Garbage Collection
-
 Memory in Javascript is managed automatically by the runtime. The runtime
 decides when/if to release any allocated memory. This decision process is called
 _Garbage Collection_.
@@ -48,12 +46,13 @@ In this challenge, you will be required to use Chrome DevTools for detecting
 Garbage Collection events. Follow these steps to get a feel for what happens
 when Chrome performs its Mark & Sweep algorithm:
 
+```
 1)  Fire up a new tab in Chrome
 2)  Open the DevTools > Timeline tab
 3)  Ensure the settings are like so: `http://i.imgur.com/RMovIw4.png`
-  a) Frames View is unselected (allows seeing memory graphs)
-  b) Flame Chart View is selected (allows seeing where execution time is spent)
-  c) Only "Memory" is selected from the options
+    a) Frames View is unselected (allows seeing memory graphs)
+    b) Flame Chart View is selected (allows seeing where execution time is spent)
+    c) Only "Memory" is selected from the options
 4)  Click the solid gray record button to begin capturing data
 5)  Visit `http://www.stackoverflow.com` (or your favourite website)
 6)  Click the now-red record button to stop capturing data
@@ -64,6 +63,7 @@ when Chrome performs its Mark & Sweep algorithm:
 10) Now look for the yellow event called "GC Event": `http://i.imgur.com/3ieSxIZ.png`
 11) Clicking this event will reveal information about total memory garbage
     collected, and how long it took.
+```
 
 One particularly interesting thing of note here is the length of time Garbage
 Collection can take: Often well beyond the 16ms maximum required to keep it

diff --git a/exercises/garbage-collection/solution.md → exercises/garbage-collection/en/solution.md b/exercises/garbage-collection/solution.md → exercises/garbage-collection/en/solution.md
diff --git a/exercises/garbage-collection/index.js b/exercises/garbage-collection/index.js
@@ -1,7 +1,6 @@
 var problem = require('../../problem');
 
 module.exports = {
-  title: 'Garbage Collection',
   problem: problem(__dirname, function (args, t) {
     t.end();
   })

diff --git a/exercises/global-scope-and-shadowing/fail.md → ...ses/global-scope-and-shadowing/en/fail.md b/exercises/global-scope-and-shadowing/fail.md → ...ses/global-scope-and-shadowing/en/fail.md
diff --git a/exercises/global-scope-and-shadowing/pass.md → ...ses/global-scope-and-shadowing/en/pass.md b/exercises/global-scope-and-shadowing/pass.md → ...ses/global-scope-and-shadowing/en/pass.md
diff --git a/...ses/global-scope-and-shadowing/problem.md → .../global-scope-and-shadowing/en/problem.md b/...ses/global-scope-and-shadowing/problem.md → .../global-scope-and-shadowing/en/problem.md
@@ -1,5 +1,3 @@
-# Global Scope & Shadowing
-
 ## Global Scope
 
 Understanding where Scope Chains end is an important part of scoping. All

diff --git a/...es/global-scope-and-shadowing/solution.md → ...global-scope-and-shadowing/en/solution.md b/...es/global-scope-and-shadowing/solution.md → ...global-scope-and-shadowing/en/solution.md
diff --git a/exercises/global-scope-and-shadowing/index.js b/exercises/global-scope-and-shadowing/index.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     asciiScope = require('../../util/ascii-scope');
 
 module.exports = {
-  title: 'Global Scope & Shadowing',
   problem: problem(__dirname, function (args, t) {
 
     var file = path.resolve(args[0]);

diff --git a/exercises/scope-chains/fail.md → exercises/scope-chains/en/fail.md b/exercises/scope-chains/fail.md → exercises/scope-chains/en/fail.md
diff --git a/exercises/scope-chains/pass.md → exercises/scope-chains/en/pass.md b/exercises/scope-chains/pass.md → exercises/scope-chains/en/pass.md
diff --git a/exercises/scope-chains/problem.md → exercises/scope-chains/en/problem.md b/exercises/scope-chains/problem.md → exercises/scope-chains/en/problem.md
@@ -1,5 +1,3 @@
-# Scope Chains
-
 ## Nesting
 
 Scopes can be nested. Both Lexical and Block scopes can contain other scopes:

diff --git a/exercises/scope-chains/solution.md → exercises/scope-chains/en/solution.md b/exercises/scope-chains/solution.md → exercises/scope-chains/en/solution.md
diff --git a/exercises/scope-chains/index.js b/exercises/scope-chains/index.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     asciiScope = require('../../util/ascii-scope');
 
 module.exports = {
-  title: 'Scope Chains',
   problem: problem(__dirname, function (args, t) {
 
     var file = path.resolve(args[0]);

diff --git a/exercises/scopes/fail.md → exercises/scopes/en/fail.md b/exercises/scopes/fail.md → exercises/scopes/en/fail.md
diff --git a/exercises/scopes/pass.md → exercises/scopes/en/pass.md b/exercises/scopes/pass.md → exercises/scopes/en/pass.md
diff --git a/exercises/scopes/problem.md → exercises/scopes/en/problem.md b/exercises/scopes/problem.md → exercises/scopes/en/problem.md
@@ -10,7 +10,7 @@ them all along without realising.
 
 ----
 
-# Scopes
+## __{currentExercise.name}__ (_{progress.state_resolved}_)
 
 The main type of scope in Javascript is Lexical Scoping. Present in the language
 from the very beginning, this is the scope created within a function, and the
@@ -64,3 +64,4 @@ solution.
  * [1]: There are also 4 other scopes in the language: Global, `with`, `catch`,
         and `eval`. These tend not to be used much, so we will ignore them.
  * [2]: This workshop will concentrate only on Lexical Scoping.
+
diff --git a/exercises/scopes/solution.md → exercises/scopes/en/solution.md b/exercises/scopes/solution.md → exercises/scopes/en/solution.md
diff --git a/exercises/scopes/index.js b/exercises/scopes/index.js
@@ -4,7 +4,6 @@ var fs = require('fs'),
     asciiScope = require('../../util/ascii-scope');
 
 module.exports = {
-  title: 'Scopes',
   problem: problem(__dirname, function (args, t) {
 
     var file = path.resolve(args[0]);

diff --git a/package.json b/package.json
@@ -2,14 +2,17 @@
   "name": "scope-chains-closures",
   "version": "1.0.4",
   "description": "Javascript Scope Chains And Closures Workshop",
-  "main": "runner.js",
+  "main": "scope-chains-closures.js",
   "bin": {
-    "scope-chains-closures": "runner.js",
-    "sccjs": "runner.js"
+    "scope-chains-closures": "bin/scope-chains-closures",
+    "sccjs": "bin/scope-chains-closures"
   },
   "engineStrict": true,
   "preferGlobal": true,
-  "repository": "jesstelford/scope-chains-closures",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jesstelford/scope-chains-closures.git"
+  },
   "bugs": "https://github.com/jesstelford/scope-chains-closures/issues",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -27,11 +30,11 @@
   "author": "Jess Telford <[email protected]> (http://jes.st)",
   "license": "MIT",
   "dependencies": {
-    "adventure": "^2.10.0",
     "adventure-verify": "^2.2.0",
     "babel-core": "^5.4.3",
     "escope": "^1.0.3",
     "estraverse": "^4.1.0",
-    "msee": "^0.1.1"
+    "msee": "^0.1.1",
+    "workshopper-adventure": "^4.7.0"
   }
 }
diff --git a/problem.js b/problem.js
@@ -1,19 +1,18 @@
-var msee = require('msee'),
-    path = require('path'),
+var path = require('path'),
     verify = require('adventure-verify');
 
 module.exports = function(dir, testCorrect) {
 
   var problem = {
+    init: function (exercise) {
+      ['problem', 'solution', 'pass', 'fail'].forEach(function(type) {
+        problem[type] = {
+          file: path.join(dir, exercise.i18n.lang(), type + '.md')
+        }
+      });
+    },
     verify: verify({ modeReset: true }, testCorrect)
   };
 
-  ['problem', 'solution', 'pass', 'fail'].forEach(function(type) {
-    problem[type] = msee.parseFile(
-      dir + '/' + type + '.md',
-      {paragraphEnd: '\n\n'}
-    );
-  });
-
   return problem;
 };
diff --git a/runner.js b/runner.js
diff --git a/scope-chains-closures.js b/scope-chains-closures.js
@@ -0,0 +1,30 @@
+'use strict';
+
+var packageJson = require('./package.json'),
+    adventure = require('workshopper-adventure/adventure');
+
+var shop = adventure({
+  name: packageJson.name,
+  appDir: __dirname,
+  languages: ['en'],
+  header: require('workshopper-adventure/default/header'),
+  footer: [
+    {text: '---', type: 'md'},
+    require('workshopper-adventure/default/footer')
+  ]
+});
+
+[
+  'Scopes',
+  'Scope Chains',
+  'Global Scope & Shadowing',
+  'Closures',
+  'Garbage Collection'
+].forEach(function(title, index) {
+  shop.add(title, function() {
+    var folder = title.replace(/\s/ig, '-').replace(/\&/ig, 'and')
+    return require('./exercises/' + folder).problem
+   });
+ })
+
+module.exports = shop
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env node

		require('../scope-chains-closures.js').execute(process.argv.slice(2));