simple-capistrano-unicorn 0.0.4 → 0.0.5

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## v 0.0.5: Lets the user specify Unicorn command. 
+
 ## v 0.0.4: Removal of unused variables, and making sure that we don't try to delete pids that aren't there.
 
 ## v 0.0.3: Better documentation.

data/README.md

@@ -69,4 +69,5 @@ You can customize the gems behavior by setting any (or all) of the following opt
 * `unicorn_config` the path to the unicorn config file. Defaults to `"#{current_path}/config/unicorn.rb"`.
 * `unicorn_log` the path where unicorn places its STDERR-log. Defaults to `"#{shared_path}/log/unicorn.stderr.log"`.
 * `use_bundler` defines whether Unicorn should start with `bundle exec` or not. Default to `true`.
-* `rails_env` sets the environment that the server will run in. Defaults to `"production"`.
+* `rails_env` sets the environment that the server will run in. Defaults to `"production"`.
+* `unicorn_command` lets you specify the Unicorn command if you want to use `unicorn_rails`. Defaults to `"unicorn"`.

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

@@ -12,9 +12,10 @@ module SimpleCapistranoUnicorn
         _cset(:unicorn_log)     { "#{shared_path}/log/unicorn.stderr.log" }
         _cset(:use_bundler)     { true }
         _cset(:rails_env)       { "production" }
+        _cset(:unicorn_command) { "unicorn" }
 
         def process_running?(server, pidfile)
-          cmd = "if [ -e #{unicorn_pid} ]; then ps cax | grep `cat #{pidfile}` > /dev/null; if [ $? -eq 0 ]; then echo -n running; fi; fi"
+          cmd = "if [ -e #{pidfile} ]; then ps cax | grep `cat #{pidfile}` > /dev/null; if [ $? -eq 0 ]; then echo -n running; fi; fi"
           'running' == capture(cmd, :hosts => [server])
         end
 
@@ -35,12 +36,12 @@ module SimpleCapistranoUnicorn
         end
 
         def start_unicorn(server)
-          run "cd #{current_path}; #{'bundle exec' if use_bundler} unicorn -c #{unicorn_config} -E #{rails_env} -D", :hosts => [server]
+          run "cd #{current_path}; #{'bundle exec' if use_bundler} #{unicorn_command} -c #{unicorn_config} -E #{rails_env} -D", :hosts => [server]
         end
 
         def clean_old_unicorn(server)
           if old_unicorn_is_running?(server)
-            run "kill -s QUIT `cat #{unicorn_old_pid}`", :hosts => [server]
+            run "if [ -e #{unicorn_old_pid} ]; then kill -s QUIT `cat #{unicorn_old_pid}`; fi", :hosts => [server]
             run "if [ -e #{unicorn_old_pid} ]; then rm #{unicorn_old_pid}; fi", :hosts => [server]
             logger.info nice_output("Cleaned up old Unicorn", server)
           end
@@ -71,7 +72,7 @@ module SimpleCapistranoUnicorn
           task :stop, :roles => :app do
             find_servers(:roles => :app).each do |server|
               if unicorn_is_running?(server)
-                run "kill -s QUIT `cat #{unicorn_pid}`", :hosts => [server]
+                run "if [ -e #{unicorn_pid} ]; then kill -s QUIT `cat #{unicorn_pid}`; fi", :hosts => [server]
                 run "if [ -e #{unicorn_pid} ]; then rm #{unicorn_pid}; fi", :hosts => [server]
                 logger.info nice_output("Stopped Unicorn!", server)
               else
@@ -89,12 +90,13 @@ 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(1)
-                clean_old_unicorn(server)
+                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("Unicorn wasn't running, started it!", server)
+                logger.info nice_output("Started Unicorn!", server)
               end
             end
           end

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

@@ -1,7 +1,7 @@
 module Capistrano
   module Unicorn
     module Methods
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-capistrano-unicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simple-capistrano-unicorn
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Contains a collection of simple tasks to manage Unicorn with Capistrano.