crossroads_capistrano 1.4.0 → 1.4.5

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

data/lib/crossroads_capistrano.rb

@@ -8,9 +8,9 @@ if defined?(Capistrano::Configuration) && Capistrano::Configuration.instance
   Capistrano::Configuration.instance(:must_exist).load do
     set :rails_root, Dir.pwd   # For tasks that need the root directory
 
-    # Load defaults unless explicitly told not to.
-    unless $no_default
-      load File.join(File.dirname(__FILE__), "crossroads_capistrano/recipes/defaults.rb")
+    # Load base defaults unless explicitly told not to.
+    unless $no_base
+      load File.join(File.dirname(__FILE__), "crossroads_capistrano/recipes/base.rb")
     end
 
     def load_crossroads_recipes(recipes)

data/lib/crossroads_capistrano/recipes/base.rb

@@ -0,0 +1,57 @@
+#
+# These base defaults are always loaded unless otherwise specified.
+#
+
+# Recipes
+# ---------------------------------------------------------
+load File.join(File.dirname(__FILE__), "helper_methods.rb")
+load File.join(File.dirname(__FILE__), "config.rb")
+
+
+# Settings
+# ---------------------------------------------------------
+set :default_stage,  "preview"
+set :rails_env,      "production"
+
+set :scm,            :git
+set :branch,         "master"
+set :deploy_via,     :remote_cache
+set :keep_releases,  3
+
+set :bundle_without, [:cucumber, :development, :test]
+
+set :httpd_user,     "apache"
+set :httpd_group,    "apache"
+set :http_port,      "80"
+set :https_port,     "443"
+
+default_run_options[:pty] = true
+
+def needs_netrc?;   repository.include?("svn.globalhand.org"); end
+def needs_ssh_key?; repository.include?("github.com"); end
+
+
+# Hooks
+# ---------------------------------------------------------
+before "deploy:symlink",  "deploy:symlink_config"
+after  "deploy:restart",  "deploy:cleanup"
+
+
+# Misc. Tasks
+# ---------------------------------------------------------
+namespace :deploy do
+  desc "Symlink Shared config files into release path."
+  task :symlink_config do
+    run "ln -sf #{shared_path}/config/*.yml #{release_path}/config/"
+  end
+  desc "Check for project dependencies"
+  task :check_dependencies, :roles => :db, :only => { :primary => true } do
+    sudo "cd #{current_path} && RAILS_ENV=production rake check_dependencies"
+  end
+end
+
+
+# Capistrano Fixes
+# ---------------------------------------------------------
+set(:current_release) { File.join(releases_path, releases.last.to_s) }
+

data/lib/crossroads_capistrano/recipes/config.rb

@@ -0,0 +1,50 @@
+namespace :config do
+  desc "Prompt for values for all '*.yml.example' and '*.yml.<<stage>>.example' files, and upload to shared/config"
+  task :setup do
+    puts "\n ** Setting up shared/config files ('*.yml.example')."
+    puts "      - In order to skip a file, you just need to leave any prompt blank."
+    puts "      - You will need to edit the '.yml.example' files to change any hard-coded values."
+
+    (Dir.glob("config/*.yml.example") +
+     Dir.glob("config/*.yml.#{stage}.example")).each do |config_file|
+      unless config_file.include?("database.yml")
+        skip_file = false
+        filename = File.basename(config_file).gsub(/.example$/,'')
+        puts "\n ** == Configuring #{filename} ...\n\n"
+        config = File.open(config_file).read
+        # Substitute <%=...%> with evaluated expression. (Very simple ERB)
+        config.gsub!(/<%=(.+)%>/) do |string|
+          eval($1)
+        end
+        # Substitute {{...}} with user input.
+        config.gsub!(/\{\{(.+)\}\}/) do |string|
+          prompt = $1
+          # Keep passwords hidden.
+          if prompt.downcase.include?('password')
+            answer = Capistrano::CLI.password_prompt("       #{prompt}: ").strip
+          else
+            answer = Capistrano::CLI.ui.ask("       #{prompt}: ").strip
+          end
+          if answer == ""
+            skip_file = true
+            break
+          end
+          answer
+        end
+        if skip_file
+          puts "*** ! Skipping #{filename} !"
+        else
+          put config, "#{shared_path}/config/#{filename}"
+        end
+      end
+    end
+  end
+
+  desc "Pull server config to local machine (excld. database.yml)"
+  task :pull do
+    system("mv -f config/database.yml config/database.yml.backup")
+    get_with_status "#{shared_path}/config/", ".", :via => :scp, :hosts => first_db_host, :recursive => true
+    system("rm -f config/database.yml && mv -f config/database.yml.backup config/database.yml")
+  end
+end
+

