use deck instead of showoff; updates for new 6-week night class

000_setup.md

@@ -1,5 +1,3 @@
-
-<script src="file/shrink.js" />
 <style>
 pre, pre.sh_sourceCode { background-color: #e5e5ef; border: 1px solid #999; }
 </style>

README.md

@@ -8,44 +8,52 @@ Alex Chaffee <alex@stinky.com>
 
 # Showing the slides
 
-We use a Ruby app called `showoff` to generate and serve the slides.
+We use a Ruby app called `deck` to generate and serve the slides. Install deck like this:
 
-Alex has been improving showoff; until his latest patches get accepted and released, you will have to download and install his version, as follows:
+    gem install deck
 
-    gem uninstall -a showoff  # if this fails with "cannot uninstall", don't worry and just continue
-    gem install showoff-alexch
-
-After installing, run
-
-    showoff serve --split
+## Showing all the slides
 
-This will launch a local Sinatra server on port 9090. Open your browser to `localhost:9090`. 
+    deck run showoff.json
+
+This will launch a local web server on port 4333. Open your browser to `localhost:4333`. 
 
 On a Mac you can run:
 
-    open http://localhost:9090
+    open http://localhost:4333
 
 On Windows I think you can run:
 
-    start http://localhost:9090
+    start http://localhost:4333
 
 Use arrow keys to navigate slides. Press '?' to see a help window.
 
-# Editing slides
+## Showing some of the slides
 
-Slides are in [Markdown](http://daringfireball.net/projects/markdown/syntax) format. Showoff will read all `.md` files in alphabetical order.
+Same as above, but specify the slide files you want, e.g.
 
-You can also add custom `.css`, `.scss`, and `.js` files, which will get imported into all slide sections.
+    deck run ruby-basics/strings.md
 
-Images should be in, or relative to, the current directory.
+or 
+
+    deck run ruby-objects/objects.md ruby-objects/classes.md
+
+
+# Editing slides
 
+Slides are in [Markdown](http://daringfireball.net/projects/markdown/syntax) format.
+
+Image files should be in, or relative to, the same directory as the slide source file that refers to them.
+
+<!--
 # Printing slides
 
 Try this: first `gem install pdfkit`, then visit
 
     http://localhost:9090/pdf
 
 but I make no guarantees!
+-->
 
 ## Based upon and/or inspired by
 
@@ -57,19 +65,3 @@ but I make no guarantees!
 # LICENSE
 
 This project is under an open source license. We're not sure exactly which one... probably MIT.
-
-Gill Sans is under copyright. It's a great slide font and it comes with all recent Macs (and Gill Sans MT comes with MS Office).
-
-Here is Gill Sans licensing info
-  <http://www.fontslive.com/font/gill-sans-family.aspx>
-  <http://www.ascendercorp.com/font/gill-sans/>
-
-"The Gill Sans stack should work on most all computers. Gill Sans comes on all
-Macs and Gill Sans MT is installed with Microsoft Office, and Calibri (which
-is a good stand-in for Gill Sans) is one the core Vista fonts and is installed
-with both Office Windows and Office Mac. And lastly, if all else fails, use
-Trebuchet" - <http://www.artsiteframework.com/guide/fontstacks.php> -- the stack
-he's talking about is
-
-    "Gill Sans", "Gill Sans MT", GillSans, Calibri, "Trebuchet MS", sans-serif
-

credits.md

@@ -10,6 +10,6 @@
   * _Learn to Program_ by Chris Pine <http://pine.fm/LearnToProgram/> <http://pragprog.com/book/ltp2/learn-to-program> <http://amzn.com/1934356360>
 * Open-Source License
   * either MIT or Apache or CC-BY-NC; we're still deciding
-* Presentation Engine:
-  * [showoff](https://github.com/schacon/showoff) by Scott Chacon (with improvements by Alex Chaffee)
+* Presentation Engine(s):
+  * [deck.rb](https://github.com/alexch/deck.rb) by Alex Chaffee
 

night_class.md

@@ -10,13 +10,15 @@ In Collaboration with Blazing Cloud
 
 # Schedule
 
-## Night One: Ruby Basics
+## Night 1-2: Ruby Basics
 
-## Night Two: Built-in Types
+## Night 3-4: Built-in Types
 
-## Night Three: Iterators
+## Night 5: Blocks
 
-## Night Four: The Ruby Object Model
+## Night 6: Iterators
+
+## Night 7-8: Objects
 
 ## Textbook: The Well-Grounded Rubyist
 
@@ -58,13 +60,17 @@ Conceived by Sarah Allen and Alex Chaffee
 
 # Let's get started
 
-Install Ruby, then open a terminal window and type this:
+Install Ruby, e.g.
+
+    http://installfest.railsbridge.org
+
+then open a terminal window and type this:
 
     git clone https://github.com/alexch/learn_ruby.git
 
     cd learn_ruby
 
-then open index.html in a browser
+then open `index.html` in a browser
 
 # Very Important Tips!
 

ruby-advanced/more_blocks.md

@@ -45,3 +45,7 @@
 * just muddle along and things will probably work ok
 
 
+# Block Parameters
+
+* Can use splats and defaults and tuples
+* There's also a lot of weird options, see <http://www.paperplanes.de/2012/2/16/fun-with-ruby-block-parameters.html>

ruby-intro.md

@@ -52,7 +52,7 @@ I tried to make people enjoy programming and concentrate on the fun and creative
 # Versions common today
 
 * MRI 1.8.7
-* MRI 1.9.2
+* MRI 1.9.2 or 1.9.3
 * JRuby
 
 # Ruby Language Overview

showoff-8night.json

@@ -0,0 +1,96 @@
+{
+  "name": "Ruby For Programmers",
+  "description": "an eight-night introduction to the Ruby programming language",
+  "sections": [
+    "000_setup.md",
+    "night_class.md",
+    "credits.md",
+
+    "ruby-intro.md",
+
+    "ruby-basics/tools.md",
+    "ruby-basics/rspec.md",
+
+    "ruby-basics/more_neat_things.md",
+
+    "ruby-basics/functions.md",
+
+    "# Lab: Hello",
+
+    "ruby-basics/types.md",
+    "ruby-basics/numbers.md",
+
+    "# Lab: Temperature",
+    "# Lab: Calculator",
+
+    "ruby-basics/strings.md",
+
+    "# Lab: Simon Says",
+    "# Ablay: Igpay Atinlay",
+
+    "ruby-basics/symbols.md",
+    "ruby-basics/conditionals.md",
+    "ruby-basics/loops.md",
+
+    "# Lab: Mega Calculator",
+
+    "ruby-basics/collections.md",
+    "ruby-basics/arrays.md",
+    /* todo: lab on arrays */
+
+    "ruby-basics/ranges.md",
+    "ruby-basics/hashes.md",
+
+    /* todo: lab on hashes */
+
+    "ruby-basics/blocks.md",
+
+    "# Lab: Blocks, Performance Monitor",
+
+    "ruby-basics/iterators.md",
+
+    "ruby-basics/block_scope.md",
+
+
+    "ruby-basics/regexp.md",
+
+    "ruby-objects/waka-waka.md",
+
+    /* day two */
+
+    "ruby-objects/objects.md",
+    "ruby-objects/classes.md",
+
+    "# Labs:\n* Hello Friend\n* Temperature Object\n* Book Titles\n* Timer\n* Dictionary\n",
+
+    "# Lab:\n* RPN Calculator",
+
+    "ruby-objects/class_inheritance.md",
+    "ruby-objects/dispatch.md",
+
+    "# Lab:\n* XML Builder",
+
+    "ruby-objects/class_methods.md",
+
+    "ruby-objects/reopening_classes.md",
+
+    "# Labs:\n* Array Extensions\n* In Words\n",
+
+    "ruby-objects/modules.md",
+    "ruby-objects/scope.md",
+
+    "# Advanced Topics",
+
+    "ruby-basics/exceptions.md",
+    /* todo: exception exercise */
+
+    "ruby-advanced/more_blocks.md",
+    "ruby-basics/enumerators_advanced.md",
+    "ruby-objects/classes_as_objects.md"
+
+    /* "ruby-basics/time.md", */
+    /* "ruby-basics/io.md",  */
+    /* todo: file/io exercise, like scraper */
+
+  ]
+}

showoff.json

@@ -1,14 +1,14 @@
 {
   "name": "Ruby For Programmers",
-  "description": "an introduction to the Ruby programming language",
+  "description": "an eight-night introduction to the Ruby programming language",
   "sections": [
     "000_setup.md",
+    "night_class.md",
     "credits.md",
 
     "ruby-intro.md",
 
     "ruby-basics/tools.md",
-
     "ruby-basics/rspec.md",
 
     "ruby-basics/more_neat_things.md",
@@ -63,8 +63,6 @@
 
     "# Labs:\n* Hello Friend\n* Temperature Object\n* Book Titles\n* Timer\n* Dictionary\n",
 
-    "ruby-objects/reopening_classes.md",
-
     "# Lab:\n* RPN Calculator",
 
     "ruby-objects/class_inheritance.md",
@@ -74,9 +72,10 @@
 
     "ruby-objects/class_methods.md",
 
+    "ruby-objects/reopening_classes.md",
+
     "# Labs:\n* Array Extensions\n* In Words\n",
 
-
     "ruby-objects/modules.md",
     "ruby-objects/scope.md",