sidekiq_alive 2.1.2 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08d38ee6866d0c487f93b13d5c4fc64d70d5775efbf29e1c44e3e6d0a968ec0c'
-  data.tar.gz: 2d5955184dd20b771897edf42f23471023faa95ed19ffea0850ef9ca086d7193
+  metadata.gz: 2f200ab5c4b5282e98520a57e341fdc98d73d971abca9931c96135dd07b505d0
+  data.tar.gz: 7eca663e0264246ff8a285a166233054ea01b446b526fccd9dc1382c1acbf493
 SHA512:
-  metadata.gz: c9e8b6b12990a57f4075b7e8b79d8006c399240e0d17fb678437bf6fc8798164502761f3920543ca351a2248bcd1cefc57e0bf9d105da951b1942fd78a440dad
-  data.tar.gz: a0bbe436f1ca6e2601d2dd3daa7f321c6ddbcf6e69f51b3a222daedeb8c2f4b3b5bffde590b68ffcba43a179877d5694459ea7bf5cf9cef295fed27164d378d7
+  metadata.gz: bcc7753c96ef6c364f660b6ec5ab0c9a0540d77d2ba962666a090b94bec5eca59d722123122db4715f7604144bab13398034414890eb6100a45baa3d1db5070e
+  data.tar.gz: 16d277c8cbe259be7ad38e66e2f359c29a293f6cf399783305a243ab061c63e8c7cfe7fb2f7ad7944473ba7cabea8e37e332630b30a56a956682d9a1cdaaf2bd

data/.github/workflows/ruby.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.6", "2.7", "3.0"]
+        ruby-version: ["2.6", "2.7", "3.0", "3.1"]
     services:
       # Label used to access the service container
       redis:
@@ -40,7 +40,7 @@ jobs:
         # 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
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.github/workflows/test.yml

@@ -0,0 +1,41 @@
+name: Ruby CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: [3.0.x, 2.7.x, 2.6.x, 2.5.x]
+      # Service containers to run with `runner-job`
+    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 ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rspec

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.4
+ruby 3.0.2

data/.travis.yml

@@ -7,6 +7,8 @@ rvm:
   - 2.4.4
   - 2.5.5
   - 2.6.2
+  - 2.7.4
+  - 3.0.2
   - ruby-head
 matrix:
   allow_failures:

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    sidekiq_alive (2.1.2)
+    sidekiq_alive (2.1.5)
       sidekiq
+      webrick
 
 GEM
   remote: https://rubygems.org/
@@ -43,6 +44,7 @@ GEM
       rack (>= 1.5.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby

data/lib/sidekiq_alive/server.rb

@@ -10,7 +10,7 @@ module SidekiqAlive
 
         Signal.trap('TERM') { handler.shutdown }
 
-        handler.run(self, Port: port, Host: '0.0.0.0', AccessLog: [])
+        handler.run(self, Port: port, Host: host, AccessLog: [], Logger: SidekiqAlive.logger)
       end
 
       def host

data/lib/sidekiq_alive/version.rb

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

data/lib/sidekiq_alive.rb

@@ -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

data/sidekiq_alive.gemspec

@@ -36,4 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-sidekiq', '~> 3.0'
   spec.add_dependency 'sidekiq'
+  spec.add_dependency 'webrick'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_alive
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.5
 platform: ruby
 authors:
 - Artur Pañach
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-26 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   SidekiqAlive offers a solution to add liveness probe of a Sidekiq instance.
 
@@ -126,6 +140,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".tool-versions"
@@ -149,7 +164,7 @@ homepage: https://github.com/arturictus/sidekiq_alive
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Liveness probe for sidekiq on Kubernetes deployments.
 test_files: []