sidekiq_alive 2.1.5 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f200ab5c4b5282e98520a57e341fdc98d73d971abca9931c96135dd07b505d0
-  data.tar.gz: 7eca663e0264246ff8a285a166233054ea01b446b526fccd9dc1382c1acbf493
+  metadata.gz: b0f8dc66acdd5e8d40786ab69294e3e70616a47e8ab1f5c8c84dba82a0c9bb45
+  data.tar.gz: 0bd2872d54a32aa70ebc7857b57726398eac2e888f3e92b6cd42e0a0a1829296
 SHA512:
-  metadata.gz: bcc7753c96ef6c364f660b6ec5ab0c9a0540d77d2ba962666a090b94bec5eca59d722123122db4715f7604144bab13398034414890eb6100a45baa3d1db5070e
-  data.tar.gz: 16d277c8cbe259be7ad38e66e2f359c29a293f6cf399783305a243ab061c63e8c7cfe7fb2f7ad7944473ba7cabea8e37e332630b30a56a956682d9a1cdaaf2bd
+  metadata.gz: dcc9e8cd3484f41cc02b212f5ab9750b655e89cffca03f17023a098d54ceafecad1813e064aab580c16968c79d652b67a55f2a184a7857914eee2087f0614bb5
+  data.tar.gz: e119e57db36f951ead3e0478b4bcbf6aba38a2ce5faf6c4028b2964bd1b04497ee2bd5496e19f1543150210488a5b85f28ba5a702c2e3de4910f33eb3a80ac1e

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

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.5)
+    sidekiq_alive (2.1.7)
       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/lib/sidekiq_alive/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqAlive
-  VERSION = '2.1.5'
+  VERSION = '2.1.7'
 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|
@@ -58,7 +58,7 @@ module SidekiqAlive
   def self.deep_scan(keyword, keys = [], cursor = 0)
     loop do
       cursor, found_keys = SidekiqAlive.redis.scan(cursor, match: keyword, count: 1000)
-      keys += found_keys
+      keys += found_keys if found_keys
       break if cursor.to_i == 0
     end
     keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_alive
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.7
 platform: ruby
 authors:
 - Artur Pañach
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2022-12-13 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", "3.1"]
-    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@v1
-        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