capistrano-delayed_job 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfd64b9524bfdcc7ca184b4c082d1c326ca0329f
-  data.tar.gz: 8c885db63c53dc54f0b042f773bda7f9d1948489
+  metadata.gz: 4c2b2aac7920f4ef333fc5782642c6fb5b795259
+  data.tar.gz: fe118a6f27bfb083f139ebbb8743f7af97d16fc7
 SHA512:
-  metadata.gz: 3ea8b20d184b145405bef6f45d42c5a39a6b5db84f392764ae399fe9e153f7c735413090f95ddd967165e43df24edfa0899caca1009b2778ff91a195a2f41d57
-  data.tar.gz: bbdd734d9be60ce35d4aa7d8aa0029be466bdebaa45543020720c39c3cf68d52a0b42b6d6a5fcec5d8d85e52eb63a7bd2ff753abd12d4a6199dc138538be5b8e
+  metadata.gz: e853030813c0c3e93136957bdc206fe732a5b64762dd4210269f06e57b8c2fcf0541feb6773b7b6f35de92cb5c7b7718c17d70dabdfdadd7e4e5c500a4889fa0
+  data.tar.gz: 7a9435122bcf70c90d2521e2ea1aaa71ffc60bbdf331fd339a7a7cbf2aaeeff3581b77d986fd4a618e7b968b3d9436fd5cac8e8df38f3bb5062a4671809cfbf5

data/Gemfile.lock

@@ -1,37 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.0)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.7)
+    addressable (2.3.8)
     builder (3.2.2)
     capistrano (3.4.0)
       i18n
       rake (>= 10.0.0)
       sshkit (~> 1.3)
-    capistrano-monit_runit (3.0.2)
+    capistrano-monit_runit (3.0.3)
       activesupport (>= 3.0)
       capistrano (~> 3.4)
-    colorize (0.7.5)
+    colorize (0.7.7)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     git (1.2.9.1)
-    github_api (0.12.3)
+    github_api (0.12.4)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
+      hashie (>= 3.4)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
+      nokogiri (~> 1.6.6)
       oauth2
-    hashie (3.4.0)
-    highline (1.7.1)
+    hashie (3.4.2)
+    highline (1.7.3)
     i18n (0.7.0)
     jeweler (2.0.1)
       builder
@@ -42,11 +42,11 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.2)
-    jwt (1.4.1)
+    json (1.8.3)
+    jwt (1.5.1)
     mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.11.0)
+    minitest (5.8.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-scp (1.2.1)
@@ -60,7 +60,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    rack (1.6.0)
+    rack (1.6.4)
     rake (10.4.2)
     rdoc (4.2.0)
     sshkit (1.7.1)
@@ -80,3 +80,6 @@ DEPENDENCIES
   capistrano (~> 3.4)
   capistrano-monit_runit (~> 3.0.2)
   jeweler (~> 2.0)
+
+BUNDLED WITH
+   1.10.5

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.0.4

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.3 ruby lib
+# stub: capistrano-delayed_job 3.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-delayed_job"
-  s.version = "3.0.3"
+  s.version = "3.0.4"
 
   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-08-07"
+  s.date = "2015-08-13"
   s.description = "Capistrano recipes for Delayed Job using runit and monit."
   s.email = "leifcr@gmail.com"
   s.extra_rdoc_files = [

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

@@ -11,6 +11,10 @@ module Capistrano
           service_pid("#{service_name(worker_number)}")
         end
 
+        def app_env_service_name(worker_number)
+          "#{user_app_env_underscore}_#{fetch(:delayed_job_monit_base_service_name)}_#{worker_number}"
+        end
+
         def service_name(worker_number)
           "#{fetch(:delayed_job_monit_base_service_name)}_#{worker_number}"
         end

data/lib/capistrano/tasks/monit.rake

@@ -14,7 +14,7 @@ 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, Capistrano::Helpers::DelayedJob::Monit.service_name(n)
+          set :tmp_delayed_job_monit_service_name, Capistrano::Helpers::DelayedJob::Monit.app_env_service_name(n)
           set :tmp_worker_number, 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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-delayed_job
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Leif Ringstad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano