capistrano-runit-sidekiq 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24212d7ed209d6eceb06ff79382855bc798f3684
-  data.tar.gz: e3d4f106530b76160a818c88bf65ed040983c790
+  metadata.gz: 4a52a7b2735c55b68d0f1b4b223a350707b9305c
+  data.tar.gz: 2fb2225b5479e932cc02ad6362a5ea04f999d0c0
 SHA512:
-  metadata.gz: 7b13b96890f9e8940e56939942f46078f7375a1cb41707f79052473579bcef8723da33ad116f942c76c20a86ff57b0c3d729db4cdec1d889845a37b78c1defcc
-  data.tar.gz: 78680926c4680002190067dd6b48deb398254e8751a6b88fba5ba41f6429364f8b2de3a8b9ded1ebffc9e247bb6fd4d276ed226943fb9b98433d24fe4802c91d
+  metadata.gz: 49a71def6e8ef50233491eb59802c8099af4cb9f611557589a2205d95efdb25127a3e21d27653d1b00c42a2d1c697f1823709d0c5e542c55a201395ee18a4089
+  data.tar.gz: 7783451c4a541852a1ae1b0004ad1a3b5df03b3aba660c821ad7e77dd14b58a13e482f8a446fd1d10a3a14fafe02e920ea59ab374b28fc8d54a88b9c569c216c

data/README.md

@@ -37,10 +37,10 @@ require "capistrano/runit/sidekiq"
 * `runit_sidekiq_default_hooks` -- run default hooks for runit sidekiq or not. Default value: `true`.
 * `runit_sidekiq_role` -- Role on where sidekiq will be running. Default value: `:app`
 * `runit_sidekiq_pid` -- Pid file path. Default value: `tmp/sidekiq.pid`
-* `runit_sidekiq_run_template` -- path to ERB template of `run` file. Default value: internal default template (`lib/capistrano/runit/templates/run-puma.erb`).
 * `runit_sidekiq_concurrency` -- number of threads of sidekiq process. Default value: `nil`.
 * `runit_sidekiq_queues` -- array of queue names. Default value: `nil`.
 * `runit_sidekiq_config_path` -- relative path to config file. Default value: `nil`.
+* `runit_sidekiq_require` -- Location of Rails application with workers or file to require. Default value: `nil`.
 
 ## Contributing
 

data/capistrano-runit-sidekiq.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name        = "capistrano-runit-sidekiq"
-  spec.version     = '0.1.1'
+  spec.version     = '0.2'
   spec.author      = ['Oleksandr Simonov', 'Anton Ageev']
   spec.email       = ['alex@simonov.me', 'antage@gmail.com']
   spec.summary     = %q{Capistrano3 tasks for manage sidekiq via runit supervisor.}
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0")
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'capistrano-runit-core', '~> 0.1.0'
+  spec.add_runtime_dependency 'capistrano-runit-core', '~> 0.2.0'
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
 end

data/lib/capistrano/tasks/sidekiq.rake

@@ -2,16 +2,16 @@ include ::Capistrano::Runit
 
 namespace :load do
   task :defaults do
-    set :runit_sidekiq_run_template, nil
     set :runit_sidekiq_concurrency, nil
-    set :runit_sidekiq_pid, -> { 'tmp/pids/sidekiq.pid' }
+    set :runit_sidekiq_pid, -> { File.join(shared_path, 'tmp', 'pids', 'sidekiq.pid') }
     set :runit_sidekiq_queues, nil
+    set :runit_sidekiq_require, nil
     set :runiq_sidekiq_config_path, nil
     set :runit_sidekiq_default_hooks, -> { true }
     set :runit_sidekiq_role, -> { :app }
     # 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))
+    set :rvm_map_bins, fetch(:rvm_map_bins).to_a.concat(%w(sidekiq))
   end
 end
 
@@ -26,7 +26,7 @@ namespace :runit do
     # Helpers
 
     def sidekiq_enabled_service_dir
-      enabled_service_dir_for('sidekid')
+      enabled_service_dir_for('sidekiq')
     end
 
     def sidekiq_service_dir
@@ -41,6 +41,7 @@ namespace :runit do
       collect_log_sidekiq_param(array)
       collect_pid_sidekiq_param(array)
       collect_config_sidekiq_param(array)
+      collect_require_sidekiq_params(array)
       array.compact.join(' ')
     end
 
@@ -61,6 +62,12 @@ namespace :runit do
       array << "-c #{concurrency}"
     end
 
+    def collect_require_sidekiq_params(array)
+      require_file_or_folder = fetch(:runit_sidekiq_require)
+      return unless require_file_or_folder
+      array << "-r #{require_file_or_folder}"
+    end
+
     def collect_queues_sidekiq_params(array)
       queues = fetch(:runit_sidekiq_queues)
       if queues && queues.is_a?(::Array)
@@ -77,7 +84,7 @@ namespace :runit do
     end
 
     def collect_log_sidekiq_param(array)
-      array << "-L #{File.join(current_path, 'log', "sidekiq.#{sidekiq_environment}.log")}"
+      array << "-L #{File.join(shared_path, 'log', "sidekiq.#{sidekiq_environment}.log")}"
     end
 
     def collect_pid_sidekiq_param(array)
@@ -131,9 +138,7 @@ namespace :runit do
       pid_file = pid_full_path(fetch(:runit_sidekiq_pid))
       on roles fetch(:runit_sidekiq_role) do
         if test "[ -f #{pid_file} ]" && test("kill -0 $( cat #{pid_file})")
-          within current_path do
-            execute :bundle, :exec, :sidekiqctl, 'quiet', "#{pid_file}"
-          end
+          runit_execute_command('sidekiq', '1')
         else
           info 'Sidekiq is not running'
           if test("[ -f #{pid_file} ]")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-runit-sidekiq
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Oleksandr Simonov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-runit-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -90,8 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Capistrano3 tasks for manage sidekiq via runit supervisor.
 test_files: []
+has_rdoc: