capistrano-sidekiq 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf404dc615e49f5dcacb9c604b35e4740e5f4535
-  data.tar.gz: 1f8f6105c214f25f0783f8e43f6f879e8ff8047b
+  metadata.gz: 5ad138283f25fb8e7f052e76ebe99b729b97b6fe
+  data.tar.gz: f9ac72309d9b3973170be0510fe23e44e355b3a7
 SHA512:
-  metadata.gz: 3fe9ffb7062889b92fe95c06c4eee6eef1d7abc8b50ad1903567334f877edc9f480e45bc15c6258ba54345c63a5d3766d8f4d9702d98171d7b3e45b6b166c3f5
-  data.tar.gz: 2d5766260c45ef69c38f449b1343d0e52fbc2419912998edd443c16ff32e20ad3ba68b9ef5aaaf1c117851bd19bc166ab688be32963e6440476db75b82ce727e
+  metadata.gz: f6b45f749f552181926bb83c1e43c4ce811cd922a55585f438725621255e2263a22be1bf666d60db14d08788094761cf09cd2ed5d078c39ada24b1675c9229e2
+  data.tar.gz: c4a9082ac21c841d0b1c0d9a83d831846542ea3bdb77587003ffc1fa8c5525a6194d2e86a71873d8d356fe99a1d41f586874cd212548417f4a90114c3d7b1411

data/README.md

@@ -8,14 +8,38 @@ Add this line to your application's Gemfile:
 
     gem 'capistrano-sidekiq' , github: 'seuros/capistrano-sidekiq'
 
+or:
+
+    gem 'capistrano-sidekiq'
 
 And then execute:
 
     $ bundle
 
+
 ## Usage
+```ruby
+    # Capfile
+
+    require 'capistrano/sidekiq'
+```
+
+
+Configurable options, shown here with defaults:
+
+```ruby
+    :sidekiq_default_hooks =>  true
+    :sidekiq_pid =>  File.join(shared_path, 'tmp', 'pids', 'sidekiq.pid')
+    :sidekiq_env =>  fetch(:rack_env, fetch(:rails_env, fetch(:stage)))
+    :sidekiq_log =>  File.join(shared_path, 'log', 'sidekiq.log')
+    :sidekiq_options =>  "-e #{fetch(:sidekiq_env)} -L #{fetch(:sidekiq_log)}"
+    :sidekiq_timeout =>  10
+    :sidekiq_role =>  :app
+    :sidekiq_processes =>  1
+    :sidekiq_cmd => "#{fetch(:bundle_cmd, "bundle")} exec sidekiq"  # Only for capistrano2.5
+    :sidekiqctl_cmd => "#{fetch(:bundle_cmd, "bundle")} exec sidekiqctl" # Only for capistrano2.5
+```
 
-TODO: Write usage instructions here
 
 ## Contributing
 

data/lib/capistrano/sidekiq/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Sidekiq
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/lib/capistrano/tasks/capistrano2.rb

@@ -1,11 +1,18 @@
 Capistrano::Configuration.instance.load do
 
   _cset(:sidekiq_default_hooks) { true }
