sidekiq-limit_fetch 4.3.2 → 4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca583389b5cea0b31200752d2c0dd85a03d38a7ea576c9a299a99367a1c8086d
-  data.tar.gz: 335f49aac1d3ee9128a3c92eb88a25010d906a8b8d8701d1a79b1e41349ca256
+  metadata.gz: a8b031f9486e9a497f130f2b2ed58058980cdc14985895c4cfa9ab29dbb16509
+  data.tar.gz: 5c5c8c2d5b144405fc5a57bf5de67dda9709939c59bdcc7870f92ae43b95de55
 SHA512:
-  metadata.gz: 00daee076b583097d361fed04a7128188af6d8a287906a644d0449c01dd8748fd4b8b9d233eddfe1f1da22d0492626088f11e4eb9785dd31da75a47c57437726
-  data.tar.gz: 110b867205d0aea423ec63d8e010d5d1b75398b5aefce782fdb2320fd5e6114b10d041f59306fadb650d3401ea6a8c2fd962a6fd80d793162d8d14061c510e66
+  metadata.gz: 1a1cb3a5542dd9888fce9bddaabc7e8e862df7741750b9323ae637970c08be263bab2e662965b89fefb8a02f830e5f4493d46bad2e0dc6330d143cc801c2dc15
+  data.tar.gz: 760cc8e8bd550b7dbcd3caaa03340d9d5629f83746197254e486f07c01f52b05afb6c964afb5eb4fc4c3a95a64c1425fc358d5e806a54bf38ae4521a6ed48d06

data/.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ["2.7", "3.0", "3.1"]
-        appraisal: ['6.0', '6.1', '6.2', '6.3', '6.4', '6.5', 'master']
+        appraisal: ['6.0', '6.1', '6.2', '6.3', '6.4', '6.5', '7.0', 'master']
     services:
       redis:
         image: redis
@@ -36,6 +36,8 @@ jobs:
         bundler-cache: false
     - name: Bundle for Appraisal
       run: bundle
+    - name: Run Rubocop linting
+      run: bundle exec rubocop
     - name: Install Appraisal dependencies
       run: bundle exec appraisal sidekiq-${{ matrix.appraisal }} bundle
     - name: Run tests

data/.rubocop.yml

@@ -0,0 +1,29 @@
+AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+  TargetRubyVersion: 2.7
+  Exclude:
+    - 'gemfiles/*'
+
+Style/Documentation:
+  Enabled: false
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+    - 'demo/Rakefile'
+
+Metrics/ModuleLength:
+  Exclude:
+    - 'lib/sidekiq/limit_fetch/queues.rb'
+
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/sidekiq/limit_fetch/global/semaphore.rb'
+
+Naming/VariableNumber:
+  EnforcedStyle: snake_case
+
+Naming/FileName:
+  Exclude:
+    - lib/sidekiq-limit_fetch.rb

data/Appraisals

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise 'sidekiq-6.0' do
   gem 'sidekiq', '~> 6.0.0'
 end
@@ -22,6 +24,10 @@ appraise 'sidekiq-6.5' do
   gem 'sidekiq', '~> 6.5.0'
 end
 
+appraise 'sidekiq-7.0' do
+  gem 'sidekiq', '~> 7.0.0'
+end
+
 appraise 'sidekiq-master' do
   gem 'sidekiq', github: 'mperham/sidekiq'
 end

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec
 

data/README.md

@@ -1,6 +1,6 @@
 ## Description
 
