sidekiq-postpone 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e3cb2a3cb960cb9c435d3cbfd5940c4e098511d2
-  data.tar.gz: db19928e3eee8cf028922d63b3a2cb0e794ef8b4
+SHA256:
+  metadata.gz: 84a89193bb8e0ab78b7b5150307f5e59a130d8f7cd9042621c35bac7a1648ab4
+  data.tar.gz: 2cfae440c4f663e51bbf7866defac44525a0a2b77bbf4baf7e1b39278b535609
 SHA512:
-  metadata.gz: 819afe7efa1922c29ba91676613c1e5462e04d546f472a8caa7328b905546e5b18e396d2c69cc147abc24a56cdd5beeee34842ba6f0518aea683538413fafe01
-  data.tar.gz: f87519e96c1f79fe43a1416ef252a19699955acdd108628cecfe29c50626f584764abc3215cc391b9d971fa396aa4c10b75a997db90438278fa730db4fd2c177
+  metadata.gz: ee5312224a86a288ad8a0615ddb5dea981606fcaa602fa65fa840c8143fb836e42e0d9d5ea6667060a63df8edd9937db32b2606e0b10887d057336dff26f4a01
+  data.tar.gz: 1e39d84d4da4d3fc0d2b637367a9e7752b990dec5014e555764cbc480c5b13a616e7992d97bc309ef3a469c414f9290444acb548ad4b2dc49c51e88d8ee1601f

data/.travis.yml

@@ -4,10 +4,10 @@ services:
   - redis-server
 rvm:
   - 2.1
-  - 2.2
+  - 2.2.2
   - 2.3.0
+  - 2.4
 gemfile:
-  - Gemfile
   - gemfiles/sidekiq_3.0.gemfile
   - gemfiles/sidekiq_3.1.gemfile
   - gemfiles/sidekiq_3.2.gemfile
@@ -15,12 +15,19 @@ gemfile:
   - gemfiles/sidekiq_3.4.gemfile
   - gemfiles/sidekiq_3.5.gemfile
   - gemfiles/sidekiq_4.0.gemfile
-  - gemfiles/sidekiq_4.1.0.gemfile
-  - gemfiles/sidekiq_4.1.1.gemfile
-  - gemfiles/sidekiq_4.1.2.gemfile
-  - gemfiles/sidekiq_4.1.3.gemfile
+  - gemfiles/sidekiq_4.1.gemfile
+  - gemfiles/sidekiq_4.2.gemfile
+  - gemfiles/sidekiq_5.0.gemfile
+  - gemfiles/sidekiq_master.gemfile
+matrix:
+  fast_finish: true
+  exclude:
+    - gemfile: gemfiles/sidekiq_5.0.gemfile
+      rvm: 2.1
+    - gemfile: gemfiles/sidekiq_master.gemfile
+      rvm: 2.1
 
-before_install: gem install bundler -v 1.12
+before_install: gem install bundler -v 1.15
 script:
   - bundle exec rake spec
   - bundle exec rake spec:sidekiq_testing_integration

data/Appraisals

@@ -26,18 +26,18 @@ appraise 'sidekiq-4.0' do
   gem 'sidekiq', '~> 4.0.0'
 end
 
-appraise 'sidekiq-4.1.0' do
-  gem 'sidekiq', '4.1.0'
+appraise 'sidekiq-4.1' do
+  gem 'sidekiq', '~> 4.1.0'
 end
 
-appraise 'sidekiq-4.1.1' do
-  gem 'sidekiq', '4.1.1'
+appraise 'sidekiq-4.2' do
+  gem 'sidekiq', '~> 4.2.0'
 end
 
-appraise 'sidekiq-4.1.2' do
-  gem 'sidekiq', '4.1.2'
+appraise 'sidekiq-5.0' do
+  gem 'sidekiq', '~> 5.0.0'
 end
 
-appraise 'sidekiq-4.1.3' do
-  gem 'sidekiq', '4.1.3'
+appraise 'sidekiq-master' do
+  gem 'sidekiq', github: 'mperham/sidekiq'
 end

data/gemfiles/{sidekiq_4.1.0.gemfile → sidekiq_4.1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "sidekiq", "4.1.0"
+gem "sidekiq", "~> 4.1.0"
 
 gemspec :path => "../"

data/gemfiles/{sidekiq_4.1.1.gemfile → sidekiq_4.2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "sidekiq", "4.1.1"
+gem "sidekiq", "~> 4.2.0"
 
 gemspec :path => "../"

data/gemfiles/{sidekiq_4.1.2.gemfile → sidekiq_5.0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "sidekiq", "4.1.2"
+gem "sidekiq", "~> 5.0.0"
 
 gemspec :path => "../"

data/gemfiles/{sidekiq_4.1.3.gemfile → sidekiq_master.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "sidekiq", "4.1.3"
+gem "sidekiq", :github => "mperham/sidekiq"
 
 gemspec :path => "../"

data/lib/sidekiq/postpone/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   class Postpone
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/lib/sidekiq/postpone.rb

@@ -11,18 +11,26 @@ class Sidekiq::Postpone
     setup_schedule
   end
 
-  def wrap
-    start
-    yield.tap do
-      stop
-      flush
+  def wrap(join_parent: true, flush: true)
+    enter!
+    begin
+      yield self
+    rescue
+      clear!
+      raise
+    end.tap do
+      if join_parent && (parent = Thread.current[:sidekiq_postpone_stack][-2])
+        join!(parent)
+      elsif flush
+        flush!
+      end
     end
   ensure
-    stop
+    leave!
   end
 
-  def self.wrap(&block)
-    new.wrap(&block)
+  def self.wrap(*client_args, **kwargs, &block)
+    new(*client_args).wrap(**kwargs, &block)
   end
 
   def push(payloads)
@@ -34,25 +42,62 @@ class Sidekiq::Postpone
     end
   end
 
-  private
+  def clear!
+    @queues.clear
+    @schedule.clear
+  end
+
+  def flush!
+    return if empty?
+
+    current_postpone = Thread.current[:sidekiq_postpone]
+    Thread.current[:sidekiq_postpone] = nil # activate real raw_push
 
-  def flush
     client = Sidekiq::Client.new(*@client_args)
     raw_push = client.method(:raw_push)
     @queues.each_value(&raw_push)
     raw_push.(@schedule) unless @schedule.empty?
+  ensure
+    Thread.current[:sidekiq_postpone] = current_postpone
   end
 
-  def start
-    if Thread.current[:sidekiq_postpone]
-      raise 'Nested Sidekiq::Postpone is not supported'
+  def join!(other)
+    return if empty?
+
+    @queues.each do |name, payloads|
+      other.queues[name].concat(payloads)
     end
+    other.schedule.concat(@schedule)
+
+    clear!
+  end
 
+  def empty?
+    @queues.empty? && @schedule.empty?
+  end
+
+  protected
+
+  attr_reader :queues, :schedule
+
+  private
+
+  def enter!
+    if @entered
+      raise 'Sidekiq::Postpone#wrap is not re-enterable on the same instance'
+    else
+      @entered = true
+    end
+    Thread.current[:sidekiq_postpone_stack] ||= []
+    Thread.current[:sidekiq_postpone_stack].push(self)
     Thread.current[:sidekiq_postpone] = self
   end
 
-  def stop
-    Thread.current[:sidekiq_postpone] = nil
+  def leave!
+    Thread.current[:sidekiq_postpone_stack].pop
+    head = Thread.current[:sidekiq_postpone_stack].last
+    Thread.current[:sidekiq_postpone] = head
+    @entered = false
   end
 
   def setup_queues

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-postpone
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Vladimir Kochnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -122,10 +122,10 @@ files:
 - gemfiles/sidekiq_3.4.gemfile
 - gemfiles/sidekiq_3.5.gemfile
 - gemfiles/sidekiq_4.0.gemfile
-- gemfiles/sidekiq_4.1.0.gemfile
-- gemfiles/sidekiq_4.1.1.gemfile
-- gemfiles/sidekiq_4.1.2.gemfile
-- gemfiles/sidekiq_4.1.3.gemfile
+- gemfiles/sidekiq_4.1.gemfile
+- gemfiles/sidekiq_4.2.gemfile
+- gemfiles/sidekiq_5.0.gemfile
+- gemfiles/sidekiq_master.gemfile
 - lib/sidekiq/postpone.rb
 - lib/sidekiq/postpone/core_ext.rb
 - lib/sidekiq/postpone/version.rb
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Bulk-pushes jobs to Sidekiq when you need it to.