crossroads_capistrano 1.2.5 → 1.2.6

data/README.textile

@@ -13,6 +13,6 @@ bc. gem 'crossroads_capistrano', :git => 'http://github.com/crossroads/crossroad
 Add the following to your project's *config/deploy.rb* :
 
 bc. require 'crossroads_capistrano'
-CrossroadsCapistrano.load_recipes %w(prompt stack rvm passenger postgresql newrelic log)
+CrossroadsCapistrano.load_recipes %w(prompt rvm stack passenger postgresql newrelic log)
 # or ..
 CrossroadsCapistrano.load_recipes :all

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.5"
+  s.version     = "1.2.6"
   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

@@ -37,10 +37,20 @@ namespace :passenger do
     yum.install( {:base => %w(curl-devel httpd-devel apr-devel)}, :stable )
   end
 
-  desc "Apache config files"
+  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"
-    run "sed -e 's,@RVM_RUBY_STRING@,#{rvm_ruby_string},g' -e 's,@PASSENGER_VERSION@,#{passenger_version},g' #{release_path}/config/passenger.conf > /etc/httpd/mods-enabled/passenger.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'"
+    run "sed #{sed_args} #{release_path}/config/passenger.conf > /etc/httpd/mods-enabled/passenger.conf"
   end
 
 end

data/lib/crossroads_capistrano/rvm.rb

@@ -3,13 +3,12 @@ namespace :rvm do
   desc "Install rvm"
   task :install, :roles => :web do
     install_deps
-
-    #~ run "if ! (which rvm); then curl -L http://bit.ly/rvm-install-system-wide | bash; fi"
-    run "if ! (rvm list | grep #{rvm_ruby_string}); then rvm install #{rvm_ruby_string}; fi"
+    run "if ! (which rvm); then curl -s https://rvm.beginrescueend.com/install/rvm | bash; fi", :shell => 'sh'
+    run "if ! (rvm list | grep #{rvm_ruby_string}); then rvm install #{rvm_ruby_string}; fi", :shell => 'sh'
   end
 
   task :install_deps, :roles => :web do
-    yum.install( {:base => %w(curl git gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel)}, :stable )
+    yum.install( {:base => %w(curl git gcc-c++ patch readline readline-devel zlib zlib-devel libyaml-devel libffi-devel)}, :stable, :shell => 'sh' )
   end
 
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.2.5
+  hash: 19
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 6
+  version: 1.2.6
 platform: ruby
 authors: 
 - Steve Kenworthy
@@ -12,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +08:00
+date: 2011-04-29 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -57,17 +62,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: crossroads_capistrano
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes