caplets 1.0.2 → 1.0.3

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 1.0.3 - 2011.05.25
+  * Improved process management of deploy:unicorn commands.
+
+== 1.0.2
+  * No changes. The 1.0.1 gem was not properly created, so it was yanked and replaced
+    with 1.0.2.
+
 == 1.0.1
   * bundle:install now uses `bundle check` to short-circuit if possible
   * Add deploy:passenger:reload

data/lib/caplets/unicorn.rb

@@ -19,6 +19,16 @@ namespace :deploy do
      "while [ #{'!' unless to_disappear} -f tmp/pids/#{pid} ] ; do sleep 1; done"
     end
 
+    def wait_for_workers
+      working_count =
+        "cat tmp/pids/unicorn.pid | " +
+        "xargs ps -o command --ppid | " +
+        "grep unicorn | " +
+        "wc -l"
+      condition = "$(#{working_count}) -lt #{fetch(:server_processes)}"
+      "while [ #{condition} ]  ; do sleep 1 ; done"
+    end
+
     desc "Write the unicorn config to the shared directory."
     task :config, :roles => :app, :except => {:no_release => true} do
       config = File.read(__FILE__).split(/^__END__$/, 2)[1]
@@ -28,30 +38,27 @@ namespace :deploy do
 
     desc "Start the unicorn master and workers."
     task :start, :roles => :app, :except => {:no_release => true} do
-      run_current start_cmd
+      run_current start_cmd, wait_for_workers
     end
 
     desc "Stop the unicorn master and workers."
     task :stop, :roles => :app, :except => {:no_release => true} do
-      run_current stop_cmd
+      run_current stop_cmd, wait_for_pid('unicorn.pid', :to_disappear)
     end
 
     desc "Restart the unicorn master and workers."
     task :restart, :roles => :app, :except => {:no_release => true} do
-      run_current stop_cmd,
-                  wait_for_pid('unicorn.pid', :to_disappear),
-                  start_cmd,
-                  wait_for_pid('unicorn.pid'),
-                  'sleep 5' # app start-up
+      stop
+      start
     end
 
     desc "Reload the unicorn master and workers with zero downtime."
     task :reload, :roles => :app, :except => {:no_release => true} do
-      run_current stop_cmd('USR2'),
-                  wait_for_pid('unicorn.pid.oldbin'),
-                  wait_for_pid('unicorn.pid'),
-                  'sleep 5', # app start-up
-                  stop_cmd('QUIT', 'unicorn.pid.oldbin')
+      run_current stop_cmd('USR2'),                      # boot new master
+                  wait_for_pid('unicorn.pid.oldbin'),    # wait for master switch
+                  wait_for_pid('unicorn.pid'),           # wait for new master
+                  wait_for_workers,                      # wait for new workers
+                  stop_cmd('QUIT', 'unicorn.pid.oldbin') # stop old master
     end
   end
 end

data/lib/caplets/version.rb

@@ -2,7 +2,7 @@ module Caplets
   module Version
     MAJOR = 1
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     BUILD = nil
     STRING = [MAJOR,MINOR,TINY,BUILD].compact.join('.')
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: caplets
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors: 
 - Dean Strelau
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -04:00
+date: 2011-05-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :runtime
   version_requirements: *id001
@@ -82,23 +72,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Capistrano super powers