simple-capistrano-unicorn 0.0.6 → 0.0.7

data/README.md

@@ -6,29 +6,35 @@ This gem is composed from the gems `capistrano-unicorn-methods` and `capistrano-
 
 ## Setup
 
-### 1. Require this gem in deploy.rb
+### 1. Add Gem to Gemfile
+
+```ruby
+gem 'simple-capistrano-unicorn'
+```
+
+### 2. Require this gem in deploy.rb
 
 You should add this line in the bottom of `RAILS_ROOT/config/deploy.rb`:
 
-```
+```ruby
 require 'simple-capistrano-unicorn'
 ```
 
-### 2. Restart Unicorn on deploy
+### 3. Restart Unicorn on deploy
 
 You should place this line in `RAILS_ROOT/config/deploy.rb`:
 
-```
+```ruby
 after :deploy, "unicorn:restart"
 ```
 
-### 3. Add unicorn.rb (only for single-stage setup)
+### 4. Add unicorn.rb (only for single-stage setup)
 
 Grab the sample Unicorn configuration here: http://unicorn.bogomips.org/examples/unicorn.conf.rb
 
 And place it here: `RAILS_ROOT/config/unicorn.rb`
 
-### 4. Add unicorn stage files (only for multi-stage setup)
+### 5. Add unicorn stage files (only for multi-stage setup)
 
 Make sure that you are using the multi-stage extension for Capistrano ( https://github.com/capistrano/capistrano/wiki/2.x-Multistage-Extension )
 
@@ -38,7 +44,7 @@ You should create different Unicorn files to use for each of your different envi
 
 You can then override the `unicorn_config`-variable that this gem is listening for, by placing this in `RAILS_ROOT/config/deploy.rb`:
 
-```
+```ruby
 set(:unicorn_config) { "#{fetch(:current_path)}/config/unicorn/#{fetch(:stage)}.rb" }
 ```
 

data/lib/simple-capistrano-unicorn/namespace.rb

@@ -81,7 +81,7 @@ module SimpleCapistranoUnicorn
             end
           end
 
-          # Restarts the unicorn process(es) with the URS2 code, to gracefully
+          # Restarts the unicorn process(es) with the USR2 code, to gracefully
           # create a new server, and kill of the old one, leaving *no* downtime.
           #
           desc "Zero-downtime restart of Unicorn"
@@ -90,15 +90,14 @@ module SimpleCapistranoUnicorn
               if unicorn_is_running?(server)
                 pid = capture "cat #{unicorn_pid}", :hosts => [server]
                 run "kill -s USR2 #{pid.to_i}", :hosts => [server] if pid.to_i > 0
-                sleep(5)
                 logger.info nice_output("Restarted Unicorn!", server)
-                clean_old_unicorn(server)
               else
                 logger.info nice_output("Unicorn wasn't running, starting it!", server)
                 start_unicorn(server)
                 logger.info nice_output("Started Unicorn!", server)
               end
             end
+            unicorn.cleanup
           end
 
           desc "Restart of Unicorn with downtime"
@@ -122,6 +121,7 @@ module SimpleCapistranoUnicorn
           #
           desc "Cleans up the old unicorn processes"
           task :cleanup, :roles => :app do
+            logger.info "Cleaning up old Unicorns.."
             find_servers(:roles => :app).each do |server|
               clean_old_unicorn(server)
             end

data/lib/simple-capistrano-unicorn/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Unicorn
     module Methods
-      VERSION = "0.0.6"
+      VERSION = "0.0.7"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-capistrano-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake