crossroads_capistrano 1.4.5 → 1.4.6

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.5"
+  s.version     = "1.4.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/recipes/base.rb

@@ -36,6 +36,9 @@ def needs_ssh_key?; repository.include?("github.com"); end
 before "deploy:symlink",  "deploy:symlink_config"
 after  "deploy:restart",  "deploy:cleanup"
 
+# Deployment tasks that need an after hook to notify hoptoad/newrelic/etc.
+NotificationTasks = ["deploy", "deploy:migrations", "deploy:cold", "deploy:rollback"]
+
 
 # Misc. Tasks
 # ---------------------------------------------------------

data/lib/crossroads_capistrano/recipes/hoptoad.rb

@@ -5,7 +5,7 @@ namespace :deploy do
   desc "Notify Hoptoad of the deployment"
   task :notify_hoptoad, :except => { :no_release => true } do
     if ARGV.include?("-n")
-      puts "\n ** Dry run, not notifying hoptoad.\n\n"
+      puts "\n ** Dry run, not notifying Hoptoad.\n\n"
     else
       begin
         require 'active_support/core_ext/string'
@@ -36,6 +36,5 @@ namespace :deploy do
   end
 end
 
-after "deploy",            "deploy:notify_hoptoad"
-after "deploy:migrations", "deploy:notify_hoptoad"
+after NotificationTasks, "deploy:notify_hoptoad"
 

data/lib/crossroads_capistrano/recipes/ldap.rb

@@ -1,5 +1,3 @@
-require File.join(File.dirname(__FILE__), 'prompt')
-
 namespace :ldap do
   desc "Create the LDAP configuration file"
   task :config do

data/lib/crossroads_capistrano/recipes/newrelic.rb

@@ -1,13 +1,21 @@
-namespace :newrelic do
-  task :default do
-    newrelic.yml
-  end
+require 'new_relic/recipes'
 
-  desc "Copy newrelic.yml"
-  task :yml do
-    run "ln -sf #{shared_path}/config/newrelic.yml #{release_path}/config/newrelic.yml"
+namespace :deploy do
+  desc "Notify New Relic of the deployment"
+  task :notify_newrelic, :except => { :no_release => true } do
+    if stage.to_s == 'live'
+      if File.exists?('config/newrelic.yml')
+        if ARGV.include?("-n")
+          puts "\n ** Dry run, not notifying New Relic.\n\n"
+        else
+          newrelic.notice_deployment
+        end
+      else
+        puts "\n !! You need to set up 'config/newrelic.yml'.\n    You can copy the shared/config files from a server by running 'cap config:pull'.\n\n"
+      end
+    end
   end
 end
 
-before "deploy:symlink", "newrelic:yml"
+after NotificationTasks, "deploy:notify_newrelic"
 

data/lib/crossroads_capistrano/recipes/passenger.rb

@@ -34,8 +34,8 @@ namespace :passenger do
   desc "Install Passenger"
   task :install, :roles => :web 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"
-    sudo "rvm wrapper #{rvm_ruby_string} passenger" if respond_to?(:rvm_ruby_string) # sets up wrapper for passenger so it can find bundler etc...
+    passenger_install_cmd = (exists?(:rvm_ruby_string) ? "rvmsudo " : "") << "passenger-install-apache2-module --auto" # sets up ruby wrapper correctly
+    run "if ! (gem list | grep passenger | grep #{passenger_version}); then gem install passenger --no-rdoc --no-ri --version #{passenger_version} && #{passenger_install_cmd}; fi"
   end
 
   task :install_deps, :roles => :web do
@@ -43,15 +43,11 @@ namespace :passenger do
     sudo "rm -rf /etc/httpd/conf.d/ssl.conf"
   end
 
-  desc "Apache config files: uses special variables @DEPLOY_TO@ @IP_ADDR@ @SERVER_NAME@ @PASSENGER_ROOT@ @RUBY_ROOT@"
+  desc "Set up Apache and Passenger config files"
   task :config, :roles => :web do
     # You can set the following paths from your deploy.rb file, if needed.
-    unless respond_to?(:httpd_site_conf_path)
-      httpd_site_conf_path = "/etc/httpd/sites-enabled/010-#{application}-#{stage}.conf"
-    end
-    unless respond_to?(:passenger_conf_path)
-      passenger_conf_path = "/etc/httpd/mods-enabled/passenger.conf"
-    end
+    set :httpd_site_conf_path, "/etc/httpd/sites-enabled/010-#{application}-#{stage}.conf" unless exists?(:httpd_site_conf_path)
+    set :passenger_conf_path, "/etc/httpd/mods-enabled/passenger.conf" unless exists?(:passenger_conf_path)
 
     if respond_to?(:rvm_ruby_string)  # Deploying with RVM
       ruby_root      = "/usr/local/rvm/wrappers/#{rvm_ruby_string}/ruby"

data/lib/crossroads_capistrano/recipes/revisions.rb

@@ -28,5 +28,5 @@ namespace :deploy do
   end
 end
 
-after "deploy", "deploy:revisions"
+after NotificationTasks, "deploy:revisions"
 

data/lib/crossroads_capistrano/recipes/rvm.rb

@@ -5,8 +5,8 @@ namespace :rvm do
   desc "Install rvm"
   task :install, :roles => :web do
     install_deps
-    sudo "if ! (which rvm); then bash < <(curl -s https://rvm.beginrescueend.com/install/rvm) ); fi", :shell => 'sh'
-    sudo "if ! (rvm list | grep #{rvm_ruby_string}); then rvm install #{rvm_ruby_string}; fi", :shell => 'sh'
+    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 ! (#{rvm_bin_path}/rvm list | grep #{rvm_ruby_string}); then #{sudo} #{rvm_bin_path}/rvm install #{rvm_ruby_string}; fi", :shell => 'sh'
   end
 
   task :install_deps, :roles => :web do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-25 00:00:00.000000000 +08:00
+date: 2011-05-26 00:00:00.000000000 +08:00
 default_executable: 
 dependencies: []
 description: A Crossroads Foundation collection of generic capistrano recipes.