capistrano-unicorn 0.1.4 → 0.1.5

data/Rakefile

@@ -0,0 +1,2 @@
+require 'bundler'
+require 'bundler/gem_tasks'

data/lib/capistrano-unicorn/capistrano_integration.rb

@@ -11,6 +11,12 @@ module CapistranoUnicorn
         def remote_file_exists?(full_path)
           'true' ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
         end
+        
+        # Check if process is running
+        #
+        def process_exists?(pid_file)
+          capture("ps -p $(cat #{pid_file}) ; true").strip.split("\n").size == 2
+        end
 
         # Set unicorn vars
         #
@@ -21,6 +27,15 @@ module CapistranoUnicorn
         namespace :unicorn do
           desc 'Start Unicorn'
           task :start, :roles => :app, :except => {:no_release => true} do
+            if remote_file_exists?(unicorn_pid)
+              if process_exists?(unicorn_pid)
+                logger.important("Unicorn is already running!", "Unicorn")
+                next
+              else
+                run "rm #{unicorn_pid}"
+              end
+            end
+            
             config_path = "#{current_path}/config/unicorn/#{unicorn_env}.rb"
             if remote_file_exists?(config_path)
               logger.important("Starting...", "Unicorn")
@@ -33,8 +48,13 @@ module CapistranoUnicorn
           desc 'Stop Unicorn'
           task :stop, :roles => :app, :except => {:no_release => true} do
             if remote_file_exists?(unicorn_pid)
-              logger.important("Stopping...", "Unicorn")
-              run "#{try_sudo} kill `cat #{unicorn_pid}`"
+              if process_exists?(unicorn_pid)
+                logger.important("Stopping...", "Unicorn")
+                run "#{try_sudo} kill `cat #{unicorn_pid}`"
+              else
+                run "rm #{unicorn_pid}"
+                logger.important("Unicorn is not running.", "Unicorn")
+              end
             else
               logger.important("No PIDs found. Check if unicorn is running.", "Unicorn")
             end
@@ -43,8 +63,13 @@ module CapistranoUnicorn
           desc 'Unicorn graceful shutdown'
           task :graceful_stop, :roles => :app, :except => {:no_release => true} do
             if remote_file_exists?(unicorn_pid)
-              logger.important("Stopping...", "Unicorn")
-              run "#{try_sudo} kill -s QUIT `cat #{unicorn_pid}`"
+              if process_exists?(unicorn_pid)
+                logger.important("Stopping...", "Unicorn")
+                run "#{try_sudo} kill -s QUIT `cat #{unicorn_pid}`"
+              else
+                run "rm #{unicorn_pid}"
+                logger.important("Unicorn is not running.", "Unicorn")
+              end
             else
               logger.important("No PIDs found. Check if unicorn is running.", "Unicorn")
             end

data/lib/capistrano-unicorn/version.rb

@@ -1,5 +1,5 @@
 module CapistranoUnicorn
   unless defined?(::CapistranoUnicorn::VERSION)
-    VERSION = "0.1.4".freeze
+    VERSION = "0.1.5".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000Z
+date: 2012-02-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &2160139940 !ruby/object:Gem::Requirement
+  requirement: &2165055020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160139940
+  version_requirements: *2165055020
 description: Capistrano plugin that integrates Unicorn server tasks.
 email: dan.sosedoff@gmail.com
 executables: []
@@ -31,6 +31,7 @@ files:
 - .gitignore
 - Gemfile
 - README.md
+- Rakefile
 - capistrano-unicorn.gemspec
 - examples/rails3.rb
 - lib/capistrano-unicorn.rb