+
+  _cset(:sidekiq_pid) { File.join(shared_path, 'pids', 'sidekiq.pid') }
+  _cset(:sidekiq_env) { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
+  _cset(:sidekiq_log) { File.join(shared_path, 'log', 'sidekiq.log') }
+
+  _cset(:sidekiq_options) { nil }
+
   _cset(:sidekiq_cmd) { "#{fetch(:bundle_cmd, "bundle")} exec sidekiq" }
   _cset(:sidekiqctl_cmd) { "#{fetch(:bundle_cmd, "bundle")} exec sidekiqctl" }
-  _cset(:sidekiq_timeout)   { 10 }
-  _cset(:sidekiq_role)      { :app }
-  _cset(:sidekiq_pid)       { "#{current_path}/tmp/pids/sidekiq.pid" }
+
+  _cset(:sidekiq_timeout) { 10 }
+  _cset(:sidekiq_role) { :app }
   _cset(:sidekiq_processes) { 1 }
 
   if fetch(:sidekiq_default_hooks)
@@ -18,7 +25,12 @@ Capistrano::Configuration.instance.load do
   namespace :sidekiq do
     def for_each_process(&block)
       fetch(:sidekiq_processes).times do |idx|
-        yield((idx == 0 ? "#{fetch(:sidekiq_pid)}" : "#{fetch(:sidekiq_pid)}-#{idx}"), idx)
+        pid_file = if idx.zero? && fetch(:sidekiq_processes) <= 1
+          fetch(:sidekiq_pid)
+        else
+          fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
+        end
+        yield(pid_file, idx)
       end
     end
 
@@ -38,9 +50,22 @@ Capistrano::Configuration.instance.load do
 
     desc 'Start sidekiq'
     task :start, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
-      rails_env = fetch(:rails_env, 'production')
       for_each_process do |pid_file, idx|
-        run "cd #{current_path} ; nohup #{fetch(:sidekiq_cmd)} -e #{rails_env} -i #{idx} -P #{pid_file} >> #{current_path}/log/sidekiq.log 2>&1 &", :pty => false
+        args = []
+        args.push "--index #{idx}"
+        args.push "--pidfile #{pid_file}"
+        args.push "--environment #{fetch(:sidekiq_env)}"
+        args.push "--logfile #{fetch(:sidekiq_log)}" if fetch(:sidekiq_log)
+        args.push fetch(:sidekiq_options)
+
+        if defined?(JRUBY_VERSION)
+          args.push ">/dev/null 2>&1 &"
+          logger.info 'Since JRuby doesn\'t support Process.daemon, Sidekiq will not be running as a daemon.'
+        else
+          args.push "--daemon"
+        end
+
+        run "cd #{current_path} ; #{fetch(:sidekiq_cmd)} #{args.compact.join(' ')} ", :pty => false
       end
     end
 

data/lib/capistrano/tasks/sidekiq.cap

@@ -6,8 +6,7 @@ namespace :load do
     set :sidekiq_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:stage))) }
     set :sidekiq_log, -> { File.join(shared_path, 'log', 'sidekiq.log') }
 
-    # "-d -i INT -P PATH" are added automatically.
-    set :sidekiq_options, -> { "-e #{fetch(:sidekiq_env)} -L #{fetch(:sidekiq_log)}" }
+    set :sidekiq_options, -> { nil }
 
     set :sidekiq_timeout, -> { 10 }
     set :sidekiq_role, -> { :app }
@@ -28,7 +27,12 @@ end
 namespace :sidekiq do
   def for_each_process(&block)
     fetch(:sidekiq_processes).times do |idx|
-      yield((idx.zero? ? "#{fetch(:sidekiq_pid)}" : "#{fetch(:sidekiq_pid).gsub('.pid', "-#{idx}.pid")}"), idx)
+      pid_file = if idx.zero? && fetch(:sidekiq_processes) <= 1
+        fetch(:sidekiq_pid)
+      else
+        fetch(:sidekiq_pid).gsub(/\.pid$/, "-#{idx}.pid")
+      end
+      yield(pid_file, idx)
     end
   end
 
@@ -70,14 +74,21 @@ namespace :sidekiq do
     on roles fetch(:sidekiq_role) do
       within current_path do
         for_each_process do |pid_file, idx|
-          command = "-i #{idx} -P #{pid_file} #{fetch(:sidekiq_options)}"
+          args = []
+          args.push "--index #{idx}"
+          args.push "--pidfile #{pid_file}"
+          args.push "--environment #{fetch(:sidekiq_env)}"
+          args.push "--logfile #{fetch(:sidekiq_log)}" if fetch(:sidekiq_log)
+          args.push fetch(:sidekiq_options)
+
           if defined?(JRUBY_VERSION)
-            command = "#{command} >/dev/null 2>&1 &"
-            warn 'Since JRuby doesn\'t support Process.daemon, Sidekiq will be running without the -d flag.'
+            args.push ">/dev/null 2>&1 &"
+            warn 'Since JRuby doesn\'t support Process.daemon, Sidekiq will not be running as a daemon.'
           else
-            command = "-d #{command}"
+            args.push "--daemon"
           end
-          execute :bundle, :exec, :sidekiq, command
+
+          execute :bundle, :exec, :sidekiq, args.compact.join(' ')          
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Abdelkader Boudih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano