capper 0.5.0 → 0.6.0

data/capper.gemspec

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

data/lib/capper/base.rb

@@ -45,11 +45,14 @@ Capper.load do
 
   # default app layout
   _cset(:user) { application }
-  _cset(:bin_path) { File.join(deploy_to, "bin") }
+
   _cset(:base_path) { "/var/app" }
-  _cset(:config_path) { "#{shared_path}/config" }
   set(:deploy_to) { "#{base_path}/#{application}" }
 
+  _cset(:bin_path) { File.join(deploy_to, "bin") }
+  _cset(:pid_path) { File.join(shared_path, "pids") }
+  _cset(:config_path) { File.join(shared_path, "config") }
+
   # set proper unicode locale, so gemspecs with unicode chars will not crash
   # bundler. see https://github.com/capistrano/capistrano/issues/70
   _cset(:default_environment, { 'LANG' => 'en_US.UTF-8' })

data/lib/capper/delayed_job.rb

@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+
+require 'capper/bundler'
+
+Capper.load do
+  # unicorn configuration variables
+  _cset(:delayed_job_workers, {})
+
+  # these cannot be overriden
+  set(:delayed_job_script) { File.join(bin_path, "delayed_job") }
+
+  monit_config "delayed_job", <<EOF, :roles => :worker
+<% delayed_job_workers.each do |name, range| %>
+check process delayed_job_<%= name %>
+  with pidfile <%= pid_path %>/delayed_job.<%= name %>.pid
+<% if range.nil? %>
+  start program = "<%= delayed_job_script %> start <%= name %>"
+  stop program = "<%= delayed_job_script %> stop <%= name %>"
+<% else %>
+  start program = "<%= delayed_job_script %> start <%= name %> <%= range.begin %> <%= range.end %>"
+  stop program = "<%= delayed_job_script %> stop <%= name %> <%= range.begin %> <%= range.end %>"
+<% end %>
+  group delayed_job
+
+<% end %>
+EOF
+
+  namespace :delayed_job do
+    desc "Generate delayed_job configuration files"
+    task :setup, :except => { :no_release => true } do
+      upload_template_file("delayed_job.sh",
+                           delayed_job_script,
+                           :mode => "0755")
+    end
+  end
+
+  after "deploy:update_code", "delayed_job:setup"
+end

data/lib/capper/monit.rb

@@ -5,14 +5,16 @@ Capper.load do
 
   namespace :monit do
     task :setup do
-      configs = []
+      configs = fetch(:monit_configs, {})
 
-      fetch(:monit_configs, {}).each do |name, body|
-        configs << "# #{name}\n#{body}"
+      upload_template(monitrc, :mode => "0644") do |server|
+        configs.keys.select do |name|
+          options = configs[name][:options]
+          find_servers(options).include?(server)
+        end.map do |name|
+          "# #{name}\n#{configs[name][:body]}"
+        end.join("\n\n")
       end
-
-      upload_template_string(configs.join("\n\n"),
-                             monitrc, :mode => "0644")
     end
 
     task :reload do

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

@@ -0,0 +1,19 @@
+#!/bin/bash
+export HOME=<%= deploy_to %>
+source <%= deploy_to %>/.rvm/scripts/rvm
+export RAILS_ENV=<%= rails_env %>
+
+cd <%= current_path %> >/dev/null
+
+CMD=$1 && shift
+ID=$1 && shift
+
+if [[ $# -ge 1 ]]; then
+  MIN="--min-priority $1" && shift
+fi
+
+if [[ $# -ge 1 ]]; then
+  MAX="--max-priority $1" && shift
+fi
+
+exec bundle exec ./script/delayed_job $CMD --prefix <%= application %> --identifier $ID --pid-dir=<%= pid_path %> $MIN $MAX

data/lib/capper/unicorn.rb

@@ -12,15 +12,15 @@ Capper.load do
   _cset(:unicorn_backlog, 64)
 
   # these cannot be overriden
-  set(:unicorn_script) { "#{bin_path}/unicorn" }
-  set(:unicorn_config) { "#{config_path}/unicorn.rb" }
-  set(:unicorn_pidfile) { "#{shared_path}/pids/unicorn.pid" }
+  set(:unicorn_script) { File.join(bin_path, "unicorn") }
+  set(:unicorn_config) { File.join(config_path, "unicorn.rb") }
+  set(:unicorn_pidfile) { File.join(pid_path, "unicorn.pid") }
 
   monit_config "unicorn", <<EOF
 check process unicorn
-  with pidfile "<%= shared_path %>/pids/unicorn.pid"
-  start program = "<%= bin_path %>/unicorn start" with timeout 60 seconds
-  stop program = "<%= bin_path %>/unicorn stop"
+  with pidfile "<%= unicorn_pidfile %>"
+  start program = "<%= unicorn_script %> start" with timeout 60 seconds
+  stop program = "<%= unicorn_script %> stop"
 EOF
 
   namespace :deploy do
@@ -43,10 +43,12 @@ EOF
   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", :prefix => "unicorn")
-      upload_template_file("unicorn.sh", unicorn_script,
-                           :mode => "0755", :prefix => "unicorn")
+      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)"

data/lib/capper/utils/monit.rb

@@ -2,8 +2,10 @@ class Capper
   module Utils
     module Monit
 
-      def monit_config(name, body)
-        set(:monit_configs, fetch(:monit_configs, {}).merge(name => body))
+      def monit_config(name, body, options={})
+        set(:monit_configs, fetch(:monit_configs, {}).merge(name => {
+          :options => options, :body => body
+        }))
       end
 
     end

data/lib/capper/utils/templates.rb

@@ -19,9 +19,12 @@ class Capper
       end
 
       def upload_template_string(str, path, options={})
-        erb = Erubis::Eruby.new(str)
-        prefix = options.delete(:prefix)
+        upload_template(path, options) do |server|
+          str
+        end
+      end
 
+      def upload_template(path, options={})
         if task = current_task
           servers = find_servers_for_task(task, options)
         else
@@ -33,36 +36,12 @@ class Capper
         end
 
         servers.each do |server|
-          result = erb.result(get_binding(prefix, server.host))
+          erb = Erubis::Eruby.new(yield server)
+          result = erb.result(binding())
           put(result, path, options.merge!(:host => server.host))
         end
       end
 
-      # this allows for server specific variables. example:
-      #
-      # set :unicorn_worker_processes, {
-      #   "app1.example.com" => 4,
-      #   "app2.example.com" => 8,
-      # }
-      def get_binding(prefix, server)
-        b = binding()
-
-        variables.keys.select do |k|
-          k =~ /^#{prefix}_/
-        end.each do |k|
-          v = fetch(k)
-
-          if v.kind_of?(Hash)
-            eval("set(:#{k}, \"#{v[server] || v["default"]}\")", b)
-          else
-            eval("set(:#{k}, \"#{v}\")", b)
-          end
-        end
-
-        return b
-      end
-      private :get_binding
-
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &9113720 !ruby/object:Gem::Requirement
+  requirement: &15467440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9113720
+  version_requirements: *15467440
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &9113280 !ruby/object:Gem::Requirement
+  requirement: &15467000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9113280
+  version_requirements: *15467000
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &9112860 !ruby/object:Gem::Requirement
+  requirement: &15466580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9112860
+  version_requirements: *15466580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9112360 !ruby/object:Gem::Requirement
+  requirement: &15466080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *9112360
+  version_requirements: *15466080
 description: Capistrano is a collection of opinionated Capistrano recipes
 email:
 - bb@xnull.de
@@ -76,6 +76,7 @@ files:
 - lib/capper/base.rb
 - lib/capper/bundler.rb
 - lib/capper/config.rb
+- lib/capper/delayed_job.rb
 - lib/capper/gem.rb
 - lib/capper/git.rb
 - lib/capper/hoptoad.rb
@@ -84,6 +85,7 @@ files:
 - lib/capper/rails.rb
 - lib/capper/rvm.rb
 - lib/capper/sass.rb
+- lib/capper/templates/delayed_job.sh.erb
 - lib/capper/templates/unicorn.rb.erb
 - lib/capper/templates/unicorn.sh.erb
 - lib/capper/unicorn.rb