crossroads_capistrano 1.4.40 → 1.4.41

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in crossroads_capistrano.gemspec
 gemspec
+
+gem 'rake'

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.4.40"
+  s.version     = "1.4.41"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Kenworthy", "Ben Tillman", "Nathan Broadbent"]
   s.email       = ["it_dept@crossroads.org.hk"]

data/lib/crossroads_capistrano/recipes/passenger.rb

@@ -23,8 +23,8 @@ namespace :deploy do
   desc "Apache permissions (for passenger)"
   task :apache_permissions do
     unless $apache_permissions
-      sudo "chown -R #{httpd_user}:#{httpd_group} #{current_path}/"
-      sudo "chown -R #{httpd_user}:#{httpd_group} #{shared_path}/"
+      run "if [ -d #{release_path}/ ]; then #{sudo} chown -R #{httpd_user}:#{httpd_group} #{current_path}/; fi"
+      run "if [ -d #{release_path}/ ]; then #{sudo} chown -R #{httpd_user}:#{httpd_group} #{shared_path}/; fi"
       $apache_permissions = true
     end
   end

data/lib/crossroads_capistrano/recipes/rvm.rb

@@ -4,8 +4,11 @@ namespace :rvm do
 
   desc "Install rvm"
   task :install, :roles => :web do
+    if rvm_ruby_string == "default"
+      raise "rvm_ruby_string has not been set! Please set it in config/deploy.rb"
+    end
     install_deps
-    run "if ! [ -e #{rvm_bin_path}/rvm ]; then #{sudo} bash -c \"curl -s https://rvm.beginrescueend.com/install/rvm | bash\"; fi", :shell => 'sh'
+    run "if ! [ -e #{rvm_bin_path}/rvm ]; then bash -c \"curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer | bash\" stable; fi", :shell => 'sh'
     run "if ! (#{rvm_bin_path}/rvm list | grep #{rvm_ruby_string}); then #{sudo} #{rvm_bin_path}/rvm install #{rvm_ruby_string}; fi", :shell => 'sh'
   end
 

data/lib/crossroads_capistrano/recipes/user_permissions.rb

@@ -12,7 +12,7 @@ end
 namespace :deploy do
   desc "Deploy permissions (give user access to everything)"
   task :user_permissions do
-    sudo "chown -R #{user} #{deploy_to}", :shell => 'sh'
+    run "if [ -d #{deploy_to} ]; then #{sudo} chown -R #{user} #{deploy_to}; fi", :shell => 'sh'
     $apache_permissions = false
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version
-  version: 1.4.40
+  version: 1.4.41
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
+date: 2012-03-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &71856410 !ruby/object:Gem::Requirement
+  requirement: &75189940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *71856410
+  version_requirements: *75189940
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &71856100 !ruby/object:Gem::Requirement
+  requirement: &75189380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *71856100
+  version_requirements: *75189380
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &71855860 !ruby/object:Gem::Requirement
+  requirement: &75189110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *71855860
+  version_requirements: *75189110
 - !ruby/object:Gem::Dependency
   name: rvm
-  requirement: &71855570 !ruby/object:Gem::Requirement
+  requirement: &75188770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,7 +56,7 @@ dependencies:
         version: 1.6.9
   type: :runtime
   prerelease: false
-  version_requirements: *71855570
+  version_requirements: *75188770
 description: A Crossroads Foundation collection of generic capistrano recipes.
 email:
 - it_dept@crossroads.org.hk
@@ -104,15 +104,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -821697135
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -821697135
 requirements: []
 rubyforge_project: crossroads_capistrano
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes