Skip to content

Commit 02b2dc3

Browse files
committed
Add Ruby 2.1.5.
1 parent 7082b2d commit 02b2dc3

File tree

7 files changed

+21
-19
lines changed

7 files changed

+21
-19
lines changed

CHANGELOG.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
3.1.0 - Ruby 2.1.5
2+
13
3.0.0 - Ruby 2.0.0-p598, Rails 4.1.8, activerecord-sqlserver-adapter 4.1.0,
24
coffee-rails 4.1.0, jquery-rails 3.1.2, sass-rails 4.0.5, sqlite 3.8.7.2,
35
mysql-5.6.21.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ built and packaged via rake tasks.
8585

8686
The next few sections detail the core components that make up RailsInstaller.
8787

88-
### Ruby 2.0.0 on Windows
88+
### Ruby 2.1.5 on Windows
8989

9090
RubyInstaller is a self contained package installer which installs Ruby and RubyGems on a windows system, head over to [http://rubyinstaller.org/](http://rubyinstaller.org/) for more information.
9191

VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.1.0

config/railsinstaller.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
:target: 'DevKit'
4242
:url: "http://s3.amazonaws.com/railsinstaller/Resources/DevKit-mingw64-32-4.7.2-20130224-1151-sfx.exe"
4343

44-
:ruby200:
44+
:ruby210:
4545
:category: component
46-
:title: Ruby 2.0.0
47-
:name: Ruby200
46+
:title: Ruby 2.1.0
47+
:name: Ruby210
4848
:regex: '^.*$'
49-
:url: "http://s3.amazonaws.com/railsinstaller/Resources/ruby-2.0.0-p598-i386-mingw32.7z"
50-
:rename: Ruby2.0.0
49+
:url: "http://s3.amazonaws.com/railsinstaller/Resources/ruby-2.1.5-i386-mingw32.7z"
50+
:rename: Ruby2.1.0
5151

5252
:git:
5353
:category: component

lib/railsinstaller/actions.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module RailsInstaller
33
def self.build!
44

55
components = [
6-
BSDTar, SevenZip, DevKit, Git, Ruby200,
6+
BSDTar, SevenZip, DevKit, Git, Ruby210,
77
PostgresServer, Sqlite3, Sqlite3Dll
88
]
99

@@ -52,7 +52,7 @@ def self.package!
5252
iscc "\"#{File.join(RailsInstaller::Root, "resources", "railsinstaller", "railsinstaller.iss")}\"",
5353
"/dInstallerVersion=#{railsinstaller_version}",
5454
"/dStagePath=\"#{RailsInstaller::Stage}\"",
55-
"/dRubyPath=\"#{RailsInstaller::Ruby200.rename}\"",
55+
"/dRubyPath=\"#{RailsInstaller::Ruby210.rename}\"",
5656
"/dResourcesPath=\"#{File.join(RailsInstaller::Root, "resources")}\"",
5757
"/o\"#{RailsInstaller::PackageDir}\"",
5858
"/frailsinstaller-#{railsinstaller_version}"

lib/railsinstaller/methods.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def self.stage_sqlite
193193
if File.exist?(File.join(Stage, file))
194194
FileUtils.mv(
195195
File.join(Stage, file),
196-
File.join(Stage, Ruby200.rename, "bin", file)
196+
File.join(Stage, Ruby210.rename, "bin", file)
197197
)
198198
end
199199
end
@@ -207,7 +207,7 @@ def self.stage_postgresql
207207
if File.exist?(File.join(Stage, file))
208208
FileUtils.cp(
209209
File.join(Stage, PostgresServer.target, "bin", file),
210-
File.join(Stage, Ruby200.rename, "bin", file)
210+
File.join(Stage, Ruby210.rename, "bin", file)
211211
)
212212
end
213213
end
@@ -218,7 +218,7 @@ def self.stage_postgresql
218218
#
219219
def self.link_devkit_with_ruby
220220
devkit_path = File.join(Stage, DevKit.target)
221-
ruby_path = File.join(Stage, Ruby200.rename)
221+
ruby_path = File.join(Stage, Ruby210.rename)
222222
FileUtils.mkdir_p(devkit_path) unless File.directory?(devkit_path)
223223
Dir.chdir(devkit_path) do
224224
File.open("config.yml", "w") do |file|
@@ -239,8 +239,8 @@ def self.stage_git
239239

240240
def self.stage_gems
241241
section Gems
242-
build_gems(File.join(Stage, Ruby200.rename), Gems.list)
243-
build_gem(File.join(Stage, Ruby200.rename), "pg", {
242+
build_gems(File.join(Stage, Ruby210.rename), Gems.list)
243+
build_gem(File.join(Stage, Ruby210.rename), "pg", {
244244
:args => [
245245
"--",
246246
"--with-pg-include=#{File.join(Stage, "pgsql", "include")}",
@@ -267,9 +267,9 @@ def self.stage_todo_application
267267
FileUtils.rm_rf(File.join(todo_path, ".git"))
268268
end
269269

270-
gem_install File.join(Stage, Ruby200.rename), "bundler"
270+
gem_install File.join(Stage, Ruby210.rename), "bundler"
271271

272-
ruby_binary("bundle", "bundle", "", File.join(Stage, Ruby200.rename))
272+
ruby_binary("bundle", "bundle", "", File.join(Stage, Ruby210.rename))
273273
end
274274

275275
def self.stage_rails_sample_application
@@ -278,7 +278,7 @@ def self.stage_rails_sample_application
278278
section Rails
279279
sample = File.join(Stage, "Sites", "sample")
280280
FileUtils.rm_rf(sample) if File.exist?(sample)
281-
ruby_binary("rails", "new", "sample", File.join(Stage, Ruby200.rename))
281+
ruby_binary("rails", "new", "sample", File.join(Stage, Ruby210.rename))
282282
end
283283

284284
# Renders setup scripts to be used post-installation
@@ -298,7 +298,7 @@ def self.stage_setup_scripts
298298
%w( publickey.bat ).each do |file|
299299
FileUtils.cp(
300300
File.join(RailsInstaller::Scripts, file),
301-
File.join(Stage, Ruby200.rename, "bin", file)
301+
File.join(Stage, Ruby210.rename, "bin", file)
302302
)
303303
end
304304
end

resources/railsinstaller/railsinstaller.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Name: en; MessagesFile: compiler:Default.isl
8888
[Messages]
8989
en.InstallingLabel=Installing [name], this will take a few minutes...
9090
en.WelcomeLabel1=Welcome to [name]!
91-
en.WelcomeLabel2=This will install [name/ver] on your computer which includes Ruby 2.0.0, Rails 4.1.8, Git, Sqlite3, DevKit, and TinyTDS with FreeTDS. Please close any console applications before continuing.
91+
en.WelcomeLabel2=This will install [name/ver] on your computer which includes Ruby 2.1.5, Rails 4.1.8, Git, Sqlite3, DevKit, and TinyTDS with FreeTDS. Please close any console applications before continuing.
9292
en.WizardLicense={#InstallerName} License Agreement
9393
en.LicenseLabel=
9494
en.LicenseLabel3=Please read the following License Agreements and accept the terms before continuing the installation.

0 commit comments

Comments
 (0)