diff --git a/Gemfile b/Gemfile index c9af78d28..1c3ef5dfb 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source :rubygems gem "erector", "~>0.9.0" gem "sinatra" gem "nokogiri" -gem "rdiscount" +gem "rdiscount", "1.6.8" gem "thin" gem "eventmachine", "1.0.0.rc.4" gem 'rack-codehighlighter' diff --git a/Gemfile.lock b/Gemfile.lock index 7de7ba1bf..fe36181c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,97 +1,82 @@ GEM remote: http://rubygems.org/ specs: - ParseTree (3.0.8) - RubyInline (>= 3.7.0) - sexp_processor (>= 3.0.0) - RubyInline (3.11.2) - ZenTest (~> 4.3) - ZenTest (4.7.0) - bourbon (1.4.0) - sass (>= 3.1) - coderay (1.0.5) - daemons (1.1.8) - deckrb (0.3.0) + bourbon (3.1.0) + sass (>= 3.2.0) + thor + coderay (1.0.8) + daemons (1.1.9) + deckrb (0.5.0) coderay - erector (>= 0.9.0.pre1) + erector (>= 0.9.0) json nokogiri - rack + rack (>= 1.4.1) rack-codehighlighter redcarpet (~> 2) + thin trollop diff-lcs (1.1.3) erector (0.9.0) treetop (>= 1.2.3) eventmachine (1.0.0.rc.4) - eventmachine (1.0.0.rc.4-x86-mingw32) - file-tail (1.0.8) - tins (~> 0.3) - files (0.3.0) - json (1.6.6) - nokogiri (1.5.2) - nokogiri (1.5.2-x86-mingw32) + files (0.3.1) + json (1.7.6) + listen (0.7.2) + nokogiri (1.5.6) polyglot (0.3.3) predicated (0.2.6) - rack (1.4.1) + rack (1.5.2) rack-codehighlighter (0.5.0) nokogiri (>= 1.4.1) rack (>= 1.0.0) - rack-protection (1.2.0) + rack-protection (1.3.2) rack - rack-test (0.6.1) + rack-test (0.6.2) rack (>= 1.0) - rake (0.9.2.2) + rake (10.0.3) rdiscount (1.6.8) - redcarpet (2.1.1) - rerun (0.6.5) - rspec (2.9.0) - rspec-core (~> 2.9.0) - rspec-expectations (~> 2.9.0) - rspec-mocks (~> 2.9.0) - rspec-core (2.9.0) - rspec-expectations (2.9.0) + redcarpet (2.2.2) + rerun (0.8.0) + listen + rspec (2.12.0) + rspec-core (~> 2.12.0) + rspec-expectations (~> 2.12.0) + rspec-mocks (~> 2.12.0) + rspec-core (2.12.2) + rspec-expectations (2.12.1) diff-lcs (~> 1.1.3) - rspec-mocks (2.9.0) - ruby2ruby (1.3.1) - ruby_parser (~> 2.0) - sexp_processor (~> 3.0) - ruby_parser (2.0.6) - sexp_processor (~> 3.0) - sass (3.1.15) - sexp_processor (3.1.0) - sinatra (1.3.2) - rack (~> 1.3, >= 1.3.6) - rack-protection (~> 1.2) + rspec-mocks (2.12.2) + ruby2ruby (2.0.3) + ruby_parser (~> 3.1) + sexp_processor (~> 4.0) + ruby_parser (3.1.1) + sexp_processor (~> 4.1) + sass (3.2.5) + sexp_processor (4.1.4) + sinatra (1.3.4) + rack (~> 1.4) + rack-protection (~> 1.3) tilt (~> 1.3, >= 1.3.3) - sourcify (0.5.0) - file-tail (>= 1.0.5) - ruby2ruby (>= 1.2.5) - ruby_parser (>= 2.0.5) - sexp_processor (>= 3.0.5) - thin (1.3.1) + thin (1.5.0) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) + thor (0.17.0) tilt (1.3.3) - tins (0.3.12) treetop (1.4.12) polyglot polyglot (>= 0.3.1) - trollop (1.16.2) - wrong (0.6.2) - ParseTree (~> 3.0) + trollop (2.0) + wrong (0.7.0) diff-lcs (~> 1.1.2) - file-tail (~> 1.0) - predicated (>= 0.2.3) - ruby2ruby (~> 1.2) - ruby_parser (~> 2.0.4) - sexp_processor (~> 3.0) - sourcify (>= 0.3.0) + predicated (~> 0.2.6) + ruby2ruby (>= 2.0.1) + ruby_parser (>= 3.0.1) + sexp_processor (>= 4.0) PLATFORMS ruby - x86-mingw32 DEPENDENCIES bourbon @@ -104,7 +89,7 @@ DEPENDENCIES rack-codehighlighter rack-test rake - rdiscount + rdiscount (= 1.6.8) rerun rspec sass diff --git a/sites/installfest/installfest.step b/sites/installfest/installfest.step index cae1cae9d..7c17c0d2c 100644 --- a/sites/installfest/installfest.step +++ b/sites/installfest/installfest.step @@ -1,4 +1,4 @@ -message "This [InstallFest](http://installfest.railsbridge.org) is a set of step-by-step instructions for installing Ruby, Rails, and other important tools on Mac, Windows, or Linux computers. Originally developed for the [Railsbridge Workshops](http://railsbridge.org), it is a community-supported open-source documentation project. If you want to contribute, click the [git] link at the top-right corner of any page and submit your change on GitHub." +message "This [InstallFest](http://ruby201.herokuapp.com/installfest) is a set of step-by-step instructions for installing Ruby, Rails, and other important tools on Mac, Windows, or Linux computers. Originally developed for the [Railsbridge Workshops](http://railsbridge.org), it is a community-supported open-source documentation project. If you want to contribute, click the [git] link at the top-right corner of any page and submit your change on GitHub." step "Prepare for the Install Fest" do message <<-MARKDOWN diff --git a/sites/intermediate-rails/intermediate-rails.step b/sites/intermediate-rails/intermediate-rails.step index 3bd8fc5bd..61d7e485e 100644 --- a/sites/intermediate-rails/intermediate-rails.step +++ b/sites/intermediate-rails/intermediate-rails.step @@ -2,8 +2,8 @@ message <<-MARKDOWN # Let's build a message board! ## Assumptions made by this curriculum -* You’ve gone through the standard RailsBridge installfest and have successfully completed the [Get a Sticker](http://installfest.railsbridge.org/installfest/get_a_sticker) step. -* You’ve gone through the RailsBridge [Suggestotron curriculum](http://installfest.railsbridge.org/curriculum/) at least once before, or maybe a couple of times, or maybe you feel decently comfortable with Rails for some other reason. +* You’ve gone through the standard RailsBridge installfest and have successfully completed the [Get a Sticker](http://ruby201.herokuapp.com/installfest/get_a_sticker) step. +* You’ve gone through the RailsBridge [Suggestotron curriculum](http://ruby201.herokuapp.com/curriculum/) at least once before, or maybe a couple of times, or maybe you feel decently comfortable with Rails for some other reason. * You want to learn more Rails!!! ## Goals diff --git a/sites/workshop/closing.deck.md b/sites/workshop/closing.deck.md index 4721dbf88..7f8fe3814 100644 --- a/sites/workshop/closing.deck.md +++ b/sites/workshop/closing.deck.md @@ -1,17 +1,7 @@ -# You have completed RailsBridge #38! +# You have completed a RailsBridge! * Congratulations! - - -# Please thank our awesome sponsor! -![EngineYard](img/ey_logo_rgb.png) - - -# Celebrate! -* After-party -* Conference Party - # What did we learn? * Ruby as a language @@ -24,12 +14,7 @@ * http://pinterest.com/pvnrtmol/ruby-and-rails-resources/ * http://pinterest.com/eanakashima/learn-the-front-end/ * Follow-up: -* Ruby Users of Minnesota — a fine group of Ruby enthusiasts from around the Twin Cities metro area, or pretty much wherever they feel like driving from. Our group meets on the last Monday of each month at 7 PM http://ruby.mn/ +* RubyMKE - Local group of Ruby users. Meets 3rd Monday of each month. http://rubymke.org * RailsBridge IRC channel * DevChix E-mail list http://www.devchix.com/ -* Systers mailing list -* Want to organize a workshop? join railsbridge-workshops@googlegroups.com - - -# RIGHT NOW -* TAKE THIS SURVEY RIGHT NOW: http://bit.ly/workshop_survey +* Want to organize a workshop? Join railsbridge-workshops@googlegroups.com diff --git a/sites/workshop/welcome.deck.md b/sites/workshop/welcome.deck.md index e463c7dfa..46b5b9b33 100644 --- a/sites/workshop/welcome.deck.md +++ b/sites/workshop/welcome.deck.md @@ -22,7 +22,9 @@ # Why are we here? -We want the community of software developers to reflect the diversity of our society +* We want to grow the local Ruby community +* We want the community of software developers to reflect the diversity of our society +* We want to have fun! # Why are we here? @@ -93,8 +95,8 @@ We want the community of software developers to reflect the diversity of our soc # Materials -* Slides: -* Suggestotron Curriculum: +* Slides: +* Suggestotron Curriculum: # What will you learn today? @@ -102,6 +104,6 @@ We want the community of software developers to reflect the diversity of our soc * understanding the Ruby programming language * Rails * learn tools and patterns for building web apps in Ruby on Rails - + --- Proceed to next slide deck: [Today's Workshop Info and Schedule](current)