data/lib/crossroads_capistrano/recipes/helper_methods.rb

@@ -0,0 +1,46 @@
+#
+# Capistrano Helper Methods
+#
+
+# Returns the first host with the 'db' role. (useful for :pull commands)
+def first_db_host
+  @db_host ||= find_servers(:roles => :db).map(&:to_s).first
+end
+
+# Adds file status to 'get' commands
+def get_with_status(file, dest, options={})
+  last = nil
+  get file, dest, options do |channel, name, received, total|
+    print "\r      #{name}: #{(Float(received)/total*100).to_i}%"
+    print "\n" if received == total
+  end
+end
+
+# Test for presence of file on remote server.
+def remote_file_exists?(full_path)
+  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip == 'true'
+end
+
+# Replaces strings in a file, i.e. @SOME_STRING@ is replaced with 'replacement'
+def sed(file, args, char="@")
+  sudo "sed -i #{file} " << args.map{|k,v|"-e 's%#{char}#{k}#{char}%#{v}%g'"}.join(" ")
+end
+
+# Helper function which prompts for user input.
+# If user enters nothing, variable is set to the default.
+def prompt_with_default(prompt, var, default=nil)
+  set(var) do
+    # Append default in brackets to prompt if default is not blank.
+    if default != "" && !default.nil?
+      prompt << " [#{default}]"
+    end
+    # Keep passwords hidden.
+    if prompt.downcase.include?('password')
+      Capistrano::CLI.password_prompt("       #{prompt}: ")
+    else
+      Capistrano::CLI.ui.ask("       #{prompt}: ")
+    end
+  end
+  set var, default if eval("#{var.to_s}.empty?")
+end
+

data/lib/crossroads_capistrano/recipes/ldap.rb

@@ -19,11 +19,11 @@ password: #{ldap_bind_password}
     EOF
 
     put ldap_yml, "/tmp/ldap.yml"
-    sudo "mv /tmp/ldap.yml #{deploy_to}/shared/config/ldap.yml"
+    sudo "mv /tmp/ldap.yml #{shared_path}/config/ldap.yml"
   end
 
   task :symlink do
-    sudo "ln -sf #{deploy_to}/shared/config/ldap.yml #{release_path}/config/ldap.yml"
+    sudo "ln -sf #{shared_path}/config/ldap.yml #{release_path}/config/ldap.yml"
   end
 
 end

data/lib/crossroads_capistrano/recipes/log.rb

@@ -22,9 +22,7 @@ namespace :log do
       run "gzip -c #{shared_path}/log/production.log > #{shared_path}/log/production.log.gz"
       `rm -f /tmp/production.log.gz`
       puts "Downloading #{shared_path}/log/production.log...\n"
-      download("#{shared_path}/log/production.log.gz", "/tmp/production.log.gz", :via => :scp)  do |channel, name, received, total|
-        print "\r   #{name}: #{(Float(received)/total*100).to_i}% complete..."
-      end
+      get_with_status "#{shared_path}/log/production.log.gz", "/tmp/production.log.gz", :via => :scp
       run "rm -f #{shared_path}/log/production.log.gz"
       `gzip -fd /tmp/production.log.gz`
       puts "File can be accessed at /tmp/production.log"

data/lib/crossroads_capistrano/recipes/mysql.rb

@@ -0,0 +1,45 @@
+namespace :db do
+  namespace :config do
+    desc "Create shared/config/database.yml"
+    task :setup do
+      puts "\n ** == Configuring config/database.yml (mysql) ...\n\n"
+      prompt_with_default("Database name", :db_name, "#{application}_#{stage}")
+      prompt_with_default("Database username", :db_username, "#{application}_#{stage}")
+      prompt_with_default("Database password", :db_password)
+      prompt_with_default("Database host", :db_host, "localhost")
+      prompt_with_default("Database port", :db_port, "3306")
+      database_yml = <<-EOF
+production:
+  adapter: mysql
+  encoding: utf8
+  database: #{db_name}
+  username: #{db_username}
+  password: #{db_password}
+  host:     #{db_host}
+  port:     #{db_port}
+  pool:     10
+  timeout:  5
+EOF
+    put database_yml, "#{shared_path}/config/database.yml"
+    end
+  end
+
+  desc "Download production database to local machine"
+  task :pull do
+    prompt_with_default("Database name", :database_name, "#{application}_#{stage}")
+    prompt_with_default("Local role", :local_role, "root")
+    prompt_with_default("Overwrite local development db? (y/n)", :overwrite, "y")
+
+    # Dump database
+    sudo "mysqldump #{database_name} > /tmp/db_dump.sql", :hosts => first_db_host
+    # Download dumped database
+    get_with_status "/tmp/db_dump.sql", "tmp/#{application}_#{stage}_dump.sql", :via => :scp, :hosts => first_db_host
+    # Delete dumped database from server
+    sudo "rm -rf /tmp/dump.sql", :hosts => first_db_host
+    if overwrite.to_s.downcase[0,1] == "y"
+      # Import data
+      system "mysql -u #{local_role} #{application}_development < tmp/#{application}_#{stage}_dump.sql"
+    end
+  end
+end
+

data/lib/crossroads_capistrano/recipes/newrelic.rb

@@ -5,7 +5,7 @@ namespace :newrelic do
 
   desc "Copy newrelic.yml"
   task :yml do
-    run "ln -sf #{deploy_to}/shared/config/newrelic.yml #{release_path}/config/newrelic.yml"
+    run "ln -sf #{shared_path}/config/newrelic.yml #{release_path}/config/newrelic.yml"
   end
 end
 

data/lib/crossroads_capistrano/recipes/passenger.rb

@@ -19,6 +19,15 @@ namespace :deploy do
       sudo "/etc/init.d/httpd #{t}"
     end
   end
+
+  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}/"
+      $apache_permissions = true
+    end
+  end
 end
 
 namespace :passenger do
@@ -26,7 +35,7 @@ namespace :passenger do
   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 defined?(:rvm_ruby_string) # sets up wrapper for passenger so it can find bundler etc...
+    sudo "rvm wrapper #{rvm_ruby_string} passenger" if respond_to?(:rvm_ruby_string) # sets up wrapper for passenger so it can find bundler etc...
   end
 
   task :install_deps, :roles => :web do
@@ -37,30 +46,38 @@ 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
     # You can set the following paths from your deploy.rb file, if needed.
-    unless defined?(httpd_site_conf_path)
+    unless respond_to?(:httpd_site_conf_path)
       httpd_site_conf_path = "/etc/httpd/sites-enabled/010-#{application}-#{stage}.conf"
     end
-    unless defined?(passenger_conf_path)
+    unless respond_to?(:passenger_conf_path)
       passenger_conf_path = "/etc/httpd/mods-enabled/passenger.conf"
     end
 
     if respond_to?(:rvm_ruby_string)  # Deploying with RVM
-      ruby_root = "/usr/local/rvm/wrappers/#{rvm_ruby_string}/ruby"
+      ruby_root      = "/usr/local/rvm/wrappers/#{rvm_ruby_string}/ruby"
       passenger_root = "/usr/local/rvm/gems/#{rvm_ruby_string}/gems/passenger-#{passenger_version}"
     else  # System Ruby
-      ruby_root = capture("which ruby")
-      passenger_root = capture("pass_path=`gem which phusion_passenger` && echo ${pass_path%/lib/phusion_passenger.rb}")
+      ruby_root      = capture("which ruby").strip
+      gem_path       = capture("ruby -r rubygems -e 'p Gem.path.detect{|p|p.include? \"/usr\"}'").strip.gsub('"','')
+      passenger_root = "#{gem_path}/gems/passenger-#{passenger_version}"
     end
-    sed_args = "-e 's%@PASSENGER_ROOT@%#{passenger_root.strip}%g' -e 's%@RUBY_ROOT@%#{ruby_root.strip}%g'"
     # httpd conf
     sudo "cp -f #{release_path}/config/httpd-rails.conf #{httpd_site_conf_path}"
-    sudo "sed -i -e 's%@DEPLOY_TO@%#{deploy_to}%g' -e 's%@IP_ADDR@%#{ip_address}%g' -e 's%@SERVER_NAME@%#{site_domain_name}%g' #{httpd_site_conf_path}"
+    sed httpd_site_conf_path, {"DEPLOY_TO"        => deploy_to,
+                               "IP_ADDR"          => ip_address,
+                               "SERVER_NAME"      => site_domain_name,
+                               "SITE_DOMAIN_NAME" => site_domain_name,
+                               "HTTP_PORT"        => http_port,
+                               "HTTPS_PORT"       => https_port}
     # passenger conf
     sudo "cp -f #{release_path}/config/passenger.conf #{passenger_conf_path}"
-    sudo "sed -i #{sed_args} #{passenger_conf_path}"
+    sed passenger_conf_path,  {"PASSENGER_ROOT"   => passenger_root,
+                               "RUBY_ROOT"        => ruby_root}
   end
 end
 
 before "deploy:cold",        "passenger:install"
 after  "deploy:update_code", "passenger:config"
+before "deploy:start",       "deploy:apache_permissions"
+before "deploy:restart",     "deploy:apache_permissions"
 

data/lib/crossroads_capistrano/recipes/postgresql.rb

@@ -1,6 +1,48 @@
-namespace :postgresql do
-  task :symlink do
-    sudo "ln -sf #{deploy_to}/shared/config/database.yml #{release_path}/config/database.yml"
+namespace :db do
+  namespace :config do
+    desc "Create shared/config/database.yml"
+    task :setup do
+      puts "\n ** == Configuring config/database.yml (postgres) ...\n\n"
+      prompt_with_default("Database name", :db_name, "#{application}_#{stage}")
+      prompt_with_default("Database username", :db_username, application)
+      prompt_with_default("Database password", :db_password)
+      prompt_with_default("Database host", :db_host, "localhost")
+      prompt_with_default("Database port", :db_port, "5432")
+      database_yml = <<-EOF
+production:
+  adapter: postgresql
+  host: #{db_host}
+  port: #{db_port}
+  database: #{db_name}
+  username: #{db_username}
+  password: #{db_password}
+  schema_search_path: public
+  encoding: utf8
+  template: template0
+EOF
+    put database_yml, "#{shared_path}/config/database.yml"
+    end
+  end
+
+  desc "Download production database to local machine"
+  task :pull do
+    prompt_with_default("Database name", :dbname, "#{application}_#{stage}")
+    prompt_with_default("Database user", :username, "postgres")
+    prompt_with_default("Local role", :local_role, "postgres")
+    prompt_with_default("Overwrite local development db? (y/n)", :overwrite, "y")
+
+    # Dump database
+    sudo "pg_dump -U #{username} #{dbname} > /tmp/dump.sql", :hosts => first_db_host
+    # Download dumped database
+    get_with_status "/tmp/db_dump.sql", "tmp/#{application}_#{stage}_dump.sql", :via => :scp, :hosts => first_db_host
+    # Delete dumped database from server
+    sudo "rm -rf /tmp/db_dump.sql", :hosts => first_db_host
+    # Replace server db role with local role
+    system("sed -i s/#{application}/#{local_role}/g tmp/#{application}_#{stage}_dump.sql")
+    if overwrite.to_s.downcase[0,1] == "y"
+      # Import data
+      system("psql -d #{application}_development < tmp/#{application}_#{stage}_dump.sql")
+    end
   end
 
   desc "Start PostgreSQL"
@@ -24,27 +66,3 @@ namespace :postgresql do
   end
 end
 
-namespace :db do
-  desc "Download production database to local machine"
-  task :pull do
-    prompt_with_default("Database", :dbname, "#{application}_#{default_stage}")
-    prompt_with_default("Database user", :username, "postgres")
-    prompt_with_default("Local role", :local_role, "postgres")
-    prompt_with_default("Overwrite local db? (y/n)", :overwrite, "y")
-    host = find_servers(:roles => :db).map(&:to_s).first
-    run "pg_dump -U #{username} #{dbname} > /tmp/dump.sql", :hosts => host
-    get "/tmp/dump.sql", "tmp/dump.sql", :via => :scp, :hosts => host do |channel, name, received, total|
-      print "\r#{name}: #{(Float(received)/total*100).to_i}% complete"
-    end
-    run "rm -rf /tmp/dump.sql", :hosts => host
-    `sed -i s/stockit/#{local_role}/g tmp/dump.sql`
-    # Import data.
-    if overwrite.to_s.downcase[0,1] == "y"
-      `psql -d stockit_development < tmp/dump.sql`
-    end
-  end
-end
-
-
-after "deploy:update_code", "postgresql:symlink"
-

