From 3b7137920222898a1bd19275fc63fe237feadbeb Mon Sep 17 00:00:00 2001 From: Ali Jelveh Date: Wed, 27 Feb 2013 17:32:13 +0100 Subject: [PATCH] * ruby 1.9.3-p374 - passenger --- passenger.rb | 6 +++--- rvm.rb | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/passenger.rb b/passenger.rb index c5a2c51..73cf8a6 100644 --- a/passenger.rb +++ b/passenger.rb @@ -14,13 +14,13 @@ requires_when_unmet 'build tools', 'apache2 dev packages', 'libcurl4-openssl-dev.managed' setup { default_passenger_path = if Babushka::SystemProfile.for_host.name == :precise - "/usr/local/rvm/gems/ruby-1.9.3-p125/gems/passenger-3.0.18" + "/usr/local/rvm/gems/ruby-1.9.3-p374/gems/passenger-3.0.18" else - "/usr/local/rvm/gems/ruby-1.9.3-p125/gems/passenger-3.0.12" + "/usr/local/rvm/gems/ruby-1.9.3-p374/gems/passenger-3.0.12" end passenger_path = Babushka::GemHelper.gem_path_for('passenger') || default_passenger_path set :passenger_root, passenger_path - set :ruby, "/usr/local/rvm/wrappers/ruby-1.9.3-p125/ruby" + set :ruby, "/usr/local/rvm/wrappers/ruby-1.9.3-p374/ruby" } met? { diff --git a/rvm.rb b/rvm.rb index d09602f..af50ce3 100644 --- a/rvm.rb +++ b/rvm.rb @@ -12,6 +12,15 @@ def rvm args meet { sudo("/bin/bash", :input => 'rvm alias create default 1.9.3-p125', :su => true) } end +dep '1.9.3-p374.rvm' do + requires '1.9.3 installed.rvm' + met? { + login_shell('ruby --version') && login_shell('ruby --version')['ruby 1.9.3p374'] + } + meet { sudo("/bin/bash", :input => 'rvm alias create default 1.9.3-p374', :su => true) } +end + + dep 'zlib.rvm' do requires 'rvm' met? { @@ -35,11 +44,11 @@ def rvm args dep '1.9.3 installed.rvm' do requires 'rvm' met? { - rvm('list')['ruby-1.9.3-p125'] + rvm('list')['ruby-1.9.3-p374'] } meet { - log('rvm install 1.9.3-p125'){ - sudo("/bin/bash", :input => 'rvm install 1.9.3-p125', :su => true) + log('rvm install 1.9.3-p374'){ + sudo("/bin/bash", :input => 'rvm install 1.9.3-p374', :su => true) } } after{