capper 0.3.6 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capper (0.2.4)
+    capper (0.3.6)
       capistrano
       capistrano_colors
       erubis

data/capper.gemspec

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

data/lib/capper/base.rb

@@ -16,6 +16,9 @@ include Capper::Utils::Templates
 require 'capper/utils/multistage'
 include Capper::Utils::Multistage
 
+require 'capper/utils/monit'
+include Capper::Utils::Monit
+
 # define a bunch of defaults that make sense
 Capper.load do
   # do not trace by default

data/lib/capper/monit.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/base' unless defined?(Capper)
+
+Capper.load do
+  set(:monitrc) { "#{deploy_to}/.monitrc.local" }
+
+  namespace :monit do
+    task :setup do
+      str = fetch(:monit_configs, {}).join("\n\n")
+      upload_template_string(str, monitrc, :mode => "0644")
+    end
+
+    task :reload do
+      run "monit reload &>/dev/null"
+    end
+  end
+
+  after "deploy:update_code", "monit:setup"
+  before "deploy:restart", "monit:reload"
+end

data/lib/capper/templates/unicorn.rb.erb

@@ -46,8 +46,15 @@ end
 before_fork do |server, worker|
   # the following is highly recomended for Rails + "preload_app true"
   # as there's no need for the master process to hold a connection
-  defined?(ActiveRecord::Base) and
+  if defined?(ActiveRecord::Base)
     ActiveRecord::Base.connection.disconnect!
+  end
+
+  if defined?(DataObjects::Pooling)
+    DataObjects::Pooling.pools.each do |pool|
+      pool.dispose
+    end
+  end
 
   # This allows a new master process to incrementally
   # phase out the old master process with SIGTTOU to avoid a
@@ -66,8 +73,17 @@ end
 
 after_fork do |server, worker|
   # the following is *required* for Rails + "preload_app true",
-  defined?(ActiveRecord::Base) and
+  if defined?(ActiveRecord::Base)
     ActiveRecord::Base.establish_connection
+  end
+
+  if defined?(Rails)
+    if defined?(ActiveSupport::Cache::DalliStore)
+      if Rails.cache.is_a?(ActiveSupport::Cache::DalliStore)
+        Rails.cache.reset
+      end
+    end
+  end
 
   # if preload_app is true, then you may also want to check and
   # restart any other shared sockets/descriptors such as Memcached,

data/lib/capper/unicorn.rb

@@ -16,6 +16,13 @@ Capper.load do
   set(:unicorn_config) { "#{config_path}/unicorn.rb" }
   set(:unicorn_pidfile) { "#{shared_path}/pids/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"
+EOF
+
   namespace :deploy do
     desc "Start unicorn"
     task :start, :roles => :app, :except => { :no_release => true } do
@@ -36,10 +43,10 @@ Capper.load do
   namespace :unicorn do
     desc "Generate unicorn configuration files"
     task :setup, :roles => :app, :except => { :no_release => true } do
-      upload_template("unicorn.rb", unicorn_config,
-                      :mode => "0644", :prefix => "unicorn")
-      upload_template("unicorn.sh", unicorn_script,
-                      :mode => "0755", :prefix => "unicorn")
+      upload_template_file("unicorn.rb", unicorn_config,
+                           :mode => "0644", :prefix => "unicorn")
+      upload_template_file("unicorn.sh", unicorn_script,
+                           :mode => "0755", :prefix => "unicorn")
     end
 
     desc "Kill unicorn (this should only be used if all else fails)"

data/lib/capper/utils/monit.rb

@@ -0,0 +1,11 @@
+class Capper
+  module Utils
+    module Monit
+
+      def monit_config(name, body)
+        set(:monit_configs, fetch(:monit_configs, []) << "# #{name}\n#{body}")
+      end
+
+    end
+  end
+end

data/lib/capper/utils/templates.rb

@@ -7,14 +7,19 @@ class Capper
       # render an erb template from config/deploy/templates to the current
       # server list. this will render and upload templates serially using a
       # server-specific @variables binding. see get_binding for details.
-      def upload_template(name, path, options={})
+      def upload_template_file(name, path, options={})
         template = "config/deploy/templates/#{name}.erb"
 
         unless File.exist?(template)
           template = File.expand_path("../../templates/#{name}.erb", __FILE__)
         end
 
-        erb = Erubis::Eruby.new(File.open(template).read)
+        str = File.open(template).read
+        upload_template_string(str, path, options)
+      end
+
+      def upload_template_string(str, path, options={})
+        erb = Erubis::Eruby.new(str)
         prefix = options.delete(:prefix)
 
         if task = current_task

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capper
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2011-08-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &12039700 !ruby/object:Gem::Requirement
+  requirement: &11917960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12039700
+  version_requirements: *11917960
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &12039260 !ruby/object:Gem::Requirement
+  requirement: &11917520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12039260
+  version_requirements: *11917520
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &12038840 !ruby/object:Gem::Requirement
+  requirement: &11917100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12038840
+  version_requirements: *11917100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12038340 !ruby/object:Gem::Requirement
+  requirement: &11916600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *12038340
+  version_requirements: *11916600
 description: Capistrano is a collection of opinionated Capistrano recipes
 email:
 - bb@xnull.de
@@ -79,6 +79,7 @@ files:
 - lib/capper/gem.rb
 - lib/capper/git.rb
 - lib/capper/hoptoad.rb
+- lib/capper/monit.rb
 - lib/capper/multistage.rb
 - lib/capper/rails.rb
 - lib/capper/rvm.rb
@@ -86,6 +87,7 @@ files:
 - lib/capper/templates/unicorn.sh.erb
 - lib/capper/unicorn.rb
 - lib/capper/utils/load.rb
+- lib/capper/utils/monit.rb
 - lib/capper/utils/multistage.rb
 - lib/capper/utils/templates.rb
 - lib/capper/whenever.rb