-*This project has been taken over by [@deanpcmad](https://github.com/deanpcmad)*
+*This project has been taken over by [@deanpcmad](https://github.com/deanpcmad). Original code by [@brainopia](https://github.com/brainopia).*
 
 Sidekiq strategy to support a granular queue control – limiting, pausing, blocking, querying.
 
@@ -150,6 +150,16 @@ To use this mode you need to specify a following line in sidekiq.yml:
 :dynamic: true
 ```
 
+or
+
+```yaml
+  :dynamic:
+    :exclude:
+      - excluded_queue
+```
+
+to exclude `excluded_queue` from dynamic queue
+
 Dynamic queues will be ran at the lowest priority.
 
 ### Maintenance

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bench/compare.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'benchmark'
 require 'sidekiq/cli'
 require 'sidekiq/api'
@@ -9,11 +11,11 @@ limit       = ARGV.shift
 if limit
   limit = nil if limit == 'nil'
 
-  $:.unshift File.expand_path '../lib'
+  $LOAD_PATH.unshift File.expand_path '../lib'
   require 'sidekiq-limit_fetch'
   Sidekiq::Queue['inline'].limit = limit
-  Sidekiq.redis {|it| it.del 'limit_fetch:probed:inline' }
-  Sidekiq::LimitFetch::Queues.send(:define_method, :set) {|*| }
+  Sidekiq.redis { |it| it.del 'limit_fetch:probed:inline' }
+  Sidekiq::LimitFetch::Queues.send(:define_method, :set) { |*| } # rubocop:disable Lint/EmptyBlock
 end
 
 Sidekiq::Queue.new('inline').clear
@@ -22,8 +24,8 @@ class FastJob
   include Sidekiq::Worker
   sidekiq_options queue: :inline
 
-  def perform(i)
-    puts "job N#{i} is finished"
+  def perform(index)
+    puts "job N#{index} is finished"
   end
 end
 
@@ -36,17 +38,19 @@ class FinishJob
   end
 end
 
-total.times {|i| FastJob.perform_async i+1 }
+total.times { |i| FastJob.perform_async i + 1 }
 FinishJob.perform_async
 
 Sidekiq::CLI.instance.tap do |cli|
-  %w(validate! boot_system).each {|stub| cli.define_singleton_method(stub) {}}
+  %w[validate! boot_system].each { |stub| cli.define_singleton_method(stub) {} } # rubocop:disable Lint/EmptyBlock
   cli.parse ['-q inline', '-q other', "-c #{concurrency}"]
 
-  puts Benchmark.measure {
-    begin
-      cli.run
-    rescue Exception
-    end
-  }
+  # rubocop:disable Lint/RescueException
+  # rubocop:disable Lint/SuppressedException
+  puts Benchmark.measure do
+    cli.run
+  rescue Exception
+  end
+  # rubocop:enable Lint/SuppressedException
+  # rubocop:enable Lint/RescueException
 end

data/demo/Gemfile

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gem 'rails'
 gem 'launchy'
+gem 'rails'
 gem 'sidekiq', github: 'mperham/sidekiq'
 gem 'sidekiq-limit_fetch', path: '..'
-

data/demo/Rakefile

@@ -1,4 +1,6 @@
-require File.expand_path('../config/application', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('config/application', __dir__)
 Demo::Application.load_tasks
 
 namespace :demo do
@@ -63,7 +65,7 @@ namespace :demo do
   end
   def with_sidekiq_config(config)
     whitespace_offset = config[/\A */].size
-    config.gsub! /^ {#{whitespace_offset}}/, ''
+    config.gsub!(/^ {#{whitespace_offset}}/, '')
 
     puts "=> Use sidekiq config:\n#{config}"
     File.write 'config/sidekiq.yml', config
@@ -85,8 +87,8 @@ namespace :demo do
     require 'sidekiq/cli'
     cli = Sidekiq::CLI.instance
 
-    %w(validate! boot_system).each do |stub|
-      cli.define_singleton_method(stub) {}
+    %w[validate! boot_system].each do |stub|
+      cli.define_singleton_method(stub) {} # rubocop:disable Lint/EmptyBlock
     end
 
     with_sidekiq_config options[:config] do
@@ -96,4 +98,3 @@ namespace :demo do
     cli.run
   end
 end
-

data/demo/app/workers/a_worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AWorker
   include Sidekiq::Worker
   sidekiq_options queue: :a

data/demo/app/workers/b_worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BWorker
   include Sidekiq::Worker
   sidekiq_options queue: :b

data/demo/app/workers/c_worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CWorker
   include Sidekiq::Worker
   sidekiq_options queue: :c
@@ -6,4 +8,3 @@ class CWorker
     sleep 10
   end
 end
-

data/demo/app/workers/fast_worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FastWorker
   include Sidekiq::Worker
   sidekiq_options queue: :fast

data/demo/app/workers/slow_worker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SlowWorker
   include Sidekiq::Worker
   sidekiq_options queue: :slow

data/demo/config/application.rb

@@ -1,4 +1,6 @@
-require File.expand_path('../boot', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('boot', __dir__)
 
 require 'action_controller/railtie'
 require 'action_mailer/railtie'

data/demo/config/boot.rb

@@ -1,2 +1,4 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+# frozen_string_literal: true
+
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/demo/config/environment.rb

@@ -1,2 +1,4 @@
-require File.expand_path('../application', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('application', __dir__)
 Demo::Application.initialize!

data/demo/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Demo::Application.configure do
   config.cache_classes = false
   config.eager_load = false

data/docker-compose.dev.yml

@@ -0,0 +1,13 @@
+version: "3.8"
+services:
+  redis:
+    container_name: redis
+    image: "redis:6.2-alpine"
+    ports:
+      - 6379:6379
+    volumes:
+      - redis-data:/var/lib/redis
+
+volumes:
+  redis-data:
+    driver: local

data/gemfiles/sidekiq_6.0.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.3.2)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
+    sidekiq-limit_fetch (4.4.0)
+      sidekiq (>= 6)
 
 GEM
   remote: https://rubygems.org/
@@ -53,4 +52,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.21
+   2.3.5

data/gemfiles/sidekiq_6.1.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.3.2)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
+    sidekiq-limit_fetch (4.4.0)
+      sidekiq (>= 6)
 
 GEM
   remote: https://rubygems.org/
@@ -50,4 +49,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.21
+   2.3.5

data/gemfiles/sidekiq_6.2.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.3.2)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
+    sidekiq-limit_fetch (4.4.0)
+      sidekiq (>= 6)
 
 GEM
   remote: https://rubygems.org/
@@ -50,4 +49,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.21
+   2.3.5

data/gemfiles/sidekiq_6.3.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.3.2)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
+    sidekiq-limit_fetch (4.4.0)
+      sidekiq (>= 6)
 
 GEM
   remote: https://rubygems.org/
@@ -50,4 +49,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.21
+   2.3.5

data/gemfiles/sidekiq_6.4.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.3.2)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
+    sidekiq-limit_fetch (4.4.0)
+      sidekiq (>= 6)
 
 GEM
   remote: https://rubygems.org/
@@ -50,4 +49,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.21
+   2.3.5

data/gemfiles/sidekiq_6.5.gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.3.2)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
+    sidekiq-limit_fetch (4.4.0)
+      sidekiq (>= 6)
 
 GEM
   remote: https://rubygems.org/
@@ -50,4 +49,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.21
+   2.3.5

data/gemfiles/sidekiq_7.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sidekiq", "~> 7.0.0"
+
+gemspec path: "../"

data/gemfiles/sidekiq_7.0.gemfile.lock

@@ -0,0 +1,58 @@
+PATH
+  remote: ..
+  specs:
+    sidekiq-limit_fetch (4.4.0)
+      sidekiq (>= 6)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (2.4.1)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    concurrent-ruby (1.1.10)
+    connection_pool (2.3.0)
+    diff-lcs (1.5.0)
+    rack (3.0.2)
+    rake (13.0.6)
+    redis (5.0.5)
+      redis-client (>= 0.9.0)
+    redis-client (0.11.2)
+      connection_pool
+    redis-namespace (1.10.0)
+      redis (>= 4)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    sidekiq (7.0.2)
+      concurrent-ruby (< 2)
+      connection_pool (>= 2.3.0)
+      rack (>= 2.2.4)
+      redis-client (>= 0.11.0)
+    thor (1.2.1)
+
+PLATFORMS
+  x86_64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  rake
+  redis-namespace (~> 1.5, >= 1.5.2)
+  rspec
+  sidekiq (~> 7.0.0)
+  sidekiq-limit_fetch!
+
+BUNDLED WITH
+   2.3.5

data/gemfiles/sidekiq_master.gemfile.lock

@@ -10,9 +10,8 @@ GIT
 PATH
   remote: ..
   specs:
-    sidekiq-limit_fetch (4.3.2)
-      redis (>= 4.6.0)
-      sidekiq (>= 4)
+    sidekiq-limit_fetch (4.4.0)
+      sidekiq (>= 6)
 
 GEM
   remote: https://rubygems.org/
@@ -55,4 +54,4 @@ DEPENDENCIES
   sidekiq-limit_fetch!
 
 BUNDLED WITH
-   2.3.21
+   2.3.5

data/lib/sidekiq/extensions/manager.rb

@@ -1,17 +1,25 @@
-class Sidekiq::Manager
-  module InitLimitFetch
-    def initialize(options={})
-      options[:fetch] = Sidekiq::LimitFetch
-      super
-    end
+# frozen_string_literal: true
+
+module Sidekiq
+  class Manager
+    module InitLimitFetch
+      def initialize(capsule_or_options)
+        if Sidekiq::LimitFetch.post_7?
+          capsule_or_options.config[:fetch_class] = Sidekiq::LimitFetch
+        else
+          capsule_or_options[:fetch] = Sidekiq::LimitFetch
+        end
+        super
+      end
 
-    def start
-      # In sidekiq 6.5.0 the variable @options has been renamed to @config
-      Sidekiq::LimitFetch::Queues.start @options || @config
-      Sidekiq::LimitFetch::Global::Monitor.start!
-      super
+      def start
+        # In sidekiq 6.5.0 the variable @options has been renamed to @config
+        Sidekiq::LimitFetch::Queues.start @options || @config
+        Sidekiq::LimitFetch::Global::Monitor.start!
+        super
+      end
     end
-  end
 
-  prepend InitLimitFetch
+    prepend InitLimitFetch
+  end
 end

data/lib/sidekiq/extensions/queue.rb

@@ -1,21 +1,24 @@
+# frozen_string_literal: true
+
 module Sidekiq
   class Queue
-    extend LimitFetch::Instances, Forwardable
+    extend Forwardable
+    extend LimitFetch::Instances
     attr_reader :rname
 
     def_delegators :lock,
-      :limit,         :limit=,         :limit_changed?,
-      :process_limit, :process_limit=,
-      :acquire,       :release,
-      :pause,         :pause_for_ms,   :unpause,
-      :block,         :unblock,
-      :paused?,       :blocking?,
-      :unblocked,     :block_except,
-      :probed,        :busy,
-      :increase_busy, :decrease_busy,
-      :local_busy?,   :explain,
-      :remove_locks_except!,
-      :clear_limits
+                   :limit,         :limit=, :limit_changed?,
+                   :process_limit, :process_limit=,
+                   :acquire,       :release,
+                   :pause,         :pause_for_ms, :unpause,
+                   :block,         :unblock,
+                   :paused?,       :blocking?,
+                   :unblocked,     :block_except,
+                   :probed,        :busy,
+                   :increase_busy, :decrease_busy,
+                   :local_busy?,   :explain,
+                   :remove_locks_except!,
+                   :clear_limits
 
     def lock
       @lock ||= LimitFetch::Global::Semaphore.new name