data/lib/crossroads_capistrano/recipes/rvm.rb

@@ -5,7 +5,7 @@ namespace :rvm do
   desc "Install rvm"
   task :install, :roles => :web do
     install_deps
-    sudo "if ! (which rvm); then bash < <( curl http://rvm.beginrescueend.com/releases/rvm-install-head ); fi", :shell => 'sh'
+    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'
   end
 

data/lib/crossroads_capistrano/recipes/stack.rb

@@ -1,46 +1,88 @@
-require File.expand_path('../yum', __FILE__)
+load File.join(File.dirname(__FILE__), 'yum.rb')
 
-# Installs minimal system software stack. Runs before "cap deploy:cold"
+# Installs minimal system software stack. Runs before deploy:cold
+
+before "deploy:cold",  "stack:setup"
 
 namespace :stack do
   desc "Setup operating system and rails environment"
-  task :default do
+  task :setup do
     yum.update
-    yum.install( {:base => packages_for_project}, :stable ) if defined?(packages_for_project)
-    install.bundler
+    yum.install({:base => yum_packages}, :stable ) if respond_to?(:yum_packages)
+    gemrc.setup
+    bundler.setup
     deploy.setup
     shared.setup
+    config.setup
+    db.config.setup if respond_to?(:db)
     shared.permissions
+    netrc.setup     if needs_netrc?
+    ssh_key.setup   if needs_ssh_key?
   end
-  namespace :install do
+
+  namespace :bundler do
     desc "Install Bundler"
-    task :bundler do
-      run "gem install bundler --no-rdoc --no-ri"
+    task :setup do
+      run "gem install bundler"
     end
   end
 end
 
-namespace 'shared' do
+namespace :shared do
   # This task can be extended by the application via an :after hook.
   desc "Setup shared directory"
   task :setup do
-    sudo "mkdir -p #{deploy_to}/shared/config"
+    sudo "mkdir -p #{shared_path}/config"
   end
 
   desc "Set permissions on shared directory"
   task :permissions do
-    sudo "chown -R #{httpd_user}:#{httpd_group} #{deploy_to}/shared/"
-    sudo "chmod -R 755 #{deploy_to}/shared/"
+    sudo "chown -R #{httpd_user}:#{httpd_group} #{shared_path}/"
+    sudo "chmod -R 755 #{shared_path}/"
+  end
+end
+
+namespace :gemrc do
+  desc "Setup ~/.gemrc file to avoid rdoc and ri generation"
+  task :setup do
+    puts "\n ** == Configuring ~/.gemrc ...\n\n"
+    home_dir = capture("#{sudo} echo ~").strip
+    put "gem: --no-ri --no-rdoc", "#{home_dir}/.gemrc"
   end
 end
 
-namespace :deploy do
-  desc "Check for project dependencies"
-  task :check_dependencies, :roles => :db, :only => { :primary => true } do
-    sudo "cd #{current_path} && RAILS_ENV=production rake check_dependencies"
+namespace :netrc do
+  desc "Setup ~/.netrc file for internal git https auth"
+  task :setup do
+    if capture("ls ~/.netrc").strip == ""
+      puts "\n ** == Configuring ~/.netrc ..."
+      puts " **    (Enter 's' to skip this file.)\n\n"
+      prompt_with_default("Netrc Machine",  :netrc_machine,  "svn.globalhand.org")
+      if netrc_machine == "s"
+        puts "\n ** ! Skipping ~/.netrc\n\n"
+      else
+        prompt_with_default("Netrc Login",    :netrc_login,    "")
+        prompt_with_default("Netrc Password", :netrc_password, "")
+        netrc = <<-EOF
+machine #{netrc_machine}
+login #{netrc_login}
+password #{netrc_password}
+EOF
+        home_dir = capture("#{sudo} echo ~").strip
+        put netrc, "#{home_dir}/.netrc"
+      end
+    else
+      puts "\n ** == ~/.netrc already exists!\n\n"
+    end
   end
 end
 
-before "deploy:cold",  "stack"
-after  "deploy:check", "deploy:check_dependencies"
+namespace :ssh_key do
+  desc "Generate ssh key for adding to GitHub public keys, etc."
+  task :setup do
+    puts "\n    If capistrano stops here then paste the following key into GitHub and"
+    puts   "    run \"cap deploy:cold\" again\n\n"
+    run  "    if ! (ls $HOME/.ssh/id_rsa); then (ssh-keygen -N '' -t rsa -q -f $HOME/.ssh/id_rsa && cat $HOME/.ssh/id_rsa.pub) && exit 1; fi"
+  end
+end
 

data/lib/crossroads_capistrano/recipes/thinking_sphinx.rb

@@ -2,7 +2,7 @@ namespace :ts do
 
   desc "Links the sphinx database files by inserting magic code"
   task :symlink do
-    run "sed -i 's,@DEPLOY_TO@,#{deploy_to},g' #{release_path}/script/link_sphinx.rb"
+    sed "#{release_path}/script/link_sphinx.rb", {"DEPLOY_TO" => "shared"}
     run "#{release_path}/script/runner -e production #{release_path}/script/link_sphinx.rb"
   end
 
@@ -19,7 +19,7 @@ namespace :ts do
   desc "Start sphinx"
   task :start do
     run "cd #{current_path} && RAILS_ENV=production rake ts:start"
-    run "chown #{httpd_user}:#{httpd_group} #{deploy_to}/shared/log/searchd.production.pid"
+    run "chown #{httpd_user}:#{httpd_group} #{shared_path}/log/searchd.production.pid"
   end
 
   desc "Restart sphinx"
@@ -31,7 +31,7 @@ namespace :ts do
   desc "Stop sphinx, delete index files, reindex, and restart sphinx (last resort)"
   task :recover do
     stop
-    run "cd #{deploy_to}/shared/db/sphinx/ && rm -rf production"
+    run "cd #{shared_path}/db/sphinx/ && rm -rf production"
     run "cd #{current_path} && RAILS_ENV=production rake ts:in"
     start
   end
