capistrano3-delayed-job 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77a24920733ed73310cf1e7dc67b1d292c69be8a
-  data.tar.gz: a680cae89fee85459df187d9a7db653cd1b5a0a7
+  metadata.gz: a7b6f4229f1858636689faeeb29ac96ec61d4a34
+  data.tar.gz: a318533c5336c8c533642998e649f0d4f61283cd
 SHA512:
-  metadata.gz: 5a012ebf0aac651a4c6ecfc285f18c7946d4126954c2eea861203e31b22cc7a446b50a201d3c4f8452622d4850b81028fe035804bb0aaf352376a8cc605a0b62
-  data.tar.gz: a33a1905e0f370303f0443dd009b9a54fc658b126f8be69f1195041468b60e0cf08645ca0966d8c6928d5eed8c36c18d120209905df216bac2c6f63d63740d35
+  metadata.gz: 33cf3a1b2e5de982ae60c5e60275ae39b5f1249f3b20471c22e1505be9bbaa692223351af7a933fcb8aac5308ebfc0a90934fa0eec310577b51da370ce3f44e4
+  data.tar.gz: f6fc4bd538fd1fd9d7d4239e2966b02658b49730e80aa414eda125f4a9d08105e8c337e79ae846fd6bca07b1d5768e653a860d5d4d116dd52f63a0f2f2e2e43b

data/README.md

@@ -48,7 +48,7 @@ set :delayed_job_queues, ['mailer','tracking']
 # Specify different pools
 # You can use this option multiple times to start different numbers of workers for different queues.
 # default value: nil
-set :delayed_job_pool, {
+set :delayed_job_pools, {
     :mailer => 2,
     :tracking => 1,
     :* => 2

data/capistrano3-delayed-job.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "capistrano3-delayed-job"
-  spec.version       = "1.1.0"
+  spec.version       = "1.2.0"
   spec.authors       = ["Juan Ignacio Donoso", "Agustin Feuerhake", "Ignacio Baixas"]
   spec.email         = ["juan.ignacio@platan.us", "agustin@platan.us", "ignacio@platanus"]
   spec.summary       = %q{Adds support for delayed_jobs to Capistrano 3.x}

data/lib/capistrano/tasks/delayed-job.rake

@@ -1,11 +1,12 @@
+require 'pry'
 namespace :delayed_job do
 
-  def args
-    args = ""
-    args += "-n #{fetch(:delayed_job_workers)}" unless fetch(:delayed_job_workers).nil?
-    args += " --queues=#{fetch(:delayed_job_queues).join(',')} " unless fetch(:delayed_job_queues).nil?
-    args += fetch(:delayed_job_pool).map {|k,v| "--pool=#{k}:#{v}"}.join(' ') unless fetch(:delayed_job_pool).nil?
-    args
+  def delayed_job_args
+    args = []
+    args << "-n #{fetch(:delayed_job_workers)}" unless fetch(:delayed_job_workers).nil?
+    args << "--queues=#{fetch(:delayed_job_queues).join(',')}" unless fetch(:delayed_job_queues).nil?
+    args << fetch(:delayed_job_pools, {}).map {|k,v| "--pool=#{k}:#{v}"}.join(' ') unless fetch(:delayed_job_pools).nil?
+    args.join(' ')
   end
 
   def delayed_job_roles
@@ -32,7 +33,7 @@ namespace :delayed_job do
     on roles(delayed_job_roles) do
       within release_path do
         with rails_env: fetch(:rails_env) do
-          execute :bundle, :exec, delayed_job_bin, args, :start
+          execute :bundle, :exec, delayed_job_bin, delayed_job_args, :start
         end
       end
     end
@@ -43,7 +44,7 @@ namespace :delayed_job do
     on roles(delayed_job_roles) do
       within release_path do
         with rails_env: fetch(:rails_env) do
-          execute :bundle, :exec, delayed_job_bin, args, :restart
+          execute :bundle, :exec, delayed_job_bin, delayed_job_args, :restart
         end
       end
     end
@@ -59,7 +60,7 @@ namespace :load do
   task :defaults do
     set :delayed_job_workers, 1
     set :delayed_job_queues, nil
-    set :delayed_job_pool, nil
+    set :delayed_job_pools, nil
     set :delayed_job_roles, :app
     set :delayed_job_bin_path, 'bin'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano3-delayed-job
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Juan Ignacio Donoso
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano