Permalink
Browse files

Updated Ruby to 1.9.3, Rails to 3.2.1

  • Loading branch information...
1 parent 68cd980 commit a3f76a8378b1ee1d989df3a1a8be972b4092d799 @wayneeseguin wayneeseguin committed Feb 13, 2012
Showing with 21 additions and 13 deletions.
  1. +10 −2 config/railsinstaller.yml
  2. +2 −2 lib/railsinstaller/actions.rb
  3. +9 −9 lib/railsinstaller/methods.rb
View
12 config/railsinstaller.yml
@@ -7,10 +7,10 @@
- rake
-
:name: rails
- :version: "3.1.1"
+ :version: "3.2.1"
-
:name: activerecord-sqlserver-adapter
- :version: "3.1.3"
+ :version: "3.2.1"
- tiny_tds
- sqlite3
- sqlite3-ruby
@@ -43,6 +43,14 @@
:url: "http://rubyforge.org/frs/download.php/75128/ruby-1.9.2-p290-i386-mingw32.7z"
:rename: Ruby1.9.2
+:ruby193:
+ :category: component
+ :title: Ruby 1.9.3
+ :name: Ruby193
+ :regex: '^.*$'
+ :url: "http://rubyforge.org/frs/download.php/75466/ruby-1.9.3-p0-i386-mingw32.7z"
+ :rename: Ruby1.9.3
+
:git:
:category: component
:title: Git 1.7.6
View
4 lib/railsinstaller/actions.rb
@@ -3,7 +3,7 @@ module RailsInstaller
def self.build!
components = [
- BSDTar, SevenZip, DevKit, Git, Ruby192,
+ BSDTar, SevenZip, DevKit, Git, Ruby193,
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::Ruby192.rename}\"",
+ "/dRubyPath=\"#{RailsInstaller::Ruby193.rename}\"",
"/dResourcesPath=\"#{File.join(RailsInstaller::Root, "resources")}\"",
"/o\"#{RailsInstaller::PackageDir}\"",
"/frailsinstaller-#{railsinstaller_version}"
View
18 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, Ruby192.rename, "bin", file)
+ File.join(Stage, Ruby193.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, Ruby192.rename, "bin", file)
+ File.join(Stage, Ruby193.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, Ruby192.rename)
+ ruby_path = File.join(Stage, Ruby193.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, Ruby192.rename), Gems.list)
- build_gem(File.join(Stage, Ruby192.rename), "pg", {
+ build_gems(File.join(Stage, Ruby193.rename), Gems.list)
+ build_gem(File.join(Stage, Ruby193.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, Ruby192.rename), "bundler"
+ gem_install File.join(Stage, Ruby193.rename), "bundler"
- ruby_binary("bundle", "bundle", "", File.join(Stage, Ruby192.rename))
+ ruby_binary("bundle", "bundle", "", File.join(Stage, Ruby193.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, Ruby192.rename))
+ ruby_binary("rails", "new", "sample", File.join(Stage, Ruby193.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, Ruby192.rename, "bin", file)
+ File.join(Stage, Ruby193.rename, "bin", file)
)
end
end

0 comments on commit a3f76a8

Please sign in to comment.