@@ -42,7 +42,7 @@ are stale and need removing with ts:recover. Run this command a few times over a
 a minute to determine if the files disappear - indicating a successfully completed rotation \
 and no need for recovery."""
   task :recovery_required? do
-    run "if [ x`find #{deploy_to}/shared/db/sphinx/production/ -name \*.new.\* | wc -l` == x\"0\" ]; then echo \"Sphinx indexes look intact. Run ts:in to regenerate.\"; else echo \"Sphinx index files *may* be stale. Wait 1 minute and run this command again. Consider running ts:recover if this message appears again\"; fi"
+    run "if [ x`find #{shared_path}/db/sphinx/production/ -name \*.new.\* | wc -l` == x\"0\" ]; then echo \"Sphinx indexes look intact. Run ts:in to regenerate.\"; else echo \"Sphinx index files *may* be stale. Wait 1 minute and run this command again. Consider running ts:recover if this message appears again\"; fi"
   end
 
 end

data/lib/crossroads_capistrano/recipes/{deploy_permissions.rb → user_permissions.rb}

@@ -14,14 +14,6 @@ namespace :deploy do
     sudo "chown -R #{user} #{deploy_to}"
     $apache_permissions = false
   end
-  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} #{deploy_to}/shared/"
-      $apache_permissions = true
-    end
-  end
 
   desc "Set permissions on releases directory so old releases can be removed"
   task :release_permissions do
@@ -36,6 +28,5 @@ end
   after  t, "deploy:apache_permissions"
 end
 
-before "deploy:restart", "deploy:apache_permissions"
 before "deploy:cleanup", "deploy:release_permissions"
 

data/lib/crossroads_capistrano/recipes/whenever.rb

@@ -9,3 +9,5 @@ namespace :deploy do
   end
 end
 
+after "deploy:symlink", "deploy:update_crontab"
+

data/lib/crossroads_capistrano/recipes/yum.rb

@@ -6,14 +6,9 @@ require 'capistrano'
 #
 # Installs within Capistrano as the plugin _yum_.
 #
-# =Usage
-#
-#    require 'recipes/yum'
-#
 # Prefix all calls to the library with <tt>yum.</tt>
 #
 module Yum
-
   # Default yum command - reduces any interactivity to the minimum.
   YUM_COMMAND="yum -y"
 
@@ -64,3 +59,12 @@ private
 end
 
 Capistrano.plugin :yum, Yum
+
+desc "Takes a list of yum packages and determines if they need updating. This is useful for determining whether to apply security updates."
+task :list_installed_yum_packages do
+  prompt_with_default("Enter comma seperated list of yum pacakges (e.g. qspice, lftp).\nIf you leave this blank then it will list all installed packages:", :packages, "")
+  packages.gsub!(/,\s*/, "\\|")
+  sudo "yum -C list | grep '#{packages}' | grep installed"
+  puts "The packages listed above are installed on the system"
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-20 00:00:00.000000000 +08:00
+date: 2011-05-25 00:00:00.000000000 +08:00
 default_executable: 
 dependencies: []
 description: A Crossroads Foundation collection of generic capistrano recipes.
@@ -27,22 +27,23 @@ files:
 - Rakefile
 - crossroads_capistrano.gemspec
 - lib/crossroads_capistrano.rb
+- lib/crossroads_capistrano/recipes/base.rb
 - lib/crossroads_capistrano/recipes/cache.rb
-- lib/crossroads_capistrano/recipes/defaults.rb
+- lib/crossroads_capistrano/recipes/config.rb
 - lib/crossroads_capistrano/recipes/delayed_job.rb
-- lib/crossroads_capistrano/recipes/deploy_permissions.rb
+- lib/crossroads_capistrano/recipes/helper_methods.rb
 - lib/crossroads_capistrano/recipes/hoptoad.rb
 - lib/crossroads_capistrano/recipes/ldap.rb
 - lib/crossroads_capistrano/recipes/log.rb
+- lib/crossroads_capistrano/recipes/mysql.rb
 - lib/crossroads_capistrano/recipes/newrelic.rb
 - lib/crossroads_capistrano/recipes/passenger.rb
 - lib/crossroads_capistrano/recipes/postgresql.rb
-- lib/crossroads_capistrano/recipes/prompt.rb
 - lib/crossroads_capistrano/recipes/revisions.rb
 - lib/crossroads_capistrano/recipes/rvm.rb
-- lib/crossroads_capistrano/recipes/shared_config.rb
 - lib/crossroads_capistrano/recipes/stack.rb
 - lib/crossroads_capistrano/recipes/thinking_sphinx.rb
+- lib/crossroads_capistrano/recipes/user_permissions.rb
 - lib/crossroads_capistrano/recipes/whenever.rb
 - lib/crossroads_capistrano/recipes/yum.rb
 has_rdoc: true

data/lib/crossroads_capistrano/recipes/defaults.rb

@@ -1,27 +0,0 @@
-# These default recipes are always loaded unless otherwise specified
-
-# Default recipes
-# ---------------------------------------------------------
-load File.join(File.dirname(__FILE__), "prompt.rb")
-
-
-# Default settings
-# ---------------------------------------------------------
-set :default_stage, "preview"
-
-set :scm, :git
-set :deploy_via, :remote_cache
-set :keep_releases, 3
-
-set :bundle_without, [:cucumber, :development, :test]
-
-set :httpd_user,  "apache"
-set :httpd_group, "apache"
-
-default_run_options[:pty] = true
-
-
-# Default hooks
-# ---------------------------------------------------------
-after  "deploy:restart",  "deploy:cleanup"
-

data/lib/crossroads_capistrano/recipes/prompt.rb

@@ -1,12 +0,0 @@
-# Helper function which prompts for user input, if none selected the returned
-# variable is set to the default.
-# 'prompt'  -> user prompt
-# 'var'     -> variable
-# 'default' -> default value set if no user input is received.
-
-def prompt_with_default(prompt, var, default)
-  set(var) do
-    Capistrano::CLI.ui.ask "#{prompt} [#{default}]: "
-  end
-  set var, default if eval("#{var.to_s}.empty?")
-end

data/lib/crossroads_capistrano/recipes/shared_config.rb

@@ -1,9 +0,0 @@
-namespace :deploy do
-  desc "Symlink Shared config files into release path."
-  task :symlink_config do
-    run "ln -sf #{shared_path}/config/*.yml #{release_path}/config/"
-  end
-end
-
-before "deploy:symlink", "deploy:symlink_config"
-