Skip to content

Commit 5ac672a

Browse files
committed
Additional Rails 5 installfest tweaks
* Ensure Windows users get the 2.2 installer (Rails 5 requires 2.2.2+) * Try to ensure everywhere with version numbers says Ruby 2.2+ and Rails 5.0.x * WEBrick -> puma
1 parent b698a69 commit 5ac672a

File tree

8 files changed

+19
-19
lines changed

8 files changed

+19
-19
lines changed

sites/en/installfest/_ruby-and-rails-glossary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
**rails new** _NameApp_ Creates a new Rails application with the entire Rails directory structure to run your application.
44

5-
**rails server (or rails s)** Launches a small web server named WEBrick that you will use any time you want to access your application through a web browser.
5+
**rails server (or rails s)** Launches a web server named Puma that you will use any time you want to access your application through a web browser.
66

77
**rails generate (or rails g)** Uses templates to create a bunch of directories and files in your application.
88

sites/en/installfest/create_a_rails_app.step

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tip do
2-
console_with_message "From here on, this guide assumes you have Rails 4.2.x. To check your Rails version, type this in the terminal:", "rails -v"
3-
fuzzy_result "Rails 4.{FUZZY}2.x{/FUZZY}"
4-
message "If your computer reports a Rails version less than 4.0, ask a TA help get you back on track."
2+
console_with_message "From here on, this guide assumes you have Rails 5.0.x. To check your Rails version, type this in the terminal:", "rails -v"
3+
fuzzy_result "Rails 5.0{FUZZY}.x{/FUZZY}"
4+
message "If your computer reports a Rails version less than 5.0, ask a TA help get you back on track."
55
end
66

77
step "Change to your home directory" do

sites/en/installfest/deploy_a_rails_app.step

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ bundle install --without production
152152
console "heroku run rake db:migrate"
153153

154154
result <<-OUTPUT
155-
Migrating to CreateDrinks (20120428044153)
156-
== CreateDrinks: migrating ===================================================
155+
Migrating to CreateDrinks (20160706063236)
156+
== 20160706063236 CreateDrinks: migrating =====================================
157157
-- create_table(:drinks)
158158
-> 0.0084s
159-
== CreateDrinks: migrated (0.0085s) ==========================================
159+
== 20160706063236 CreateDrinks: migrated (0.0085s) ============================
160160
OUTPUT
161161

162162
message "The long number after CreateDrinks is a timestamp. Yours will be different!"

sites/en/installfest/get_a_sticker.step

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ step "Have a volunteer check your tool versions" do
1414
h3 "On all operating systems:"
1515

1616
console "ruby -v"
17-
fuzzy_result "ruby {FUZZY}1.9.3p125 (2012-02-16 revision 34643) [x86_64-darwin11.3.0]{/FUZZY}"
17+
fuzzy_result "ruby 2.2.{FUZZY}4p230 (2015-12-16 revision 53155) [x86_64-darwin13]{/FUZZY}"
1818

19-
tip "Depending on your environment, your Ruby version might be **2.1** or **2.2**. As long as it's 1.9.3 or above, you're good to go."
19+
tip "Depending on your environment, your Ruby version might be **2.2** or **2.3**. As long as it's 2.2.2 or above, you're good to go."
2020

2121
console "bundle -v"
2222
fuzzy_result "Bundler version 1{FUZZY}.x.x{/FUZZY}"
2323

2424
console "rails -v"
25-
fuzzy_result "Rails 4.2{FUZZY}.x{/FUZZY}"
25+
fuzzy_result "Rails 5.0{FUZZY}.x{/FUZZY}"
2626

27-
tip 'The RailsBridge curriculum is written for Rails 4, so if you still have Rails 3.x, you need to install Rails 4 with `gem install rails`.'
27+
tip 'The RailsBridge curriculum is written for Rails 5, so if you still have Rails 4.x or earlier, you need to install Rails 5 with `gem install rails`.'
2828
end
2929
end
3030

sites/en/installfest/windows.step

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MARKDOWN
66

77
step "Run RailsInstaller" do
88
message "RailsInstaller includes Rails, Ruby, Git and SQLite."
9-
message "Go to <http://railsinstaller.org/>, scroll to the 'Downloads' section, and download the RailsInstaller for Windows/Ruby 2.1."
9+
message "Go to <http://railsinstaller.org/>, scroll to the 'Downloads' section, and download the RailsInstaller for Windows/Ruby 2.2."
1010
message "Click on the downloaded file to run the install wizard. Click Next at each step to accept the defaults."
1111
message "Be sure to check the boxes for *Install git (recommended)* and *Add executables for Ruby, DevKit Git (if checked above) to the PATH*"
1212

@@ -143,10 +143,10 @@ end
143143
step "Sanity Check" do
144144

145145
console "ruby -v"
146-
fuzzy_result "ruby 2.1.5{FUZZY}p125{/FUZZY}"
146+
fuzzy_result "ruby 2.2{FUZZY}.4{/FUZZY}"
147147

148148
console "rails -v"
149-
fuzzy_result "Rails 4.2{FUZZY}.x{/FUZZY}"
149+
fuzzy_result "Rails 5.0{FUZZY}.x{/FUZZY}"
150150

151151
console "git --version"
152152
fuzzy_result "git version 2{FUZZY}.5.0.windows.1{/FUZZY}"

sites/en/intro-to-rails/hooking_up_votes_and_topics.step

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ end
4444

4545
result <<-CONSOLE
4646
$ rails c
47-
Loading development environment (Rails 4.2.0)
48-
2.1.5 :001 >
47+
Loading development environment (Rails 5.0.0)
48+
2.3.0 :001 >
4949
CONSOLE
5050

5151
message "At the console, try the following things"

sites/en/intro-to-rails/intro-to-rails.step

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ day. Probably.
3838

3939
We're going to be working with:
4040

41-
* Ruby 2.1 or 2.2 installed via RVM (Mac or Linux) or RailsInstaller (Windows)
42-
* Rails 4.2.x
41+
* Ruby 2.2 or 2.3 installed via RVM (Mac or Linux) or RailsInstaller (Windows)
42+
* Rails 5.0.x
4343
* Bundler
4444
* SQLite
4545
* The text editor of your choice

sites/en/learn-to-code/learn-to-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Follow along at http://docs.railsbridge.org/learn-to-code
6767
* Ask for SSID and password
6868
* a live Ruby installation
6969
* e.g. http://railsinstaller.org -- click on the *BIG GREEN BUTTON*
70-
* Ruby version 2.1 preferred, but 1.9 is fine too
70+
* Ruby version 2.3 preferred, but 1.9+ is fine too
7171
* run `ruby -v` to check
7272
* a text editor
7373
* e.g. Sublime Text 2

0 commit comments

Comments
 (0)