capper 0.6.8 → 0.7.0

data/capper.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "capper"
-  s.version = "0.6.8"
+  s.version = "0.7.0"
   s.platform = Gem::Platform::RUBY
   s.licenses = ["MIT"]
   s.authors = ["Benedikt Böhm"]

data/lib/capper/base.rb

@@ -79,8 +79,16 @@ Capper.load do
       dirs += shared.map { |d| File.join(shared_path, d) }
       run "mkdir -p #{dirs.join(' ')}"
     end
+
+    desc "Create symlinks from shared to current"
+    task :symlink_shared, :roles => :app, :except => { :no_release => true } do
+      fetch(:symlinks, {}).each do |source, dest|
+        run "rm -rf #{release_path}/#{dest} && ln -nfs #{shared_path}/#{source} #{release_path}/#{dest}"
+      end
+    end
   end
 
   # cleanup by default
   after "deploy:update", "deploy:cleanup"
+  after "deploy:update_code", "deploy:symlink_shared"
 end

data/lib/capper/config.rb

@@ -10,6 +10,7 @@ Capper.load do
   end
 
   namespace :config do
+    desc "Setup configuration files from config repo"
     task :setup, :roles => :app, :except => { :no_release => true } do
       unless config_repo.nil?
         run "cd #{config_path} && git pull -q"
@@ -18,10 +19,6 @@ Capper.load do
       fetch(:config_files, []).each do |f|
         run "cp #{config_path}/#{f} #{release_path}/config/"
       end
-
-      fetch(:symlinks, {}).each do |source, dest|
-        run "rm -rf #{release_path}/#{dest} && ln -nfs #{shared_path}/#{source} #{release_path}/#{dest}"
-      end
     end
   end
 

data/lib/capper/delayed_job.rb

@@ -1,9 +1,10 @@
 require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 
 require 'capper/bundler'
+require 'capper/monit'
 
 Capper.load do
-  # unicorn configuration variables
+  # configuration variables
   _cset(:delayed_job_workers, {})
 
   # these cannot be overriden
@@ -26,13 +27,19 @@ check process delayed_job_<%= name %>
 EOF
 
   namespace :delayed_job do
-    desc "Generate delayed_job configuration files"
+    desc "Generate DelayedJob configuration files"
     task :setup, :except => { :no_release => true } do
       upload_template_file("delayed_job.sh",
                            delayed_job_script,
                            :mode => "0755")
     end
+
+    desc "Restart DelayedJob workers"
+    task :restart, :roles => :worker, :except => { :no_release => true } do
+      run "monit -g delayed_job restart all"
+    end
   end
 
   after "deploy:update_code", "delayed_job:setup"
+  after "deploy:restart", "delayed_job:restart"
 end

data/lib/capper/gem.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/base' unless defined?(Capper)
 
 Capper.load do
   namespace :gemrc do
+    desc "Setup global ~/.gemrc file"
     task :setup do
       put("gem: --no-ri --no-rdoc", "#{deploy_to}/.gemrc")
     end

data/lib/capper/monit.rb

@@ -4,6 +4,7 @@ Capper.load do
   set(:monitrc) { "#{deploy_to}/.monitrc.local" }
 
   namespace :monit do
+    desc "Setup monit configuration files"
     task :setup do
       configs = fetch(:monit_configs, {})
 
@@ -17,6 +18,7 @@ Capper.load do
       end
     end
 
+    desc "Reload monit configuration"
     task :reload do
       run "monit reload &>/dev/null && sleep 1"
     end

data/lib/capper/resque.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+
+require 'capper/bundler'
+require 'capper/monit'
+
+Capper.load do
+  # configuration variables
+  _cset(:resque_workers, {})
+
+  # these cannot be overriden
+  set(:resque_script) { File.join(bin_path, "resque") }
+
+  monit_config "resque", <<EOF, :roles => :worker
+<% resque_workers.each do |name, queue| %>
+check process resque_<%= name %>
+  with pidfile <%= pid_path %>/resque.<%= name %>.pid
+<% if queue.nil? %>
+  start program = "<%= resque_script %> <%= name %> * start"
+  stop program = "<%= resque_script %> <%= name %> * stop"
+<% else %>
+  start program = "<%= resque_script %> <%= name %> <%= queue %> start"
+  stop program = "<%= resque_script %> <%= name %> <%= queue %> stop"
+<% end %>
+  group resque
+
+<% end %>
+EOF
+
+  namespace :resque do
+    desc "Generate resque configuration files"
+    task :setup, :except => { :no_release => true } do
+      upload_template_file("resque.sh",
+                           resque_script,
+                           :mode => "0755")
+    end
+
+    desc "Restart resque workers"
+    task :restart, :roles => :worker, :except => { :no_release => true } do
+      run "monit -g resque restart all"
+    end
+  end
+
+  after "deploy:update_code", "resque:setup"
+  after "deploy:restart", "resque:restart"
+end

data/lib/capper/templates/resque.sh.erb

@@ -0,0 +1,31 @@
+#!/bin/bash
+export HOME=<%= deploy_to %>
+source <%= deploy_to %>/.rvm/scripts/rvm
+export RAILS_ENV=<%= rails_env %>
+
+WORKER="$1" && shift
+QUEUE="$1" && shift
+
+PIDFILE=<%= pid_path %>/resque.${WORKER}.pid
+CMD="bundle exec rake environment resque:work QUEUE=${QUEUE} PIDFILE=${PIDFILE}"
+
+cd <%= current_path %> >/dev/null
+
+sig () {
+  test -s "$PIDFILE" && kill -$1 $(<$PIDFILE)
+}
+
+case $1 in
+start)
+  sig 0 && echo >&2 "Already running" && exit 0
+  exec $CMD
+  ;;
+stop)
+  sig TERM && exit 0
+  echo >&2 "Not running"
+  ;;
+*)
+  echo >&2 "Usage: $0 <start|stop>"
+  exit 1
+  ;;
+esac

data/lib/capper/unicorn.rb

@@ -23,7 +23,17 @@ check process unicorn
   stop program = "<%= unicorn_script %> stop"
 EOF
 
-  namespace :deploy do
+  namespace :unicorn do
+    desc "Generate unicorn configuration files"
+    task :setup, :roles => :app, :except => { :no_release => true } do
+      upload_template_file("unicorn.rb",
+                           unicorn_config,
+                           :mode => "0644")
+      upload_template_file("unicorn.sh",
+                           unicorn_script,
+                           :mode => "0755")
+    end
+
     desc "Start unicorn"
     task :start, :roles => :app, :except => { :no_release => true } do
       run "#{unicorn_script} start"
@@ -38,18 +48,6 @@ EOF
     task :restart, :roles => :app, :except => { :no_release => true } do
       run "#{unicorn_script} upgrade"
     end
-  end
-
-  namespace :unicorn do
-    desc "Generate unicorn configuration files"
-    task :setup, :roles => :app, :except => { :no_release => true } do
-      upload_template_file("unicorn.rb",
-                           unicorn_config,
-                           :mode => "0644")
-      upload_template_file("unicorn.sh",
-                           unicorn_script,
-                           :mode => "0755")
-    end
 
     desc "Kill unicorn (this should only be used if all else fails)"
     task :kill, :roles => :app, :except => { :no_release => true } do
@@ -73,4 +71,5 @@ EOF
   end
 
   after "deploy:update_code", "unicorn:setup"
+  after "deploy:restart", "unicorn:restart"
 end

metadata

@@ -2,7 +2,7 @@
 name: capper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors: 
 - "Benedikt B\xC3\xB6hm"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 +02:00
+date: 2011-10-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,10 +87,12 @@ files:
 - lib/capper/monit.rb
 - lib/capper/multistage.rb
 - lib/capper/rails.rb
+- lib/capper/resque.rb
 - lib/capper/rvm.rb
 - lib/capper/sass.rb
 - lib/capper/templates/delayed_job.sh.erb
 - lib/capper/templates/rails.console.sh.erb
+- lib/capper/templates/resque.sh.erb
 - lib/capper/templates/unicorn.rb.erb
 - lib/capper/templates/unicorn.sh.erb
 - lib/capper/unicorn.rb