crossroads_capistrano 1.2.7 → 1.2.8

data/crossroads_capistrano.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "crossroads_capistrano"
-  s.version     = "1.2.7"
+  s.version     = "1.2.8"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/lib/crossroads_capistrano/passenger.rb

@@ -30,6 +30,7 @@ namespace :passenger do
     install_deps
 
     run "if ! (gem list | grep passenger | grep #{passenger_version}); then gem install passenger --no-rdoc --no-ri --version #{passenger_version} && passenger-install-apache2-module --auto; fi"
+    run "rvm wrapper #{rvm_ruby_string} passenger" if defined?(:rvm_ruby_string) # sets up wrapper for passenger so it can find bundler etc...
 
   end
 
@@ -40,16 +41,9 @@ namespace :passenger do
   desc "Apache config files: uses special variables @DEPLOY_TO@ @IP_ADDR@ @SERVER_NAME@ @PASSENGER_ROOT@ @RUBY_ROOT@"
   task :config, :roles => :web do
     run "sed -e 's,@DEPLOY_TO@,#{deploy_to},g' -e 's,@IP_ADDR@,#{ip_address},g' -e 's,@SERVER_NAME@,#{site_domain_name},g' #{release_path}/config/httpd-rails.conf > /etc/httpd/sites-enabled/010-#{application}-#{stage}.conf"
-    passenger_root = ""
-    run "pass_path=`gem which phusion_passenger` && echo ${pass_path%/lib/phusion_passenger.rb}" do |channel, stream, data|
-      passenger_root = data
-    end
-    ruby_root = ""
-    run "which ruby" do |channel, stream, data|
-      ruby_root = data
-    end
-    sed_args = "-e 's,@PASSENGER_ROOT@,#{passenger_root.strip},g'"
-    sed_args << " -e 's,@RUBY_ROOT@,#{ruby_root.strip},g'"
+    passenger_root = capture("pass_path=`gem which phusion_passenger` && echo ${pass_path%/lib/phusion_passenger.rb}")
+    ruby_root =  respond_to?(:rvm_ruby_string) ? "/usr/local/rvm/wrappers/#{rvm_ruby_string}/ruby" : capture("which ruby")
+    sed_args = "-e 's,@PASSENGER_ROOT@,#{passenger_root.strip},g' -e 's,@RUBY_ROOT@,#{ruby_root.strip},g'"
     run "sed #{sed_args} #{release_path}/config/passenger.conf > /etc/httpd/mods-enabled/passenger.conf"
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 1
   - 2
-  - 7
-  version: 1.2.7
+  - 8
+  version: 1.2.8
 platform: ruby
 authors: 
 - Steve Kenworthy
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 +08:00
+date: 2011-05-12 00:00:00 +08:00
 default_executable: 
 dependencies: []