capistrano-toolbox 0.0.3 → 0.0.4

data/lib/capistrano-toolbox/helpers.rb

@@ -26,4 +26,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       `ssh #{server} -l root "#{command.gsub('"','\\"')}"`
     end
   end
+
+  def remote_file_exists?(path)
+    'true' == capture("test -f #{path} && echo true").strip
+  end
 end

data/lib/capistrano-toolbox/unicorn.rb

@@ -4,11 +4,30 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :deploy do
     namespace :unicorn do
       task :restart, :roles => :app, :except => { :no_release => true } do
-        cmd = "if [ -f #{unicorn_pid} ]; then kill -s USR2 `cat #{unicorn_pid}` ; else /etc/init.d/unicorn start ; fi"
-        # Not specifying a shell would make it run with rvm-shell which would make "unicorn start" loop forever:
+        old_pid = nil
+        if remote_file_exists?(unicorn_pid)
+          old_pid = capture("cat #{unicorn_pid}")
+          cmd = "kill -s USR2 #{old_pid}"
+        else
+          cmd = "RAILS_ENV=production /etc/init.d/unicorn start"
+        end
+
         run cmd, :shell => '/bin/bash'
+
+        sleep(1)
+        cmd = <<-SHELL
+echo -n "    Waiting for unicorn" ; while [ ! -s #{unicorn_pid} -o -s #{unicorn_pid}.oldbin ] ; do echo -n "." ; sleep 1 ; done
+SHELL
+        run(cmd, shell: '/bin/bash') do |channel, stream, data|
+          print(data)
+        end
+
+        new_pid = capture("cat #{unicorn_pid}")
+
+        if new_pid == old_pid
+          raise "Unicorn failed to restart!"
+        end
       end
     end
   end
-
 end

metadata

@@ -1,82 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capistrano-toolbox
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.0.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jean-Louis Giordano
 - Magnus Rex
+- Petter Remen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-25 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Some useful capistrano tools, such as unicorn restart, nginx config etc.
 email: dev@spnab.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/capistrano-toolbox.rb
 - lib/capistrano-toolbox/check.rb
 - lib/capistrano-toolbox/config.rb
 - lib/capistrano-toolbox/nginx.rb
 - lib/capistrano-toolbox/unicorn.rb
 - lib/capistrano-toolbox/helpers.rb
-has_rdoc: true
 homepage: http://github.com/spnab/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Some useful capistrano tools.
 test_files: []
-