resque-integration 3.5.0 → 3.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b25c3af3ff9bec74ef1a6c8355f622a8d8ed916a
-  data.tar.gz: fcebf66e66aeb96194e051ddf3381efb4b828ed1
+  metadata.gz: 2ac9ed45b21f644959195484f775e830a703084f
+  data.tar.gz: 900b0b025f6b87e4d3c25cf759e6634d04d36bd8
 SHA512:
-  metadata.gz: 151ccd775abb8e8df97149a90cdbe679a87367c6fb4a91b05116b45000f9d6eb83bfc773331c05ed87bfdc7a2eabf80c705c27d889f59c5aaa9408ed8dcb0659
-  data.tar.gz: 0c1a6450232a75c71d18168622b5db0b9069e15ca58befd2f67624e22a705965838887308ad75a198240ec9ff2114e43d69fba479734dac447ef206f1300f4da
+  metadata.gz: a9288b8eb705f78e474b3c6e01d7fe088edf3dba71ef2e18e01a325bdb1d7341273c729604fcfd4aaec80cc0511595649bb129b88bf5b35889c733c4d75eabbf
+  data.tar.gz: aee5cdca42bd456e7be7b251e41cd3ab62dbf05224170826cd84566610f5475a3946c2d51f8b8a8bd780042641c5734a5e701baefb1bd73f89824a150ad536af

data/.drone.yml

@@ -1,28 +1,74 @@
-build:
-  test:
-    image: abakpress/dind-testing
-    pull: true
-    privileged: true
-    volumes:
-      - /home/data/drone/images:/images
-      - /home/data/drone/gems:/bundle
+name: build
+
+kind: pipeline
+type: docker
+
+volumes:
+  - name: images
+    host:
+      path: /home/data/drone/images
+  - name: bundle
+    host:
+      path: /home/data/drone/gems
+  - name: rubygems
+    host:
+      path: /home/data/drone/rubygems
+
+spec_step_common: &spec_step_common
+  image: abakpress/dind-testing:1.0.3
+  pull: if-not-exists
+  privileged: true
+  volumes:
+    - name: images
+      path: /images
+    - name: bundle
+      path: /bundle
+  commands:
+    - prepare-build
+
+    - fetch-images
+      --image abakpress/ruby-app:$RUBY_IMAGE_TAG
+      --image redis:$REDIS_IMAGE_TAG
+    - dip provision
+    - dip rspec
+
+steps:
+  - name: Tests Ruby 2.2
     environment:
-      - COMPOSE_FILE_EXT=drone
-      - RUBY_IMAGE_TAG=2.2-latest
-    commands:
-      - prepare-build
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.2
+      RUBY_IMAGE_TAG: 2.2-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-      - fetch-images --image abakpress/ruby-app:$RUBY_IMAGE_TAG
-      - dip provision
-      - dip rspec
+  - name: Tests Ruby 2.3
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.3
+      RUBY_IMAGE_TAG: 2.3-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
+
+  - name: Tests Ruby 2.4
+    environment:
+      COMPOSE_FILE_EXT: drone
+      DOCKER_RUBY_VERSION: 2.4
+      RUBY_IMAGE_TAG: 2.4-latest
+      REDIS_IMAGE_TAG: 4-alpine
+      RAILS_ENV: test
+    <<: *spec_step_common
 
-  release:
-    image: abakpress/gem-publication
-    pull: true
+  - name: release
+    image: abakpress/gem-publication:latest
+    pull: if-not-exists
     when:
       event: push
       branch: master
+      status: success
     volumes:
-      - /home/data/drone/rubygems:/root/.gem
+      - name: rubygems
+        path: /root/.gem
     commands:
       - release-gem --public

data/Appraisals

@@ -1,13 +1,15 @@
-appraise 'rails3.2' do
-  gem 'rails', '~> 3.2.0'
-end
+if RUBY_VERSION < '2.4'
+  appraise 'rails3.2' do
+    gem 'rails', '~> 3.2.0'
+  end
 
-appraise 'rails4.0' do
-  gem 'rails', '~> 4.0.13'
-end
+  appraise 'rails4.0' do
+    gem 'rails', '~> 4.0.13'
+  end
 
-appraise 'rails4.1' do
-  gem 'rails', '~> 4.1.16'
+  appraise 'rails4.1' do
+    gem 'rails', '~> 4.1.16'
+  end
 end
 
 appraise 'rails4.2' do
@@ -23,5 +25,6 @@ appraise 'rails5.1' do
 end
 
 appraise 'rails5.2' do
-  gem 'rails', '~> 5.2.0'
+  gem 'rails', '~> 5.2.0', '< 5.2.4.1'
+  gem 'mimemagic', '<= 0.3.9' if RUBY_VERSION < '2.3'
 end

data/CHANGELOG.md

@@ -1,5 +1,33 @@
-# v3.5.0
-
+# v3.8.1
+
+* 2021-08-20 [1b6b16a](../../commit/1b6b16a) - __(Andrew N. Shalaev)__ Release v3.8.1 
+* 2021-08-20 [557a16f](../../commit/557a16f) - __(Andrew N. Shalaev)__ Revert "fix: use Redis#exists? for get boolean value" 
+This reverts commit 03eab1866908ead61ad044e4f36fb5b943817d46.
+
+* 2021-08-19 [27ad006](../../commit/27ad006) - __(Andrew N. Shalaev)__ Release v3.8.0 
+* 2021-08-19 [03eab18](../../commit/03eab18) - __(Andrew N. Shalaev)__ fix: use Redis#exists? for get boolean value 
+* 2021-07-22 [0caf11c](../../commit/0caf11c) - __(TamarinEA)__ chore: fetch redis image and add rubygems volume 
+* 2021-07-21 [7b94d0e](../../commit/7b94d0e) - __(TamarinEA)__ chore: release public gem 
+* 2021-07-20 [c51d9ab](../../commit/c51d9ab) - __(TamarinEA)__ chore: lock mimemagic for ruby 2.2 
+* 2021-07-20 [843c787](../../commit/843c787) - __(TamarinEA)__ Release 3.7.1 
+* 2021-07-20 [933115d](../../commit/933115d) - __(TamarinEA)__ chore: use redis image istead of mock 
+* 2021-07-20 [21aa6ba](../../commit/21aa6ba) - __(TamarinEA)__ chore: add ruby 2.4 support 
+* 2020-10-05 [05e046b](../../commit/05e046b) - __(TamarinEA)__ Relesae 3.7.0 
+* 2020-10-05 [6f12054](../../commit/6f12054) - __(Andrew N. Shalaev)__ Release v3.6.0 
+* 2020-09-04 [ee6104e](../../commit/ee6104e) - __(Zhidkov Denis)__ fix: change resque restart command to avoid unwatched workers appearance 
+https://jira.railsc.ru/browse/BPC-17334
+
+* 2020-08-30 [7676652](../../commit/7676652) - __(TamarinEA)__ feature: add ordered queue check 
+https://jira.railsc.ru/browse/GOODS-2471
+
+* 2020-04-20 [d36e4b2](../../commit/d36e4b2) - __(TamarinEA)__ chore: use drone 1.6 
+* 2020-04-19 [e33faa6](../../commit/e33faa6) - __(TamarinEA)__ Release 3.5.2 
+* 2020-04-16 [35eafa2](../../commit/35eafa2) - __(TamarinEA)__ fix: reload ordered meta before save 
+https://jira.railsc.ru/browse/GOODS-2326
+
+* 2020-04-16 [0c53eef](../../commit/0c53eef) - __(TamarinEA)__ chore: lock gems for support ruby 2.2 
+* 2018-12-21 [c2b890d](../../commit/c2b890d) - __(Andrew N. Shalaev)__ Release v3.5.1 
+* 2018-12-21 [d7478c2](../../commit/d7478c2) - __(Andrew N. Shalaev)__ fix: add support for redis >= v4 
 * 2018-09-06 [49717a5](../../commit/49717a5) - __(Mikhail Nelaev)__ Release 3.5.0 
 * 2018-08-21 [b56dcc8](../../commit/b56dcc8) - __(Artem Napolskih)__ chore: Add automatic publication 
 * 2018-08-15 [5e90b55](../../commit/5e90b55) - __(Artem Napolskih)__ feat: rails 5-x support added 

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in resque-integration.gemspec
 gemspec
+
+gem 'pry', '< 0.13.0', require: false

data/dip.yml

@@ -1,8 +1,9 @@
 version: '1'
 
 environment:
-  DOCKER_RUBY_VERSION: '2.2'
-  RUBY_IMAGE_TAG: 2.2-latest
+  DOCKER_RUBY_VERSION: 2.3
+  RUBY_IMAGE_TAG: 2.3-latest
+  REDIS_IMAGE_TAG: 4-alpine
   COMPOSE_FILE_EXT: development
   RAILS_ENV: test
   APRESS_GEMS_CREDENTIALS: ""

data/docker-compose.yml

@@ -5,6 +5,13 @@ services:
     image: abakpress/ruby-app:$RUBY_IMAGE_TAG
     environment:
       - BUNDLE_PATH=/bundle/$DOCKER_RUBY_VERSION
+      - TEST_REDIS_HOST=redis
     command: bash
     volumes:
       - .:/app
+    depends_on:
+      - redis
+
+  redis:
+    image: redis:$REDIS_IMAGE_TAG
+    command: 'redis-server --bind 0.0.0.0'

data/lib/resque/integration/ordered.rb

@@ -112,12 +112,14 @@ module Resque
             begin
               execute(ordered_meta, *job_args)
             rescue Exception
+              ordered_meta.reload!
               ordered_meta.fail!
               raise
             ensure
               uniqueness.remove(meta_id, job_args) if uniqueness
             end
 
+            ordered_meta.reload!
             ordered_meta.finish!
 
             i += 1
@@ -137,6 +139,31 @@ module Resque
       def ordered_meta_id(args)
         Digest::SHA1.hexdigest([Time.now.to_f, rand, self, args].join)
       end
+
+      def in_ordered_queue?(*args)
+        meta = enqueued?(*args)
+        return false unless meta
+
+        decoded_args = Resque.decode(Resque.encode(args))
+
+        args_key = ordered_queue_key(meta.meta_id)
+
+        args_meta_id = nil
+
+        ::Resque.redis.lrange(args_key, 0, -1).each do |job_args|
+          job_args = ::Resque.decode(job_args)
+          meta_id = job_args.shift
+
+          if job_args == decoded_args
+            args_meta_id = meta_id
+            break
+          end
+        end
+
+        return false unless args_meta_id
+
+        get_meta(args_meta_id)
+      end
     end
   end
 end

data/lib/resque/integration/tasks/hooks.rake

@@ -26,7 +26,12 @@ namespace :resque do
     end
 
     Resque.before_fork do
-      Resque.redis.client.disconnect
+      client = if Gem::Version.new(::Redis::VERSION) < Gem::Version.new('4')
+                 Resque.redis.client
+               else
+                 Resque.redis._client
+               end
+      client.disconnect
 
       ActiveRecord::Base.connection_handler.clear_all_connections!
     end
@@ -36,7 +41,12 @@ namespace :resque do
 
       ActiveRecord::Base.establish_connection
 
-      Resque.redis.client.connect
+      client = if Gem::Version.new(::Redis::VERSION) < Gem::Version.new('4')
+                 Resque.redis.client
+               else
+                 Resque.redis._client
+               end
+      client.connect
     end
 
     # Support for resque-multi-job-forks

data/lib/resque/integration/tasks/resque.rake

@@ -20,7 +20,7 @@ namespace :resque do
     if god_stopped?
       Rake::Task['resque:start'].invoke
     else
-      puts `#{god} load #{Resque.config.config_file} stop && #{god} restart resque`
+      puts `#{god} stop resque && #{god} load #{Resque.config.config_file} stop && #{god} start resque`
     end
   end
 

data/lib/resque/integration/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Integration
-    VERSION = '3.5.0'.freeze
+    VERSION = '3.8.1'.freeze
   end
 end

data/resque-integration.gemspec

@@ -34,7 +34,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'appraisal', '>= 1.0.2'
   gem.add_development_dependency 'combustion', '>= 0.5.5'
-  gem.add_development_dependency 'mock_redis'
   gem.add_development_dependency 'timecop'
   gem.add_development_dependency 'pry-byebug'
 end

data/spec/resque/integration/ordered_spec.rb

@@ -6,6 +6,15 @@ describe Resque::Integration::Ordered do
 
     unique { |company_id, param1| [company_id] }
     ordered max_iterations: 2
+
+    def self.execute(ordered_meta, arg1, arg2)
+      old_meta = @meta_id
+      @meta_id = ordered_meta.meta_id
+
+      at(arg1, arg2, 'some message')
+
+      @meta_id = old_meta
+    end
   end
 
   class UniqueTestJob
@@ -62,6 +71,16 @@ describe Resque::Integration::Ordered do
     expect(TestJob.ordered_queue_size(meta_id)).to eq 2
   end
 
+  it 'save ordered meta' do
+    ordered_meta_id = TestJob.enqueue(1, 10).meta_id
+    meta_id = TestJob.meta_id(1, 10)
+    TestJob.perform(meta_id)
+    ordered_meta = TestJob.get_meta(ordered_meta_id)
+
+    expect(ordered_meta).to be_finished
+    expect(ordered_meta.progress).to eq(num: 1, total: 10, percent: 10, message: 'some message')
+  end
+
   context 'uniqueness' do
     it 'perform with unique args only once' do
       UniqueTestJob.enqueue(1, 10)
@@ -84,4 +103,42 @@ describe Resque::Integration::Ordered do
       expect(meta.meta_id).to_not eq UniqueTestJob.enqueue(1, 20).meta_id
     end
   end
+
+  describe '#in_ordered_queue?' do
+    before do
+      allow(TestJob).to receive(:rand).and_return(123)
+
+      Timecop.freeze
+    end
+
+    it do
+      TestJob.enqueue(1, 10)
+      TestJob.enqueue(1, 20)
+
+      expect(TestJob.in_ordered_queue?(1, 10)).to be_instance_of(Resque::Plugins::Meta::Metadata)
+      expect(TestJob.in_ordered_queue?(1, 10).meta_id).to eq TestJob.ordered_meta_id([1, 10])
+      expect(TestJob.in_ordered_queue?(1, 20)).to be_instance_of(Resque::Plugins::Meta::Metadata)
+      expect(TestJob.in_ordered_queue?(1, 20).meta_id).to eq TestJob.ordered_meta_id([1, 20])
+      expect(TestJob.in_ordered_queue?(1, 30)).to be_falsey
+    end
+
+    context 'when some complex arg' do
+      let(:complex_arg) { [Integer, {a: 1, 'b' => '2'}, 10] }
+
+      it do
+        expect(TestJob.in_ordered_queue?(1, complex_arg)).to be_falsey
+
+        TestJob.enqueue(1, complex_arg)
+
+        expect(TestJob.in_ordered_queue?(1, complex_arg)).to be_instance_of(Resque::Plugins::Meta::Metadata)
+        expect(TestJob.in_ordered_queue?(1, complex_arg).meta_id).to eq TestJob.ordered_meta_id([1, complex_arg])
+
+        TestJob.perform(TestJob.meta_id(1, complex_arg))
+
+        expect(TestJob.in_ordered_queue?(1, complex_arg)).to be_falsey
+      end
+    end
+
+    after { Timecop.return }
+  end
 end

data/spec/resque/integration_spec.rb

@@ -37,34 +37,49 @@ RSpec.describe Resque::Integration do
         end
       end
 
-      it 'enqueues only one job' do
-        UniqueJob.enqueue(1, param: 'one')
+      let(:redis) { Resque.redis }
+      let(:travel_redis) do
+        ->(time) do
+          redis.keys.each do |key|
+            ttl = redis.ttl(key)
+            next if ttl <= 0
+
+            redis.expire(key, ttl - time.to_i)
+          end
+        end
+      end
 
-        Timecop.travel(10.hours.since) do
+      context 'when enqueues only one job' do
+        before do
           UniqueJob.enqueue(1, param: 'one')
 
-          expect(Resque.peek(:test, 0, 100).size).to eq(1)
+          travel_redis.call(10.hours)
+
+          UniqueJob.enqueue(1, param: 'one')
         end
-      end
 
-      it 'enqueues two jobs with differ args' do
-        UniqueJob.enqueue(1, param: 'one')
+        it { expect(Resque.peek(:test, 0, 100).size).to eq(1) }
+      end
 
-        Timecop.travel(10.hours.since) do
+      context 'when enqueues two jobs with differ args' do
+        before do
+          UniqueJob.enqueue(1, param: 'one')
           UniqueJob.enqueue(1, param: 'two')
-
-          expect(Resque.peek(:test, 0, 100).size).to eq(2)
         end
-      end
 
-      it 'enqueues two jobs after expire lock timeout' do
-        UniqueJob.enqueue(1, param: 'one')
+        it { expect(Resque.peek(:test, 0, 100).size).to eq(2) }
+      end
 
-        Timecop.travel(4.days.since) do
+      context 'when enqueues two jobs after expire lock timeout' do
+        before do
           UniqueJob.enqueue(1, param: 'one')
 
-          expect(Resque.peek(:test, 0, 100).size).to eq(2)
+          travel_redis.call(4.days)
+
+          UniqueJob.enqueue(1, param: 'one')
         end
+
+        it { expect(Resque.peek(:test, 0, 100).size).to eq(2) }
       end
 
       describe 'unlock' do

data/spec/spec_helper.rb

@@ -4,12 +4,13 @@ require 'rspec'
 require 'rspec/its'
 require 'resque'
 require 'simplecov'
-require 'mock_redis'
 require 'timecop'
 require 'pry-byebug'
 require 'combustion'
 
-Resque.redis = MockRedis.new
+redis = Redis.new(host: ENV['TEST_REDIS_HOST'])
+Redis.current = redis
+Resque.redis = redis
 
 SimpleCov.start
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-integration
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.8.1
 platform: ruby
 authors:
 - Alexei Mikhailov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
@@ -249,20 +249,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.5
-- !ruby/object:Gem::Dependency
-  name: mock_redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement