Add Ruby 2.1.5.

railsinstaller · Nov 25, 2014 · 02b2dc3 · 02b2dc3
1 parent 7082b2d
commit 02b2dc3
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,5 @@
+3.1.0 - Ruby 2.1.5
+
 3.0.0 - Ruby 2.0.0-p598, Rails 4.1.8, activerecord-sqlserver-adapter 4.1.0,
         coffee-rails 4.1.0, jquery-rails 3.1.2, sass-rails 4.0.5, sqlite 3.8.7.2,
         mysql-5.6.21.

diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ built and packaged via rake tasks.
 
 The next few sections detail the core components that make up RailsInstaller.
 
-### Ruby 2.0.0 on Windows
+### Ruby 2.1.5 on Windows
 
 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.
 

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-3.0.0
+3.1.0
diff --git a/config/railsinstaller.yml b/config/railsinstaller.yml
@@ -41,13 +41,13 @@
   :target: 'DevKit'
   :url: "http://s3.amazonaws.com/railsinstaller/Resources/DevKit-mingw64-32-4.7.2-20130224-1151-sfx.exe"
 
-:ruby200:
+:ruby210:
   :category: component
-  :title: Ruby 2.0.0
-  :name: Ruby200
+  :title: Ruby 2.1.0
+  :name: Ruby210
   :regex: '^.*$'
-  :url: "http://s3.amazonaws.com/railsinstaller/Resources/ruby-2.0.0-p598-i386-mingw32.7z"
-  :rename: Ruby2.0.0
+  :url: "http://s3.amazonaws.com/railsinstaller/Resources/ruby-2.1.5-i386-mingw32.7z"
+  :rename: Ruby2.1.0
 
 :git:
   :category: component

diff --git a/lib/railsinstaller/actions.rb b/lib/railsinstaller/actions.rb
@@ -3,7 +3,7 @@ module RailsInstaller
   def self.build!
 
     components = [
-      BSDTar, SevenZip, DevKit, Git, Ruby200,
+      BSDTar, SevenZip, DevKit, Git, Ruby210,
       PostgresServer, Sqlite3, Sqlite3Dll
     ]
 
@@ -52,7 +52,7 @@ def self.package!
     iscc "\"#{File.join(RailsInstaller::Root, "resources", "railsinstaller", "railsinstaller.iss")}\"",
           "/dInstallerVersion=#{railsinstaller_version}",
           "/dStagePath=\"#{RailsInstaller::Stage}\"",
-          "/dRubyPath=\"#{RailsInstaller::Ruby200.rename}\"",
+          "/dRubyPath=\"#{RailsInstaller::Ruby210.rename}\"",
           "/dResourcesPath=\"#{File.join(RailsInstaller::Root, "resources")}\"",
           "/o\"#{RailsInstaller::PackageDir}\"",
           "/frailsinstaller-#{railsinstaller_version}"

diff --git a/lib/railsinstaller/methods.rb b/lib/railsinstaller/methods.rb
@@ -193,7 +193,7 @@ def self.stage_sqlite
       if File.exist?(File.join(Stage, file))
         FileUtils.mv(
           File.join(Stage, file),
-          File.join(Stage, Ruby200.rename, "bin", file)
+          File.join(Stage, Ruby210.rename, "bin", file)
         )
       end
     end
@@ -207,7 +207,7 @@ def self.stage_postgresql
       if File.exist?(File.join(Stage, file))
         FileUtils.cp(
           File.join(Stage, PostgresServer.target, "bin", file),
-          File.join(Stage, Ruby200.rename, "bin", file)
+          File.join(Stage, Ruby210.rename, "bin", file)
         )
       end
     end
@@ -218,7 +218,7 @@ def self.stage_postgresql
   #
   def self.link_devkit_with_ruby
     devkit_path = File.join(Stage, DevKit.target)
-    ruby_path = File.join(Stage, Ruby200.rename)
+    ruby_path = File.join(Stage, Ruby210.rename)
     FileUtils.mkdir_p(devkit_path) unless File.directory?(devkit_path)
     Dir.chdir(devkit_path) do
       File.open("config.yml", "w") do |file|
@@ -239,8 +239,8 @@ def self.stage_git
 
   def self.stage_gems
     section Gems
-    build_gems(File.join(Stage, Ruby200.rename), Gems.list)
-    build_gem(File.join(Stage, Ruby200.rename), "pg", {
+    build_gems(File.join(Stage, Ruby210.rename), Gems.list)
+    build_gem(File.join(Stage, Ruby210.rename), "pg", {
       :args => [
           "--",
           "--with-pg-include=#{File.join(Stage, "pgsql", "include")}",
@@ -267,9 +267,9 @@ def self.stage_todo_application
       FileUtils.rm_rf(File.join(todo_path, ".git"))
     end
 
-    gem_install File.join(Stage, Ruby200.rename), "bundler"
+    gem_install File.join(Stage, Ruby210.rename), "bundler"
 
-    ruby_binary("bundle", "bundle", "", File.join(Stage, Ruby200.rename))
+    ruby_binary("bundle", "bundle", "", File.join(Stage, Ruby210.rename))
   end
 
   def self.stage_rails_sample_application
@@ -278,7 +278,7 @@ def self.stage_rails_sample_application
     section Rails
     sample = File.join(Stage, "Sites", "sample")
     FileUtils.rm_rf(sample) if File.exist?(sample)
-    ruby_binary("rails", "new", "sample", File.join(Stage, Ruby200.rename))
+    ruby_binary("rails", "new", "sample", File.join(Stage, Ruby210.rename))
   end
 
   # Renders setup scripts to be used post-installation
@@ -298,7 +298,7 @@ def self.stage_setup_scripts
     %w( publickey.bat ).each do |file|
       FileUtils.cp(
         File.join(RailsInstaller::Scripts, file),
-        File.join(Stage, Ruby200.rename, "bin", file)
+        File.join(Stage, Ruby210.rename, "bin", file)
       )
     end
   end

diff --git a/resources/railsinstaller/railsinstaller.iss b/resources/railsinstaller/railsinstaller.iss
@@ -88,7 +88,7 @@ Name: en; MessagesFile: compiler:Default.isl
 [Messages]
 en.InstallingLabel=Installing [name], this will take a few minutes...
 en.WelcomeLabel1=Welcome to [name]!
-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.
+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.
 en.WizardLicense={#InstallerName} License Agreement
 en.LicenseLabel=
 en.LicenseLabel3=Please read the following License Agreements and accept the terms before continuing the installation.