capistrano-sidekiq 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59d3f35bd7ebbfc7e6df0bff99cc2868ac0c2e8c
-  data.tar.gz: 44686daa3a94f6c3df36bc17d9703391bf9c79aa
+  metadata.gz: ebc1abbf8019a19cb12257e5ef1be58b60cf5b7f
+  data.tar.gz: fc80367f3d79b9681c209f48d29c64e72c1c9ee1
 SHA512:
-  metadata.gz: 4fcb69a80c59367e6300ad2a867d89305f10613ade1800e4c922b370b6f61da50d8eda13131104215b36924943a9461dd54aa59dda6fee3d7d3cc029295bc29d
-  data.tar.gz: 494ad520b542a15cf8ec19d620df3edd06e25a245705af6f9f25203ddbb27359bc29c93fbee616966ee2c5fffa414823431e25503993448012725505100f69b7
+  metadata.gz: bbc73ca5ff458753c9b1ae3ca28e2120380ecda81bc146534930b9a9cf640fc028c21a19897da5251c55935cb0156cf22e644ed5a389047acfe1bd65b4b4e0de
+  data.tar.gz: d869d15a31d51ed10daba29a1d244684f09ad8c8b843ec2d306296b07263f00310d69ef86ae584a5d09f73d4e6823bbe89c214c6ef5f257c6a77bbb695dcedb9

data/README.md

@@ -10,7 +10,7 @@ Add this line to your application's Gemfile:
 
 or:
 
-    gem 'capistrano-sidekiq'
+    gem 'capistrano-sidekiq' , group: :development
 
 And then execute:
 
@@ -43,6 +43,7 @@ Configurable options, shown here with defaults:
     :sidekiqctl_cmd => "#{fetch(:bundle_cmd, "bundle")} exec sidekiqctl" # Only for capistrano2.5
 ```
 ## Changelog
+- 0.2.7: Signal usage @penso
 - 0.2.6: sidekiq:start check if sidekiq is running
 - 0.2.5: bug fixes
 - 0.2.4: Fast deploy with :sidekiq_run_in_background
@@ -52,6 +53,7 @@ Configurable options, shown here with defaults:
 ## Contributors
 
 - [Jérémy Lecour] (https://github.com/jlecour)
+- [Fabien Penso] (https://github.com/penso)
 
 ## Contributing
 

data/lib/capistrano/sidekiq.rb

@@ -1,4 +1,4 @@
-if Gem::Specification::find_by_name('capistrano').version >= Gem::Version.new('3.0.0')
+if Gem::Specification.find_by_name('capistrano').version >= Gem::Version.new('3.0.0')
   load File.expand_path('../tasks/sidekiq.cap', __FILE__)
 else
   require_relative 'tasks/capistrano2'

data/lib/capistrano/sidekiq/monit.rb

@@ -1,2 +1,2 @@
-#load monit tasks
+# load monit tasks
 load File.expand_path('../../tasks/monit.cap', __FILE__)

data/lib/capistrano/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Sidekiq
-    VERSION = '0.2.6'
+    VERSION = '0.2.7'
   end
 end

data/lib/capistrano/tasks/capistrano2.rb

@@ -17,7 +17,7 @@ Capistrano::Configuration.instance.load do
 
   if fetch(:sidekiq_default_hooks)
     before 'deploy:update_code', 'sidekiq:quiet'
-    after 'deploy:stop',    'sidekiq:stop'
+    after 'deploy:stop', 'sidekiq:stop'
     after 'deploy:start', 'sidekiq:start'
     before 'deploy:restart', 'sidekiq:restart'
   end
@@ -25,10 +25,10 @@ Capistrano::Configuration.instance.load do
   namespace :sidekiq do
     def for_each_process(&block)
       fetch(:sidekiq_processes).times do |idx|
-        pid_file = if idx.zero? && fetch(:sidekiq_processes) <= 1
-          fetch(:sidekiq_pid)
+        if idx.zero? && fetch(:sidekiq_processes) <= 1
+          pid_file = fetch(:sidekiq_pid)
         else
-          fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
+          pid_file = fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
         end
         yield(pid_file, idx)
       end
@@ -57,32 +57,32 @@ Capistrano::Configuration.instance.load do
         args.push '--daemon'
       end
 
-      run "cd #{current_path} ; #{fetch(:sidekiq_cmd)} #{args.compact.join(' ')} ", :pty => false
+      run "cd #{current_path} ; #{fetch(:sidekiq_cmd)} #{args.compact.join(' ')} ", pty: false
     end
 
     desc 'Quiet sidekiq (stop accepting new work)'
-    task :quiet, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
+    task :quiet, roles: lambda { fetch(:sidekiq_role) }, on_no_matching_servers: :continue do
       for_each_process do |pid_file, idx|
         quiet_process(pid_file, idx)
       end
     end
 
     desc 'Stop sidekiq'
-    task :stop, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
+    task :stop, roles: lambda { fetch(:sidekiq_role) }, on_no_matching_servers: :continue do
       for_each_process do |pid_file, idx|
         stop_process(pid_file, idx)
       end
     end
 
     desc 'Start sidekiq'
-    task :start, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
+    task :start, roles: lambda { fetch(:sidekiq_role) }, on_no_matching_servers: :continue do
       for_each_process do |pid_file, idx|
         start_process(pid_file, idx)
       end
     end
 
     desc 'Rolling-restart sidekiq'
-    task :rolling_restart, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
+    task :rolling_restart, roles: lambda { fetch(:sidekiq_role) }, on_no_matching_servers: :continue do
       for_each_process do |pid_file, idx|
         stop_process(pid_file, idx)
         start_process(pid_file, idx)
@@ -90,7 +90,7 @@ Capistrano::Configuration.instance.load do
     end
 
     desc 'Restart sidekiq'
-    task :restart, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
+    task :restart, roles: lambda { fetch(:sidekiq_role) }, on_no_matching_servers: :continue do
       stop
       start
     end

data/lib/capistrano/tasks/sidekiq.cap

@@ -9,8 +9,8 @@ namespace :load do
     set :sidekiq_role, -> { :app }
     set :sidekiq_processes, -> { 1 }
     # Rbenv and RVM integration
-    set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w{ sidekiq sidekiqctl })
-    set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w{ sidekiq sidekiqctl })
+    set :rbenv_map_bins, fetch(:rbenv_map_bins).to_a.concat(%w(sidekiq sidekiqctl))
+    set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w(sidekiq sidekiqctl))
   end
 
 end
@@ -22,7 +22,7 @@ namespace :deploy do
 end
 
 namespace :sidekiq do
-  def for_each_process(reverse=false, &block)
+  def for_each_process(reverse = false, &block)
     pids = processes_pids
     pids.reverse! if reverse
     pids.each_with_index do |pid_file, idx|
@@ -52,19 +52,27 @@ namespace :sidekiq do
   end
 
   def stop_sidekiq(pid_file)
-    if  fetch(:stop_sidekiq_in_background, fetch(:sidekiq_run_in_background))
-      background :bundle, :exec, :sidekiqctl, 'stop', "#{pid_file}", fetch(:sidekiq_timeout)
+    if fetch(:stop_sidekiq_in_background, fetch(:sidekiq_run_in_background))
+      if fetch(:sidekiq_use_signals)
+        background "kill -TERM `cat #{pid_file}`"
+      else
+        background :bundle, :exec, :sidekiqctl, 'stop', "#{pid_file}", fetch(:sidekiq_timeout)
+      end
     else
       execute :bundle, :exec, :sidekiqctl, 'stop', "#{pid_file}", fetch(:sidekiq_timeout)
     end
   end
 
-  def quit_sidekiq(pid_file)
-    begin
-      execute :bundle, :exec, :sidekiqctl, 'quiet', "#{pid_file}"
-    rescue SSHKit::Command::Failed
-      # If gems are not installed eq(first deploy) and sidekiq_default_hooks as active
-      warn 'sidekiqctl not found (ignore if this is the first deploy)'
+  def quiet_sidekiq(pid_file)
+    if fetch(:sidekiq_use_signals)
+      background "kill -USR1 `cat #{pid_file}`"
+    else
+      begin
+        execute :bundle, :exec, :sidekiqctl, 'quiet', "#{pid_file}"
+      rescue SSHKit::Command::Failed
+        # If gems are not installed eq(first deploy) and sidekiq_default_hooks as active
+        warn 'sidekiqctl not found (ignore if this is the first deploy)'
+      end
     end
   end
 
@@ -79,13 +87,13 @@ namespace :sidekiq do
     args.push fetch(:sidekiq_options) if fetch(:sidekiq_options)
 
     if defined?(JRUBY_VERSION)
-      args.push ">/dev/null 2>&1 &"
+      args.push '>/dev/null 2>&1 &'
       warn 'Since JRuby doesn\'t support Process.daemon, Sidekiq will not be running as a daemon.'
     else
-      args.push "--daemon"
+      args.push '--daemon'
     end
 
-    if  fetch(:start_sidekiq_in_background, fetch(:sidekiq_run_in_background))
+    if fetch(:start_sidekiq_in_background, fetch(:sidekiq_run_in_background))
       background :bundle, :exec, :sidekiq, args.compact.join(' ')
     else
       execute :bundle, :exec, :sidekiq, args.compact.join(' ')
@@ -102,10 +110,10 @@ namespace :sidekiq do
   desc 'Quiet sidekiq (stop processing new tasks)'
   task :quiet do
     on roles fetch(:sidekiq_role) do
-      if test("[ -d #{current_path} ]")   #fixes #11
+      if test("[ -d #{current_path} ]") # fixes #11
         for_each_process(true) do |pid_file, idx|
           if pid_process_exists?(pid_file)
-            quit_sidekiq(pid_file)
+            quiet_sidekiq(pid_file)
           end
         end
       end
@@ -150,7 +158,7 @@ namespace :sidekiq do
     end
   end
 
-  #delete any pid file not in use
+  # Delete any pid file not in use
   task :cleanup do
     on roles fetch(:sidekiq_role) do
       for_each_process do |pid_file, idx|
@@ -161,7 +169,7 @@ namespace :sidekiq do
     end
   end
 
-  #TODO : Don't start if all proccess are off, raise warning.
+  # TODO : Don't start if all proccess are off, raise warning.
   desc 'Respawn missing sidekiq proccesses'
   task :respawn do
     invoke 'sidekiq:cleanup'
@@ -174,17 +182,16 @@ namespace :sidekiq do
     end
   end
 
-
   def template_sidekiq(from, to, role)
     [
-        File.join('lib','capistrano','templates',"#{from}-#{role.hostname}-#{fetch(:stage)}.rb"),
-        File.join('lib','capistrano','templates',"#{from}-#{role.hostname}.rb"),
-        File.join('lib','capistrano','templates',"#{from}-#{fetch(:stage)}.rb"),
-        File.join('lib','capistrano','templates',"#{from}.rb.erb"),
-        File.join('lib','capistrano','templates',"#{from}.rb"),
-        File.join('lib','capistrano','templates',"#{from}.erb"),
-        File.expand_path("../../templates/#{from}.rb.erb", __FILE__),
-        File.expand_path("../../templates/#{from}.erb", __FILE__)
+      File.join('lib', 'capistrano', 'templates', "#{from}-#{role.hostname}-#{fetch(:stage)}.rb"),
+      File.join('lib', 'capistrano', 'templates', "#{from}-#{role.hostname}.rb"),
+      File.join('lib', 'capistrano', 'templates', "#{from}-#{fetch(:stage)}.rb"),
+      File.join('lib', 'capistrano', 'templates', "#{from}.rb.erb"),
+      File.join('lib', 'capistrano', 'templates', "#{from}.rb"),
+      File.join('lib', 'capistrano', 'templates', "#{from}.erb"),
+      File.expand_path("../../templates/#{from}.rb.erb", __FILE__),
+      File.expand_path("../../templates/#{from}.erb", __FILE__)
     ].each do |path|
       if File.file?(path)
         erb = File.read(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sidekiq integration for Capistrano