crossroads_capistrano 1.4.9 → 1.4.10

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.9"
+  s.version     = "1.4.10"
   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

@@ -1,15 +1,16 @@
 # Crossroads shared capistrano recipes
 
 if defined?(Capistrano::Configuration) && Capistrano::Configuration.instance
-  require 'capistrano/ext/multistage'
-  require 'bundler/capistrano' unless $no_bundler rescue LoadError
   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
 
-    # Load base defaults unless explicitly told not to.
-    unless $no_base
+    # Load base defaults unless disabled.
+    if fetch(:base_defaults, true)
       load File.join(File.dirname(__FILE__), "crossroads_capistrano/recipes/base.rb")
     end
 

data/lib/crossroads_capistrano/recipes/revisions.rb

@@ -5,7 +5,7 @@ namespace :deploy do
     # Following line 'right-aligns' the branch string.
     branch_indent = " "*(i=10-branch.size;i<0 ? 0 : i) << branch.capitalize
     current_is_deployed = current == latest
-    puts "\n  * \033[0;32m== Showing revisions and diffs for [\033[1;32m#{application} #{stage}\033[0;32m]\033[0m\n\n"
+    puts "\n  * \033[0;32m== Showing revisions and diffs for [\033[1;32m#{application}#{exists?(:stage) ? ' ' << stage : ''}\033[0;32m]\033[0m\n\n"
     puts "         \033[1;33m#{branch_indent} Branch: \033[1;37m#{latest}\033[0m"
     puts "         \033[#{current == latest ? 1 : 0};33mDeployed Revision: \033[#{current == latest ? 1 : 0};37m#{current}\033[0m"
     puts "         \033[#{previous == latest ? 1 : 0};33mPrevious Revision: \033[#{previous == latest ? 1 : 0};37m#{previous}\033[0m\n\n"

data/lib/crossroads_capistrano/recipes/whenever.rb

@@ -2,12 +2,16 @@
 # Updates the crontab using wheneverize
 #
 
-namespace :deploy do
+namespace :whenever do
   desc "Update the crontab file"
-  task :update_crontab, :roles => :db do
+  task :update, :roles => :db do
     run "cd #{current_path} && bundle exec whenever --update-crontab #{application}"
   end
+  desc "Clear the crontab file"
+  task :clear, :roles => :db do
+    run "cd #{current_path} && bundle exec whenever --clear-crontab #{application}"
+  end
 end
 
-after "deploy:symlink", "deploy:update_crontab"
+after "deploy:symlink", "whenever:update"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crossroads_capistrano
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
   prerelease: 
 platform: ruby
 authors: