crossroads_capistrano 1.4.12 → 1.4.13

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.12"
+  s.version     = "1.4.13"
   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

@@ -3,11 +3,11 @@
 if defined?(Capistrano::Configuration) && Capistrano::Configuration.instance
   require 'capistrano_colors' rescue LoadError puts "Capistrano Colors is not installed."
   Capistrano::Configuration.instance(:must_exist).load do
-    # Require multistage & bundler unless disabled.
-    require 'capistrano/ext/multistage' if fetch(:multistage, true)
-    require 'bundler/capistrano' if fetch(:bundler, true) rescue LoadError
-
     set :rails_root, Dir.pwd   # For tasks that need the root directory
+    
+    # Automatically detect whether multistage & bundler need to be required.
+    require 'capistrano/ext/multistage' if File.exists?(File.join(fetch(:rails_root), 'config', 'deploy'))
+    require 'bundler/capistrano'        if File.exists?(File.join(fetch(:rails_root), 'Gemfile'))
 
     # Load base defaults unless disabled.
     if fetch(:base_defaults, true)

data/lib/crossroads_capistrano/recipes/helper_methods.rb

@@ -2,6 +2,31 @@
 # Capistrano Helper Methods
 #
 
+# 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
+
+# Detect presence and version of Rails.
+def rails_version
+  return 3 if File.exists?(File.join(fetch(:rails_root), 'script', 'rails'))
+  return 2 if File.exists?(File.join(fetch(:rails_root), 'script', 'server'))
+  nil
+end
+
 # 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
@@ -27,21 +52,3 @@ def sed(file, args, char="@")
   (exists?(:use_sudo) && !use_sudo) ? run(cmd) : sudo(cmd)
 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/hoptoad.rb

@@ -7,10 +7,7 @@ namespace :deploy do
     if ARGV.include?("-n")
       puts "\n ** Dry run, not notifying Hoptoad.\n\n"
     else
-      begin
-        require 'active_support/core_ext/string'
-      rescue Exception
-      end
+      require 'active_support/core_ext/string' if rails_version == 3
       require 'hoptoad_notifier'
       require File.join(rails_root,'config','initializers','hoptoad')
       require 'hoptoad_tasks'

metadata

@@ -1,26 +1,31 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: crossroads_capistrano
-version: !ruby/object:Gem::Version
-  version: 1.4.12
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 1.4.13
 platform: ruby
-authors:
+authors: 
 - Steve Kenworthy
 - Ben Tillman
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-26 00:00:00.000000000 +08:00
+
+date: 2011-05-27 00:00:00 +08:00
 default_executable: 
 dependencies: []
+
 description: A Crossroads Foundation collection of generic capistrano recipes.
-email:
+email: 
 - it_dept@crossroads.org.hk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README.textile
@@ -49,26 +54,30 @@ files:
 has_rdoc: true
 homepage: http://www.crossroads.org.hk
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: crossroads_capistrano
-rubygems_version: 1.6.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Crossroads capistrano recipes
 test_files: []
+