new challenges, rename entry point file

sethvincent · sethvincent · commit e782b568b115 · 2014-09-28T21:09:43.000-07:00
diff --git a/index.js b/index.js
@@ -7,7 +7,7 @@ var jsing = adventure('javascripting');
 var problems = require('./menu.json');
 
 problems.forEach(function (prob) {
-  var p = prob.toLowerCase().replace(' ', '_');
+  var p = prob.toLowerCase().replace(' ', '-');
   var dir = path.join(__dirname, 'problems', p);
   jsing.add(prob, function () { return require(dir); });
 });
diff --git a/menu.json b/menu.json
@@ -5,10 +5,12 @@
   "STRING LENGTH",
   "REVISING STRINGS",
   "NUMBERS",
+  "ROUNDING NUMBERS",
   "NUMBER TO STRING",
   "FOR LOOP",
   "ARRAYS",
   "ARRAY FILTERING",
+  "LOOPING THROUGH ARRAYS",
   "OBJECTS",
   "OBJECT PROPERTIES",
   "OBJECT KEYS",
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   },
   "author": "sethvincent",
   "bin": {
-    "javascripting": "runner.js"
+    "javascripting": "index.js"
   },
   "dependencies": {
     "adventure": "^2.8.0",
diff --git a/problems/introduction/index.js b/problems/introduction/index.js
@@ -4,11 +4,11 @@ var md = require('cli-md');
 var run = require('../../run-solution');
 
 exports.problem = md(
-  fs.readFileSync(path.join(__dirname, 'problem.md'), 'utf8')
+  fs.readFileSync(path.join(__dirname, 'problem.md')).toString()
 );
 
 exports.solution = md(
-  fs.readFileSync(path.join(__dirname, 'solution.md'), 'utf8')
+  fs.readFileSync(path.join(__dirname, 'solution.md')).toString()
 );
 
 exports.verify = function (args, cb) {
diff --git a/problems/introduction/problem.md b/problems/introduction/problem.md
@@ -27,7 +27,5 @@ Check to see if your program is correct by running this command:
   
 
   
-> **Need help?**
-> View the README for this workshop: github.com/sethvincent/javascripting
+> **Need help?** View the README for this workshop: github.com/sethvincent/javascripting
 
----
diff --git a/problems/introduction/solution.md b/problems/introduction/solution.md
@@ -2,14 +2,20 @@
 
 # YOU DID IT!
 
-In the upcoming challenges we'll describe more in depth what's happening.
+Anything between the parentheses of `console.log()` are printed to the terminal.
 
-## The most important bit for now:
+So this: 
 
-`console.log()` prints the values that are between the parentheses to the terminal.
+```js
+console.log('hello');
+```
 
-So `console.log("COOOOL")` will print `COOOOL` the terminal.
+prints `hello` to the terminal.
 
-We will use this in many of the upcoming challenges.
+Currently we are printing a **string** of characters to the terminal: `hello`.
+
+In the next challenge we focus on learning about **strings**.
+
+Run `javascripting` in the console to choose the next challenge.
 
 ---
diff --git a/problems/string-length/index.js b/problems/string-length/index.js
@@ -13,7 +13,8 @@ exports.solution = md(
 
 exports.verify = function (args, cb) {
   run(args[0], function (err, result) {
-    if (/hello/.test(result)) cb(true);
+    console.log(typeof result)
+    if (result == 14) cb(true);
     else cb(false);
   });
 };
diff --git a/problems/string-length/problem.md b/problems/string-length/problem.md
@@ -1,5 +1,30 @@
 ---
 
-#
+# STRING LENGTH
+
+You will often need to know how many characters are in a string.
+
+For this you will use thing `.length` property. Here's an example:
+
+```js
+var example = 'example string';
+example.length
+```
+
+Make sure there is a period between `example` and `length`.
+
+The above code will return a **number** for the total number of characters in the string.
+
+Create a file named string-length.js.
+
+In that file, create a variable named `example`.
+
+Make the `example` variable reference the string `this is an example`.
+
+Use `console.log` to print the **length** of the string to the terminal.
+
+**Check to see if your program is correct by running this command:**
+
+`javascripting verify strings.js`
 
 ---
diff --git a/problems/string-length/solution.md b/problems/string-length/solution.md
@@ -1,5 +1,9 @@
 ---
 
-#
+# WIN: 14 CHARACTERS
+
+You got it! The string `this is an example` has 14 characters.
+
+Run `javascripting` in the console to choose the next challenge.
 
 ---
diff --git a/problems/strings/index.js b/problems/strings/index.js
@@ -13,7 +13,7 @@ exports.solution = md(
 
 exports.verify = function (args, cb) {
   run(args[0], function (err, result) {
-    if (/hello/.test(result)) cb(true);
+    if (/this is a string/.test(result)) cb(true);
     else cb(false);
   });
 };
diff --git a/problems/strings/problem.md b/problems/strings/problem.md
@@ -1,5 +1,29 @@
 ---
 
-#
+# STRINGS
+
+A **string** is any value surrounded by quotes.
+
+It can be single or double quotes:
+
+```js
+'this is a string'
+
+"this is also a string"
+```
+
+Try to stay consistent. In this workshop we'll only use single quotes.
+
+For this challenge, create a file named `strings.js`.
+
+In that file create a variable named `someString` like this:
+
+```js
+var someString = 'this is a string';
+```
+
+Check to see if your program is correct by running this command:
+
+`javascripting verify strings.js`
 
 ---
diff --git a/problems/strings/solution.md b/problems/strings/solution.md
@@ -1,5 +1,11 @@
 ---
 
-#
+# SUCCESS.
+
+You are getting used to this string stuff!
+
+In the next challenges we will cover how to manipulate strings.
+
+Run `javascripting` in the console to choose the next challenge.
 
 ---
diff --git a/problems/variables/index.js b/problems/variables/index.js
@@ -13,7 +13,7 @@ exports.solution = md(
 
 exports.verify = function (args, cb) {
   run(args[0], function (err, result) {
-    if (/hello/.test(result)) cb(true);
+    if (/some string/.test(result)) cb(true);
     else cb(false);
   });
 };
diff --git a/problems/variables/problem.md b/problems/variables/problem.md
@@ -1,5 +1,34 @@
 ---
 
-#
+# VARIABLES
 
+A variable is a reference to a value. Define a variable using the `var` keyword.
+
+Here's an example:
+
+```js
+var example;
+```
+
+The above variable is **declared**, but it isn't defined.
+
+Here's an example of defining a variable, making it reference a specific value:
+
+```js
+var example = 'some string';
+```
+
+Note that it starts with the `var` keyword and uses the equals sign between the variable name and the value that it references.
+
+For this challenge, create a file named `variables.js`.
+
+In that file create a variable named `example`.
+
+**Make the `example` variable reference the value `some string`.**
+
+Then use `console.log()` to print the `example` variable to the console.
+
+Check to see if your program is correct by running this command:
+
+`javascripting verify variables.js`
 ---
diff --git a/problems/variables/solution.md b/problems/variables/solution.md
@@ -1,5 +1,11 @@
 ---
 
-#
+# YOU CREATED A VARIABLE!
+
+Nice work. 
+
+In the next challenge we will look at strings more closely.
+
+Run `javascripting` in the console to choose the next challenge.
 
 ---
diff --git a/solutions/string-length/index.js b/solutions/string-length/index.js
@@ -0,0 +1,2 @@
+var example = 'example string';
+console.log(example.length);
diff --git a/solutions/strings/index.js b/solutions/strings/index.js
@@ -0,0 +1 @@
+console.log('this is a string');
diff --git a/solutions/variables/index.js b/solutions/variables/index.js
@@ -0,0 +1,2 @@
+var example = 'some string';
+console.log(example);
