Skip to content

Commit 5f94e95

Browse files
committed
Run the docs on Ruby 2.3.3 now that there's a Railsinstaller version of it
Change Ruby 2.2 references to be 2.3
1 parent 02caaa7 commit 5f94e95

File tree

9 files changed

+18
-26
lines changed

9 files changed

+18
-26
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.4
1+
2.3.3

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: ruby
22
rvm:
3-
- 2.2.4
3+
- 2.3.3
44
cache: bundler
55
sudo: false

Gemfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
ruby '2.2.4'
3+
ruby '2.3.3'
44

55
gem 'activesupport'
66
gem "erector", "~> 0.10.0"
@@ -20,9 +20,6 @@ gem 'bootstrap-sass'
2020
gem 'jquery-cdn'
2121
gem 'sprockets'
2222

23-
# Relax this restriction if RailsInstaller starts packaging something after 2.2.4
24-
gem 'ruby_dep', '1.3.1'
25-
2623
group :development do
2724
gem "rspec"
2825
gem "rerun"

Gemfile.lock

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ GEM
4545
mini_portile2 (2.1.0)
4646
minitest (5.10.1)
4747
multi_json (1.12.1)
48-
nokogiri (1.6.8.1)
48+
nokogiri (1.7.0)
4949
mini_portile2 (~> 2.1.0)
5050
polyglot (0.3.5)
5151
rack (1.6.5)
@@ -126,7 +126,6 @@ DEPENDENCIES
126126
redcarpet
127127
rerun
128128
rspec
129-
ruby_dep (= 1.3.1)
130129
rubyzip
131130
sass
132131
sinatra (~> 1.4.0)
@@ -135,7 +134,7 @@ DEPENDENCIES
135134
thin
136135

137136
RUBY VERSION
138-
ruby 2.2.4p230
137+
ruby 2.3.3p222
139138

140139
BUNDLED WITH
141-
1.12.5
140+
1.13.7

lib/site_extensions/installfest.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@ module StepExtensions
22
module Installfest
33
def version_string(name)
44
case name
5-
when :minimum_ruby
6-
'2.2.2'
7-
when :osx_ruby_short
5+
when :ruby_short
86
'2.3'
9-
when :windows_ruby_short
10-
'2.2'
117
when :windows_rubygems_min
128
'2.6.7'
139
when :windows_rubygems_current
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
console <<-BASH
2-
rvm install #{version_string(:osx_ruby_short)}
2+
rvm install #{version_string(:ruby_short)}
33
BASH
44

55
message "This downloads and compiles Ruby, which takes a while."
66
console <<-BASH
7-
rvm use #{version_string(:osx_ruby_short)}
8-
rvm --default use #{version_string(:osx_ruby_short)}
7+
rvm use #{version_string(:ruby_short)}
8+
rvm --default use #{version_string(:ruby_short)}
99
BASH
1010

1111
verify do
1212
console "ruby -v"
13-
fuzzy_result "ruby #{version_string(:osx_ruby_short)}{FUZZY}.0p0 (2014-12-25 revision 49005) [x86_64-darwin13]{/FUZZY}"
13+
fuzzy_result "ruby #{version_string(:ruby_short)}{FUZZY}.0p0 (2014-12-25 revision 49005) [x86_64-darwin13]{/FUZZY}"
1414
end
1515

1616
div do
1717
h1 "Troubleshooting"
18-
important "If `rvm install #{version_string(:osx_ruby_short)}` says `autoreconf was not found in the PATH`" do
18+
important "If `rvm install #{version_string(:ruby_short)}` says `autoreconf was not found in the PATH`" do
1919
div do
2020
option_half "Mac OS" do
2121
console "brew install automake"
@@ -26,7 +26,7 @@ div do
2626
end
2727
end
2828

29-
message "Once that completes, retry `rvm install #{version_string(:osx_ruby_short)}`"
29+
message "Once that completes, retry `rvm install #{version_string(:ruby_short)}`"
3030
end
3131
end
3232

sites/en/installfest/get_a_sticker.step

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

1616
console "ruby -v"
17-
fuzzy_result "ruby 2.2{FUZZY}.4p230 (2015-12-16 revision 53155) [x86_64-darwin13]{/FUZZY}"
17+
fuzzy_result "ruby 2.3{FUZZY}.3p222 (2015-12-16 revision 53155) [x86_64-darwin13]{/FUZZY}"
1818

19-
tip "Depending on your environment, your Ruby version might be **2.2** or **2.3**. As long as it's #{version_string(:minimum_ruby)} or above, you're good to go."
19+
tip "As long as your Ruby version is #{version_string(:ruby_short)} or above, you're good to go."
2020

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

sites/en/installfest/windows.step

Lines changed: 2 additions & 2 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 #{version_string(:windows_ruby_short)}."
9+
message "Go to <http://railsinstaller.org/>, scroll to the 'Downloads' section, and download the RailsInstaller for Windows/Ruby #{version_string(:ruby_short)}."
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

@@ -142,7 +142,7 @@ end
142142
step "Sanity Check" do
143143

144144
console "ruby -v"
145-
fuzzy_result "ruby #{version_string(:windows_ruby_short)}{FUZZY}.4{/FUZZY}"
145+
fuzzy_result "ruby #{version_string(:ruby_short)}{FUZZY}.4{/FUZZY}"
146146

147147
console "rails -v"
148148
fuzzy_result "Rails 5.0{FUZZY}.x{/FUZZY}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ day. Probably.
3838

3939
We're going to be working with:
4040

41-
* Ruby 2.2 or 2.3 installed via RVM (Mac or Linux) or RailsInstaller (Windows)
41+
* Ruby 2.3 or greater installed via RVM (Mac or Linux) or RailsInstaller (Windows)
4242
* Rails 5.0.x
4343
* Bundler
4444
* SQLite

0 commit comments

Comments
 (0)