sidekiq-limit_fetch 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c955908fd9f7ade4f4cd2f09f00489e6aa1416e
-  data.tar.gz: 4b5aee7b583fa41536883e2bd00f94a71e2310af
+  metadata.gz: ca083933d1ef02f0cc4311954a1a0a8c82c9a0e0
+  data.tar.gz: fb76a0812ae751d02f39aeea371b37a780b6d1d0
 SHA512:
-  metadata.gz: dc6a6b608540c3c206dcb36379185c76dd6e6ce017b22846dca3fb7c9d8194e73401b3d281c1e373aeb51cd4783a17af3a1581bb137e4fd144a6ad070f348186
-  data.tar.gz: ee479c98a4e448ad29c9edb3ae1f8fe536b1fc8fca61e2713d206ae614d2cd3786fa784c8b123086bf60afdc7cdda149c35a6bb4d075b2fd52f6678f68191971
+  metadata.gz: 26f18118cbcf8896bf8fdf070438eb42a3f10658e6e413ed2bec88526a474857d38766bbea508b8f00081013a03ebb84eb47c1943ccd04b9150f91e11ee79df7
+  data.tar.gz: db1ac7268dd03b5bc28e72e9b2cef9d68e5cb606f9adb4819add906e0d2b6026d658d56d1595117955e26628eca03f05c5c4db44949f6157cac6e50c47570aa2

data/.travis.yml

@@ -1,11 +1,7 @@
 language: ruby
 rvm:
-  - 2.3.0
-  - 2.2.1
-  - jruby-head
-  - rbx-2
+  - 2.3
+  - 2.2
+  - jruby
 services:
   - redis-server
-matrix:
-  allow_failures:
-    - rvm: rbx-2

data/lib/sidekiq/limit_fetch.rb

@@ -21,7 +21,7 @@ module Sidekiq::LimitFetch
   end
 
   def retrieve_work
-    queue, job = redis_brpop *Queues.acquire, Sidekiq::BasicFetch::TIMEOUT
+    queue, job = redis_brpop(Queues.acquire)
     Queues.release_except(queue)
     UnitOfWork.new(queue, job) if job
   end
@@ -32,8 +32,14 @@ module Sidekiq::LimitFetch
 
   private
 
-  def redis_brpop(*args)
-    return if args.size < 2
-    Sidekiq.redis {|it| it.brpop *args }
+  TIMEOUT = Sidekiq::BasicFetch::TIMEOUT
+
+  def redis_brpop(queues)
+    if queues.empty?
+      sleep TIMEOUT  # there are no queues to handle, so lets sleep
+      []             # and return nothing
+    else
+      Sidekiq.redis { |it| it.brpop *queues, TIMEOUT }
+    end
   end
 end

data/lib/sidekiq/limit_fetch/queues.rb

@@ -48,7 +48,7 @@ module Sidekiq::LimitFetch::Queues
   def namespace
     @namespace ||= Sidekiq.redis do |it|
       if it.respond_to?(:namespace) and it.namespace
-        it.namespace + ':'
+        "#{it.namespace}:"
       else
         ''
       end

data/sidekiq-limit_fetch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = 'sidekiq-limit_fetch'
-  gem.version       = '3.1.0'
+  gem.version       = '3.2.1'
   gem.license       = 'MIT'
   gem.authors       = 'brainopia'
   gem.email         = 'brainopia@evilmartians.com'
@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep %r{^spec/}
-  gem.require_paths = 'lib'
+  gem.require_paths = %w(lib)
 
   gem.add_dependency 'sidekiq', '>= 4'
   gem.add_development_dependency 'redis-namespace', '~> 1.5', '>= 1.5.2'

data/spec/sidekiq/limit_fetch_spec.rb

@@ -1,7 +1,13 @@
 Thread.abort_on_exception = true
 
 RSpec.describe Sidekiq::LimitFetch do
+  let(:options) {{ queues: queues, limits: limits }}
+  let(:queues) { %w(queue1 queue1 queue2 queue2) }
+  let(:limits) {{ 'queue1' => 1, 'queue2' => 2 }}
+
   before do
+    subject::Queues.start options 
+
     Sidekiq.redis do |it|
       it.del 'queue:queue1'
       it.lpush 'queue:queue1', 'task1'
@@ -10,12 +16,6 @@ RSpec.describe Sidekiq::LimitFetch do
     end
   end
 
-  let(:options) {{ queues: queues, limits: limits }}
-  let(:queues) { %w(queue1 queue1 queue2 queue2) }
-  let(:limits) {{ 'queue1' => 1, 'queue2' => 2 }}
-
-  before { subject::Queues.start options }
-
   it 'should acquire lock on queue for execution' do
     work = subject.retrieve_work
     expect(work.queue_name).to eq 'queue1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-limit_fetch
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - brainopia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Sidekiq strategy to support queue limits