sidekiq_alive 2.1.4 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d77df41c90efdbcb9ef9c1faa749cfeca83725eddf9d91714ff537faaa7348
-  data.tar.gz: f74f776df3b92e098b8b6178e3a114056d9d09fe975d42062ed8dd91d17ec4db
+  metadata.gz: 76f6e9a464393aa3302fbac6d7baf2e58338fe8326101d644a6a3d963dd38305
+  data.tar.gz: 781f50dd5cf55b17421b287ce56c193baf33a99cb504290592643bdf79a0078b
 SHA512:
-  metadata.gz: 2c0074d76de89030184eac7463a7227aeacb767c54d89a34e1cbb80253342a3378fcfec07cf91f04bba5a91cf4aec4b8608b992c4c83d3379fdb78bee45312be
-  data.tar.gz: 68a46cb3ed64998666966b8d45ae0d424946899877ae25367ec855d0e150b2b5a91e153af79cfa0d6fd78a92a25fcdd666674e8fa53138c81306a4547766cd51
+  metadata.gz: 62ca85ef26fa1b6991a06ec7095a38280bd6165111b0897e9fa52e83e09a806c6bd125de6233084b559f216c831d8cc4735fb4f84b720cc1f46916b63eeb52ef
+  data.tar.gz: 5579938e0bbf3a79d727d651fab8167d06e83d480bd145efcf1f2d6fb3b896e07cf3555be77ae5376f9af5bc2164fbce6acf8dcffb84e156d9d118e9dccf3c2c

data/.github/workflows/test.yml

@@ -2,9 +2,9 @@ name: Ruby CI
 
 on:
   push:
-    branches: [main]
+    branches: [main, master]
   pull_request:
-    branches: [main]
+    branches: [main, master]
 
 jobs:
   test:
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.0.x, 2.7.x, 2.6.x, 2.5.x]
+        ruby-version: ["3.1", "3.0", "2.7", "2.6", "2.5"]
       # Service containers to run with `runner-job`
     services:
       # Label used to access the service container
@@ -32,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@477b21f02be01bcb8030d50f37cfec92bfa615b6
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
       - name: Install dependencies

data/.tool-versions

@@ -1 +1 @@
-ruby 3.0.2
+ruby 3.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidekiq_alive (2.1.4)
+    sidekiq_alive (2.1.6)
       sidekiq
       webrick
 
@@ -9,7 +9,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    connection_pool (2.2.2)
+    connection_pool (2.2.5)
     diff-lcs (1.3)
     method_source (0.9.2)
     mock_redis (0.19.0)
@@ -17,12 +17,10 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rack (2.2.3)
-    rack-protection (2.0.5)
-      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (13.0.3)
-    redis (4.1.0)
+    redis (4.6.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -39,11 +37,10 @@ GEM
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
     rspec-support (3.8.0)
-    sidekiq (5.2.5)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    sidekiq (6.4.1)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
     webrick (1.7.0)
 
 PLATFORMS

data/docker-compose.yml

@@ -4,4 +4,3 @@ services:
     image: redis
     ports:
       - 6379:6379
-    network_mode: host

data/lib/sidekiq_alive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqAlive
-  VERSION = '2.1.4'
+  VERSION = '2.1.6'
 end

data/lib/sidekiq_alive.rb

@@ -9,7 +9,7 @@ module SidekiqAlive
     SidekiqAlive::Worker.sidekiq_options queue: current_queue
     Sidekiq.configure_server do |sq_config|
 
-      sq_config.options[:queues].unshift(current_queue)
+      (sq_config.respond_to?(:[]) ? sq_config[:queues] : sq_config.options[:queues]).unshift(current_queue)
 
       sq_config.on(:startup) do
         SidekiqAlive.tap do |sa|
@@ -56,10 +56,12 @@ module SidekiqAlive
   end
 
   def self.deep_scan(keyword, keys = [], cursor = 0)
-    next_cursor, found_keys = *redis { |r| r }.scan(cursor, match: keyword)
-    keys += found_keys
-    return keys if next_cursor == "0" || found_keys.blank?
-    deep_scan(keyword, keys, next_cursor)
+    loop do
+      cursor, found_keys = SidekiqAlive.redis.scan(cursor, match: keyword, count: 1000)
+      keys += found_keys
+      break if cursor.to_i == 0
+    end
+    keys
   end
 
   def self.purge_pending_jobs

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_alive
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.6
 platform: ruby
 authors:
 - Artur Pañach
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,12 +139,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ruby.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".tool-versions"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -179,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Liveness probe for sidekiq on Kubernetes deployments.

data/.github/workflows/ruby.yml

@@ -1,48 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
-name: Ruby
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ["2.6", "2.7", "3.0"]
-    services:
-      # Label used to access the service container
-      redis:
-        # Docker Hub image
-        image: redis
-        # Set health checks to wait until redis has started
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          # Maps port 6379 on service container to the host
-          - 6379:6379
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-        # change this to (see https://github.com/ruby/setup-ruby#versioning):
-        # uses: ruby/setup-ruby@v1
-        uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-      - name: Run tests
-        run: bundle exec rake

data/.travis.yml

@@ -1,27 +0,0 @@
-language: ruby
-sudo: required
-services: redis
-cache: bundler
-rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.5
-  - 2.6.2
-  - 2.7.4
-  - 3.0.2
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-before_install: gem install bundler -v 1.17.3
-env:
-  global:
-    - CC_TEST_REPORTER_ID=571b470a2b61f8a58b2a0ebbcf297805efa07c548e45bac9d1c9ce0c5edcfc20
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script:
-  - bundle exec rspec
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT