capistrano-delayed_job 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fb9322ed6bc1e9a4436826b30d1722bdc05e044
-  data.tar.gz: 93241985a0bb0f41884f3b01899d24709d0c11cb
+  metadata.gz: 92facc6ff9021dc94cf07aef96a13249c1b5caaf
+  data.tar.gz: 406022ea44847ab51fbf3f6d6af625738c4b44d8
 SHA512:
-  metadata.gz: 2ad5a68ee21f517c9c6849b29408889f896b0dc5591213633e479be83895c0e6de53328dd79fc0863e79128d27cc5d59c7c6bbc55cce77ae8153d934ad281b61
-  data.tar.gz: 9c3d28cf1bc2354154e9cf1cbab2b4bfe7656b346fa33c2bfafb83ed6de26c4ff49cb628c500ccd365c0c2a0fa1d7f1fba738976686dcbd9c92c0aa1f7032c94
+  metadata.gz: 1e8f12638c5a8bdf8f76f6614d8347ec4052cd9301c17633d2113aa1f0668f943dc9d6cb4bb2af3a3d5d759189f1870d0356324a35fc53795e899b499bcba966
+  data.tar.gz: 72c7c1aca4c3d8c80f6554ade2a8308a4211887bee677f3dae1ab037294d0e173d974d0a78672862f8bfc7641a3ffde0484a37a03cb13bee396191589079d439

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'capistrano', '~> 3.4'
 gem 'activesupport', '>= 3.0'
-gem 'capistrano-monit_runit', '~> 3.0.1'
+gem 'capistrano-monit_runit', '~> 3.0.2'
 
 group :development do
   gem 'bundler', '~> 1.7'

data/Gemfile.lock

@@ -13,7 +13,7 @@ GEM
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
-    capistrano-monit_runit (3.0.1)
+    capistrano-monit_runit (3.0.2)
       activesupport (>= 3.0)
       capistrano (~> 3.4)
     colorize (0.7.5)
@@ -78,5 +78,5 @@ DEPENDENCIES
   activesupport (>= 3.0)
   bundler (~> 1.7)
   capistrano (~> 3.4)
-  capistrano-monit_runit (~> 3.0.1)
+  capistrano-monit_runit (~> 3.0.2)
   jeweler (~> 2.0)

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/capistrano-delayed_job.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: capistrano-delayed_job 3.0.1 ruby lib
+# stub: capistrano-delayed_job 3.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-delayed_job"
-  s.version = "3.0.1"
+  s.version = "3.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Leif Ringstad"]
-  s.date = "2015-03-26"
+  s.date = "2015-08-06"
   s.description = "Capistrano recipes for Delayed Job using runit and monit."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [
@@ -49,20 +49,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<capistrano>, ["~> 3.4"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_runtime_dependency(%q<capistrano-monit_runit>, ["~> 3.0.1"])
+      s.add_runtime_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
       s.add_development_dependency(%q<bundler>, ["~> 1.7"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
     else
       s.add_dependency(%q<capistrano>, ["~> 3.4"])
       s.add_dependency(%q<activesupport>, [">= 3.0"])
-      s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.1"])
+      s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
       s.add_dependency(%q<bundler>, ["~> 1.7"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
     end
   else
     s.add_dependency(%q<capistrano>, ["~> 3.4"])
     s.add_dependency(%q<activesupport>, [">= 3.0"])
-    s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.1"])
+    s.add_dependency(%q<capistrano-monit_runit>, ["~> 3.0.2"])
     s.add_dependency(%q<bundler>, ["~> 1.7"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
   end

data/lib/capistrano/helpers/delayed_job/monit.rb

@@ -7,30 +7,30 @@ module Capistrano
       module Monit
         module_function
 
-        def delayed_job_pid_file(worker_number)
-          service_pid("#{fetch(:delayed_job_runit_base_service_name)}_#{worker_number}")
+        def pid_file(worker_number)
+          service_pid("#{service_name(worker_number)}")
         end
 
-        def delayed_job_monit_service_name(worker_number)
+        def service_name(worker_number)
           "#{fetch(:delayed_job_monit_base_service_name)}_#{worker_number}"
         end
 
-        def delayed_job_monit_start_command(worker_number)
-          "/bin/bash -c '[ ! -h #{runit_service_path(delayed_job_monit_service_name(worker_number))}/run ] || /usr/bin/sv start #{runit_service_path(delayed_job_monit_service_name(worker_number))}'" # rubocop:disable Metrics/LineLength
+        def start_command(worker_number)
+          "/bin/bash -c '[ ! -h #{runit_service_path(service_name(worker_number))}/run ] || /usr/bin/sv start #{runit_service_path(service_name(worker_number))}'" # rubocop:disable Metrics/LineLength
         end
 
-        def delayed_job_monit_stop_command(worker_number)
+        def stop_command(worker_number)
           # Give delayed job 60 seconds to finish any jobs it's currently handling.
           # (Tasks that are longer than 60 seconds should be split!)
-          "/usr/bin/sv -w 60 force-stop #{runit_service_path(delayed_job_monit_service_name(worker_number))}" # rubocop:disable Metrics/LineLength
+          "/usr/bin/sv -w 60 force-stop #{runit_service_path(service_name(worker_number))}" # rubocop:disable Metrics/LineLength
         end
 
         def available_configuration_with_path(worker_number)
-          File.join(fetch(:monit_available_path), "#{fetch(:delayed_job_runit_base_service_name)}_#{worker_number}.conf")
+          File.join(fetch(:monit_available_path), "#{service_name(worker_number)}.conf")
         end
 
         def available_configuration_file(worker_number)
-          "#{fetch(:delayed_job_runit_base_service_name)}_#{worker_number}.conf"
+          "#{service_name(worker_number)}.conf"
         end
       end
     end

data/lib/capistrano/helpers/delayed_job/runit.rb

@@ -7,20 +7,20 @@ module Capistrano
       module Runit
         module_function
 
-        def delayed_job_runit_service_name(worker_number)
+        def service_name(worker_number)
           "#{fetch(:delayed_job_runit_base_service_name)}_#{worker_number}"
         end
 
-        def delayed_job_log_path(worker_number)
-          runit_var_log_service_single_service_path(delayed_job_runit_service_name(worker_number))
+        def log_path(worker_number)
+          runit_var_log_service_single_service_path(service_name(worker_number))
         end
 
         def available_configuration_with_path(worker_number)
-          File.join(fetch(:monit_available_path), "#{fetch(:delayed_job_runit_service_name)}_#{worker_number}.conf")
+          File.join(fetch(:monit_available_path), "#{service_name(worker_number)}.conf")
         end
 
         def available_configuration_file(worker_number)
-          "#{fetch(:delayed_job_runit_service_name)}_#{worker_number}.conf"
+          "#{service_name(worker_number)}.conf"
         end
       end
     end

data/lib/capistrano/tasks/monit.rake

@@ -1,15 +1,12 @@
-require 'capistrano/dsl/base_paths'
-require 'capistrano/dsl/runit_paths'
 require 'capistrano/helpers/base'
 require 'capistrano/helpers/monit'
+require 'capistrano/dsl/base_paths'
 require 'capistrano/helpers/delayed_job/monit'
-include Capistrano::DSL::BasePaths
-include Capistrano::DSL::RunitPaths
-include Capistrano::Helpers::Base
-include Capistrano::Helpers::Monit
-include Capistrano::Helpers::DelayedJob::Monit
 
 namespace :delayed_job do
+  include Capistrano::DSL::BasePaths
+  include Capistrano::Helpers::Base
+  include Capistrano::Helpers::Monit
   namespace :monit do
     desc 'MONIT: Setup Delayed Job service'
     task :setup do
@@ -17,10 +14,12 @@ namespace :delayed_job do
         (1..fetch(:delayed_job_workers)).each do |n|
           info "MONIT: Uploading configuration for Delayed Job worker #{n} for #{fetch(:application)} on #{host}"
           # Upload configuration
-          set :tmp_delayed_job_monit_service_name, delayed_job_monit_service_name(n)
+          set :tmp_delayed_job_monit_service_name, Capistrano::Helpers::DelayedJob::Monit.service_name(n)
           set :tmp_worker_number, n
-          set :tmp_delayed_job_pid_file, delayed_job_pid_file(n)
-          upload! template_to_s_io(fetch(:delayed_job_monit_config_template)), available_configuration_with_path(n)
+          set :tmp_delayed_job_pid_file, Capistrano::Helpers::DelayedJob::Monit.pid_file(n)
+          set :tmp_delayed_job_start_command, Capistrano::Helpers::DelayedJob::Monit.start_command(n)
+          set :tmp_delayed_job_stop_command, Capistrano::Helpers::DelayedJob::Monit.stop_command(n)
+          upload! template_to_s_io(fetch(:delayed_job_monit_config_template)), Capistrano::Helpers::DelayedJob::Monit.available_configuration_with_path(n)
         end
       end
     end
@@ -30,7 +29,7 @@ namespace :delayed_job do
       on roles(:app) do |host|
         (1..fetch(:delayed_job_workers)).each do |n|
           info "MONIT: Enabling service for Delayed Job worker #{n} for #{fetch(:application)} on #{host}"
-          enable_monitor(available_configuration_file(n))
+          enable_monitor(Capistrano::Helpers::DelayedJob::Monit.available_configuration_file(n))
         end
       end
     end
@@ -40,7 +39,7 @@ namespace :delayed_job do
       on roles(:app) do |host|
         (1..fetch(:delayed_job_workers)).each do |n|
           info "MONIT: Disabling service for Delayed Job worker #{n} for #{fetch(:application)} on #{host}"
-          disable_monitor(available_configuration_file(n))
+          disable_monitor(Capistrano::Helpers::DelayedJob::Monit.available_configuration_file(n))
         end
       end
     end
@@ -51,7 +50,7 @@ namespace :delayed_job do
         on roles(:app) do |host|
           (1..fetch(:delayed_job_workers)).each do |n|
             info "MONIT: #{cmd} Delayed Job worker #{n} for #{fetch(:application)} on #{host}"
-            command_monit(cmd, available_configuration_file(n))
+            command_monit(cmd, Capistrano::Helpers::DelayedJob::Monit.available_configuration_file(n))
           end
         end
       end

data/lib/capistrano/tasks/runit.rake

@@ -4,14 +4,13 @@ require 'capistrano/helpers/base'
 require 'capistrano/helpers/runit'
 require 'capistrano/helpers/delayed_job/runit'
 
-include Capistrano::DSL::BasePaths
-include Capistrano::DSL::RunitPaths
-include Capistrano::Helpers::Base
-include Capistrano::Helpers::Runit
-include Capistrano::Helpers::DelayedJob::Runit
-
 # require 'capistrano/runit'
 namespace :delayed_job do
+  include Capistrano::DSL::BasePaths
+  include Capistrano::DSL::RunitPaths
+  include Capistrano::Helpers::Base
+  include Capistrano::Helpers::Runit
+
   desc 'Setup Delayed Job configuration'
   task :setup do
     on roles(:app) do
@@ -26,31 +25,31 @@ namespace :delayed_job do
       on roles(:app) do
         (1..fetch(:delayed_job_workers)).each do |n|
           # Create runit config
-          if test("[ ! -d '#{runit_service_path(delayed_job_runit_service_name(n))}' ]")
-            execute :mkdir, "-p '#{runit_service_path(delayed_job_runit_service_name(n))}'"
+          if test("[ ! -d '#{runit_service_path(Capistrano::Helpers::DelayedJob::Runit.service_name(n))}' ]")
+            execute :mkdir, "-p '#{runit_service_path(Capistrano::Helpers::DelayedJob::Runit.service_name(n))}'"
           end
 
-          set :tmp_delayed_job_runit_service_name, delayed_job_runit_service_name(n)
+          set :tmp_delayed_job_runit_service_name, Capistrano::Helpers::DelayedJob::Runit.service_name(n)
           set :tmp_worker_number, n
 
-          upload! template_to_s_io(fetch(:delayed_job_runit_run_template)), runit_service_run_config_file(delayed_job_runit_service_name(n)) # rubocop:disable Metrics/LineLength
-          upload! template_to_s_io(fetch(:delayed_job_runit_finish_template)), runit_service_finish_config_file(delayed_job_runit_service_name(n)) # rubocop:disable Metrics/LineLength
+          upload! template_to_s_io(fetch(:delayed_job_runit_run_template)), runit_service_run_config_file(Capistrano::Helpers::DelayedJob::Runit.service_name(n)) # rubocop:disable Metrics/LineLength
+          upload! template_to_s_io(fetch(:delayed_job_runit_finish_template)), runit_service_finish_config_file(Capistrano::Helpers::DelayedJob::Runit.service_name(n)) # rubocop:disable Metrics/LineLength
 
           # Log scripts for runit service
-          if test("[ ! -d '#{runit_service_log_path(delayed_job_runit_service_name(n))}' ]")
-            execute :mkdir, "-p '#{runit_service_log_path(delayed_job_runit_service_name(n))}'"
+          if test("[ ! -d '#{runit_service_log_path(Capistrano::Helpers::DelayedJob::Runit.service_name(n))}' ]")
+            execute :mkdir, "-p '#{runit_service_log_path(Capistrano::Helpers::DelayedJob::Runit.service_name(n))}'"
           end
 
-          set :tmp_delayed_job_log_path, delayed_job_log_path(n)
+          set :tmp_delayed_job_log_path, Capistrano::Helpers::DelayedJob::Runit.log_path(n)
 
-          upload! template_to_s_io(fetch(:delayed_job_runit_log_run_template)), runit_service_log_run_file(delayed_job_runit_service_name(n)) # rubocop:disable Metrics/LineLength
+          upload! template_to_s_io(fetch(:delayed_job_runit_log_run_template)), runit_service_log_run_file(Capistrano::Helpers::DelayedJob::Runit.service_name(n)) # rubocop:disable Metrics/LineLength
 
           # Make scripts executable
-          runit_set_executable_files(delayed_job_runit_service_name(n))
+          runit_set_executable_files(Capistrano::Helpers::DelayedJob::Runit.service_name(n))
 
           # Create log paths for the service
-          if test("[ ! -d '#{runit_var_log_service_single_service_path(delayed_job_runit_service_name(n))}' ]")
-            execute :mkdir, "-p '#{runit_var_log_service_single_service_path(delayed_job_runit_service_name(n))}'"
+          if test("[ ! -d '#{runit_var_log_service_single_service_path(Capistrano::Helpers::DelayedJob::Runit.service_name(n))}' ]")
+            execute :mkdir, "-p '#{runit_var_log_service_single_service_path(Capistrano::Helpers::DelayedJob::Runit.service_name(n))}'"
           end
         end
       end
@@ -60,7 +59,7 @@ namespace :delayed_job do
     task :enable do
       on roles(:app) do
         (1..fetch(:delayed_job_workers)).each do |n|
-          enable_service(delayed_job_runit_service_name(n))
+          enable_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n))
         end
       end
     end
@@ -69,7 +68,7 @@ namespace :delayed_job do
     task :disable do
       on roles(:app) do
         (1..fetch(:delayed_job_workers)).each do |n|
-          disable_service(delayed_job_runit_service_name(n))
+          disable_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n))
         end
       end
     end
@@ -78,7 +77,7 @@ namespace :delayed_job do
     task :start do
       on roles(:app) do
         (1..fetch(:delayed_job_workers)).each do |n|
-          control_service(delayed_job_runit_service_name(n), 'start')
+          control_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n), 'start')
         end
       end
     end
@@ -87,7 +86,7 @@ namespace :delayed_job do
     task :once do
       on roles(:app) do
         (1..fetch(:delayed_job_workers)).each do |n|
-          control_service(delayed_job_runit_service_name(n), 'once')
+          control_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n), 'once')
         end
       end
     end
@@ -100,7 +99,7 @@ namespace :delayed_job do
         # Process ongoing tasks.
         (1..fetch(:delayed_job_workers)).each do |n|
           begin
-            control_service(delayed_job_runit_service_name(n), 'force-stop', '-w 45')
+            control_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n), 'force-stop', '-w 45')
           rescue
           end
         end
@@ -112,7 +111,7 @@ namespace :delayed_job do
     task :quit do
       on roles(:app) do
         (1..fetch(:delayed_job_workers)).each do |n|
-          control_service(delayed_job_runit_service_name(n), 'quit')
+          control_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n), 'quit')
         end
       end
     end
@@ -121,7 +120,7 @@ namespace :delayed_job do
     task :restart do
       on roles(:app) do
         (1..fetch(:delayed_job_workers)).each do |n|
-          control_service(delayed_job_runit_service_name(n), 'restart')
+          control_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n), 'restart')
         end
       end
     end
@@ -131,8 +130,8 @@ namespace :delayed_job do
     task :purge do
       on roles(:app) do
         (1..fetch(:delayed_job_workers)).each do |n|
-          disable_service(delayed_job_runit_service_name(n))
-          purge_service(delayed_job_runit_service_name(n))
+          disable_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n))
+          purge_service(Capistrano::Helpers::DelayedJob::Runit.service_name(n))
         end
       end
     end

data/templates/monit/delayed_job.conf.erb

@@ -6,8 +6,8 @@
 #
 check process <%= fetch(:tmp_delayed_job_monit_service_name) %>
     with pidfile <%= fetch(:tmp_delayed_job_pid_file) %>
-    start program = "<%= delayed_job_monit_start_command(fetch(:tmp_worker_number)) %>"
-    stop program = "<%= delayed_job_monit_stop_command(fetch(:tmp_worker_number)) %>"
+    start program = "<%= fetch(:tmp_delayed_job_start_command) %>"
+    stop program = "<%= fetch(:tmp_delayed_job_stop_command) %>"
     <%= "if mem is greater than #{fetch(:delayed_job_monit_memory_alert_threshold)} then alert"     unless fetch(:delayed_job_monit_memory_alert_threshold).nil? %>
     <%= "if mem is greater than #{fetch(:delayed_job_monit_memory_restart_threshold)} then restart" unless fetch(:delayed_job_monit_memory_restart_threshold).nil? %>
     <%= "if cpu is greater than #{fetch(:delayed_job_monit_cpu_alert_threshold)} then alert"        unless fetch(:delayed_job_monit_cpu_alert_threshold).nil? %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-delayed_job
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement