sidekiq-pauzer 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7181876b443f54e7ce377358fc1dc9920bf6aff98973aa5d1499e1b2a56401a
-  data.tar.gz: ee6a16525e36c8c4ba468817be43298cfd5905760e5fb737e6a743ec1577b0fc
+  metadata.gz: b7ad60f6b5eadbbf347139ad0eaef9962e1983f90cf84bf5d1b409bb19ddfc4d
+  data.tar.gz: 01ff41aac0537faad75897dfa15a2427f00ee6d3a04e9b40ac686d8a52b05770
 SHA512:
-  metadata.gz: 27c52a1aa9e02ad2dbb48ea2be6af3458e11798974d963e03a0f7edb729d8fc6dd09ab56f259be8006da5bc9a1cf51e9e87cb8e7b35c6f2f9174d381d76d4d29
-  data.tar.gz: fb4f9043119f8c26b1be9aa5d6aed8cdd14640a7a6b630607bb3694ec0e0f1ccad8e8e3a802a57949c70cafd45e0375bfed99138badd303daa217d1bdc4da97c
+  metadata.gz: bd6aa63500df79f60d3fe1c65fb05e51c6dda01f2e431fe5637d4431220a01bcdf5255626cb484dcc08d8077652fb7746c52c17e68ff0acf3e5898608707213f
+  data.tar.gz: 2197a6faf19fae846a04f5f75271af586041b751f6a06a49d6cf5cb9e351a5c496db502a6cdfc38490eb314a2b3d84becaf20550cea59d1828f1ad5c463a5da9

data/README.adoc

@@ -96,16 +96,16 @@ dropped.
 
 This library aims to support and work with following Sidekiq versions:
 
-* Sidekiq 6.5.x
 * Sidekiq 7.0.x
 * Sidekiq 7.1.x
 
 
 == Development
 
-  scripts/update-gemfiles
-  scripts/run-rspec
-  bundle exec rubocop
+  bundle install
+  bundle exec appraisal generate
+  bundle exec appraisal install
+  bundle exec rake
 
 
 == Contributing

data/lib/sidekiq/pauzer/basic_fetch.rb

@@ -3,45 +3,23 @@
 require "sidekiq"
 require "sidekiq/fetch"
 
-require_relative "./runtime"
-
 module Sidekiq
   module Pauzer
     # Default Sidekiq's BasicFetch infused with Pauzer
     class BasicFetch < Sidekiq::BasicFetch
       private
 
-      if Runtime::SIDEKIQ_SEVEN
-        def queues_cmd
-          queues =
-            if @strictly_ordered_queues
-              @queues
-            else
-              permute = @queues.dup
-              permute.shuffle!
-              permute.uniq!
-              permute
-            end
-
-          excluding_paused(queues)
-        end
-      else
-        def queues_cmd
-          queues =
-            if @strictly_ordered_queues
-              @queues[0...-1]
-            else
-              permute = @queues.dup
-              permute.shuffle!
-              permute.uniq!
-              permute
-            end
-
-          excluding_paused(queues) << { timeout: Sidekiq::BasicFetch::TIMEOUT }
-        end
-      end
+      def queues_cmd
+        queues =
+          if @strictly_ordered_queues
+            @queues
+          else
+            permute = @queues.dup
+            permute.shuffle!
+            permute.uniq!
+            permute
+          end
 
-      def excluding_paused(queues)
         queues - Pauzer.paused_queues.map { |name| "queue:#{name}" }
       end
     end

data/lib/sidekiq/pauzer/queues.rb

@@ -2,8 +2,6 @@
 
 require "concurrent"
 
-require_relative "./adapters"
-
 module Sidekiq
   module Pauzer
     # @api internal
@@ -14,7 +12,8 @@ module Sidekiq
 
       # @param config [Config]
       def initialize(config)
-        @names     = Concurrent::Array.new
+        @mutex     = Mutex.new
+        @names     = []
         @redis_key = config.redis_key
         @refresher = initialize_refresher(config.refresh_rate)
       end
@@ -22,21 +21,21 @@ module Sidekiq
       def each(&block)
         return to_enum __method__ unless block
 
-        @names.dup.each(&block)
+        @mutex.synchronize { @names.dup }.each(&block)
 
         self
       end
 
       # @param name [#to_s]
       def pause!(name)
-        Sidekiq.redis { |conn| Adapters[conn].add(conn, @redis_key, name.to_s) }
+        Sidekiq.redis { |conn| conn.call("SADD", @redis_key, name.to_s) }
 
         refresh
       end
 
       # @param name [#to_s]
       def unpause!(name)
-        Sidekiq.redis { |conn| Adapters[conn].remove(conn, @redis_key, name.to_s) }
+        Sidekiq.redis { |conn| conn.call("SREM", @redis_key, name.to_s) }
 
         refresh
       end
@@ -72,7 +71,16 @@ module Sidekiq
       end
 
       def refresh
-        @names.replace(Sidekiq.redis { |conn| Adapters[conn].list(conn, @redis_key) })
+        @mutex.synchronize do
+          names = Sidekiq.redis do |conn|
+            # Cursor is not atomic, so there may be duplicates because of
+            # concurrent update operations
+            # See: https://redis.io/commands/scan/#scan-guarantees
+            conn.sscan(@redis_key).to_a.uniq.each(&:freeze)
+          end
+
+          @names.replace(names)
+        end
 
         self
       end

data/lib/sidekiq/pauzer/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Pauzer
-    VERSION = "2.2.0"
+    VERSION = "3.0.0"
   end
 end

data/lib/sidekiq/pauzer.rb

@@ -85,9 +85,6 @@ module Sidekiq
         @queues.to_a
       end
 
-      # @deprecated Use {.paused_queues}
-      alias paused_queue_names paused_queues
-
       # Yields `config` for a block.
       #
       # @example

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-pauzer
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Alexey Zapparov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.5'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.5'
+        version: '7.0'
 description:
 email:
 - alexey@zapparov.com
@@ -48,16 +48,12 @@ files:
 - README.adoc
 - lib/sidekiq-pauzer.rb
 - lib/sidekiq/pauzer.rb
-- lib/sidekiq/pauzer/adapters.rb
-- lib/sidekiq/pauzer/adapters/redis.rb
-- lib/sidekiq/pauzer/adapters/redis_client.rb
 - lib/sidekiq/pauzer/basic_fetch.rb
 - lib/sidekiq/pauzer/config.rb
 - lib/sidekiq/pauzer/patches/queue.rb
 - lib/sidekiq/pauzer/patches/web_action.rb
 - lib/sidekiq/pauzer/patches/web_application.rb
 - lib/sidekiq/pauzer/queues.rb
-- lib/sidekiq/pauzer/runtime.rb
 - lib/sidekiq/pauzer/version.rb
 - lib/sidekiq/pauzer/web.rb
 - web/views/queues.erb
@@ -66,9 +62,9 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://gitlab.com/ixti/sidekiq-pauzer
-  source_code_uri: https://gitlab.com/ixti/sidekiq-pauzer/tree/v2.2.0
+  source_code_uri: https://gitlab.com/ixti/sidekiq-pauzer/tree/v3.0.0
   bug_tracker_uri: https://gitlab.com/ixti/sidekiq-pauzer/issues
-  changelog_uri: https://gitlab.com/ixti/sidekiq-pauzer/blob/v2.2.0/CHANGES.md
+  changelog_uri: https://gitlab.com/ixti/sidekiq-pauzer/blob/v3.0.0/CHANGES.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []

data/lib/sidekiq/pauzer/adapters/redis.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Sidekiq
-  module Pauzer
-    module Adapters
-      # redis-rb adapter
-      module Redis
-        class << self
-          def adapts?(redis)
-            return true if defined?(::Redis) && redis.is_a?(::Redis)
-            return true if defined?(::Redis::Namespace) && redis.is_a?(::Redis::Namespace)
-
-            false
-          end
-
-          def add(redis, key, queue)
-            redis.sadd(key, queue)
-          end
-
-          def remove(redis, key, queue)
-            redis.srem(key, queue)
-          end
-
-          def list(redis, key)
-            # Cursor is not atomic, so there may be duplicates because of
-            # concurrent update operations
-            # See: https://redis.io/commands/scan/#scan-guarantees
-            redis.sscan_each(key).to_a.uniq.each(&:freeze)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sidekiq/pauzer/adapters/redis_client.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../runtime"
-
-module Sidekiq
-  module Pauzer
-    module Adapters
-      # redis-client adapter
-      module RedisClient
-        class << self
-          def adapts?(redis)
-            return true if Runtime::SIDEKIQ_SEVEN
-            return true if defined?(::RedisClient) && redis.is_a?(::RedisClient)
-            return true if defined?(::RedisClient::Decorator::Client) && redis.is_a?(::RedisClient::Decorator::Client)
-
-            false
-          end
-
-          def add(redis, key, queue)
-            redis.call("SADD", key, queue)
-          end
-
-          def remove(redis, key, queue)
-            redis.call("SREM", key, queue)
-          end
-
-          def list(redis, key)
-            # Cursor is not atomic, so there may be duplicates because of
-            # concurrent update operations
-            # See: https://redis.io/commands/scan/#scan-guarantees
-            redis.sscan(key).to_a.uniq.each(&:freeze)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sidekiq/pauzer/adapters.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "./adapters/redis"
-require_relative "./adapters/redis_client"
-
-module Sidekiq
-  module Pauzer
-    # @api internal
-    module Adapters
-      def self.[](redis)
-        return Adapters::RedisClient if Adapters::RedisClient.adapts?(redis)
-        return Adapters::Redis       if Adapters::Redis.adapts?(redis)
-
-        raise TypeError, "Unsupported redis client: #{redis.class}"
-      end
-    end
-  end
-end

data/lib/sidekiq/pauzer/runtime.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "sidekiq"
-
-module Sidekiq
-  module Pauzer
-    module Runtime
-      SIDEKIQ_SEVEN = Gem::Version.new("7.0.0") <= Gem::Version.new(Sidekiq::VERSION)
-    end
-  end
-end