capistrano-sidekiq 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91f1e11f4d1bc4cd2191a9656fcc4540dca65f76
-  data.tar.gz: fda4951957c6c6d6c8ec10fb2ea7de28baed145a
+  metadata.gz: 9edb38405222576fce492b0c77a9c6ba2dee7bb6
+  data.tar.gz: 0ea1fe8a36a8566d03d26cc68be5dcb7406825cc
 SHA512:
-  metadata.gz: 674d982c2517fe6f418f8b46a2af6a89318426acfef78e919da7c42409dd1ef8a4a543f9e198c9ae93a1cb4537fc9401fba3aededc6277da16e02c0ee78650a2
-  data.tar.gz: dc373e85a7503d2074799c23fd42e382ae8d35aec3ca4c5c06100e5f4a77a31c85875060342a856310c96e30cf43b5d40cd4d51bb402419370b9cfe87ea73255
+  metadata.gz: b94ffa22a4abc9e36fc48a86d444d8ac5eb4d3d3d39df9180392ca67b6619eb3856a04a1761cea1a3f59b9afa76844f907620ab6bc69f071b902a45baa12561f
+  data.tar.gz: c260577d4f458bb56d2d7a9142cde377bc1bde20d744cd0b91a21a397d56f483ae15cc0eb492723c96d8bbfa596dc47ac3a446e307850fad7d168ffc54965e8b

data/lib/capistrano/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Sidekiq
-    VERSION = '0.3.5'
+    VERSION = '0.3.6'
   end
 end

data/lib/capistrano/tasks/capistrano2.rb

@@ -4,6 +4,7 @@ Capistrano::Configuration.instance.load do
 
   _cset(:sidekiq_pid) { File.join(shared_path, 'pids', 'sidekiq.pid') }
   _cset(:sidekiq_env) { fetch(:rack_env, fetch(:rails_env, 'production')) }
+  _cset(:sidekiq_tag) { nil }
   _cset(:sidekiq_log) { File.join(shared_path, 'log', 'sidekiq.log') }
 
   _cset(:sidekiq_options) { nil }

data/lib/capistrano/tasks/sidekiq.cap

@@ -19,7 +19,7 @@ namespace :deploy do
   before :starting, :check_sidekiq_hooks do
     invoke 'sidekiq:add_default_hooks' if fetch(:sidekiq_default_hooks)
   end
-  after :restart, :restart_sidekiq do
+  after :publishing, :restart_sidekiq do
     invoke 'sidekiq:restart' if fetch(:sidekiq_default_hooks)
   end
 end
@@ -47,11 +47,11 @@ namespace :sidekiq do
   end
 
   def pid_process_exists?(pid_file)
-    pid_file_exists?(pid_file) and test("kill -0 $( cat #{pid_file} )")
+    pid_file_exists?(pid_file) and test(*("kill -0 $( cat #{pid_file} )").split(' '))
   end
 
   def pid_file_exists?(pid_file)
-    test("[ -f #{pid_file} ]")
+    test(*("[ -f #{pid_file} ]").split(' '))
   end
 
   def stop_sidekiq(pid_file)

data/lib/capistrano/templates/sidekiq_monit.conf.erb

@@ -2,8 +2,8 @@
 <% processes_pids.each_with_index do |pid_file, idx| %>
 check process <%= sidekiq_service_name(idx) %>
   with pidfile "<%= pid_file %>"
-  start program = "/usr/bin/sudo -u <%= @role.user %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiq  -P <%= pid_file  %>'" with timeout 30 seconds
+  start program = "/usr/bin/sudo -u <%= @role.user %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiq <% if fetch(:sidekiq_config) %> -C <%= fetch(:sidekiq_config) %> <% end %> -P <%= pid_file %>'" with timeout 30 seconds
   stop program = "/usr/bin/sudo -u <%= @role.user %> /bin/bash -c 'cd <%= current_path %> && <%= SSHKit.config.command_map[:bundle] %> exec sidekiqctl stop <%= pid_file %>'" with timeout <%= fetch(:sidekiq_timeout).to_i + 10  %> seconds
   group <%= fetch(:sidekiq_monit_group, fetch(:application)) %>-sidekiq
 
-<% end %>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano