sidekiq_publisher 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35ad0d16467d78de77ede70a744b248a9dbe33d6f4ceec9c37df10c8478693d1
-  data.tar.gz: af3f7362bb2f539a1a8d4b506f8004fc9cdf9b9927685fc09fc49f74b569cf54
+  metadata.gz: 496067d05925ac3fbea1dfd0323640fbb809c32b836faca13d1e9184255ef45f
+  data.tar.gz: 9c3334f11ee9f436866a1f9cf438c0676575fee4e13e17cb41ef52ee62f6e5f1
 SHA512:
-  metadata.gz: 549f8fd72294075b7f5cca99edcf2b6a2682210f1a494fcf9ce1639c91bd43f8139a269bc1045108de6c52820e5416277fdd04497a795ed5c123a5a2ae77f33c
-  data.tar.gz: 62f6cd338b10e13a82ab4421d55817df95f5d791ac83a5f2e2f4dbdae2327c69a0e09d7b914711d7216651294d30788d411d9ab0eb8208d78b941c6dd8da98ce
+  metadata.gz: c92b6150ea19e96f388891f269903cf477d95983922bba38eb5192d3b6ef8e2dab319abdaf86722f01a5d5f8e4464ab96ae74647d25f74fc5934060e14eb7f0b
+  data.tar.gz: 69027c8e8202ba1b82c4ff221a88de668262e2086637848982c2a2bb8aa1c97d6a0eba52389642fcaf3b60da3684b4f38a607eb11029c205a85da96cc6f3ff92

data/Appraisals

@@ -36,6 +36,12 @@ appraise "rails-5.2-sidekiq-6.2" do
   gem "sidekiq", "~> 6.2.0"
 end
 
+appraise "rails-5.2-sidekiq-6.3" do
+  gem "activejob", "~> 5.2.0"
+  gem "activesupport", "~> 5.2.0"
+  gem "sidekiq", "~> 6.3.0"
+end
+
 appraise "rails-6.0-sidekiq-5.2" do
   gem "activejob", "~> 6.0.0"
   gem "activesupport", "~> 6.0.0"
@@ -60,6 +66,12 @@ appraise "rails-6.0-sidekiq-6.2" do
   gem "sidekiq", "~> 6.2.0"
 end
 
+appraise "rails-6.0-sidekiq-6.3" do
+  gem "activejob", "~> 6.0.0"
+  gem "activesupport", "~> 6.0.0"
+  gem "sidekiq", "~> 6.3.0"
+end
+
 appraise "rails-6.1-sidekiq-5.2" do
   gem "activejob", "~> 6.1.0"
   gem "activesupport", "~> 6.1.0"
@@ -83,3 +95,9 @@ appraise "rails-6.1-sidekiq-6.2" do
   gem "activesupport", "~> 6.1.0"
   gem "sidekiq", "~> 6.2.0"
 end
+
+appraise "rails-6.1-sidekiq-6.3" do
+  gem "activejob", "~> 6.1.0"
+  gem "activesupport", "~> 6.1.0"
+  gem "sidekiq", "~> 6.3.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # sidekiq_publisher
 
+## 2.2.0
+- Add support for redis 5.0.0 by replacing pipelined commands.
+  - Also resolves deprecation warnings introduced in [redis 4.6.0]
+
+[redis 4.6.0]: https://github.com/redis/redis-rb/blob/master/CHANGELOG.md#460
+
+- Restricts sidekiq to < 6.4.2 due to an incompatability
+  - [issue tracking this](https://github.com/ezcater/sidekiq_publisher/issues/55)
+
+- Restricts ddtrace to < 1.0.0 due to an incompatability
+
+## 2.1.1
+- Opt-in to [Rubygems MFA](https://guides.rubygems.org/mfa-requirement-opt-in/)
+  for privileged operations
+
+## 2.1.0
+- Add support for sidekiq `7.0.0` by using `Sidekiq::Job` instead of
+  `Sidekiq::Worker` in sidekiq `>= 6.3.0` to handle name changes outlined in
+  mperham/sidekiq#4971 and first introduced in 6.2.2.
+
 ## 2.0.1
 - Changing the `Job#args` validator to be a manual check instead of using the `exclusions` validator.  This is to fix an issue introduced with rails 6.1 and the condition of `in: [nil]`.  More details [here](https://github.com/rails/rails/issues/41051).
 

data/README.md

@@ -1,6 +1,11 @@
 # sidekiq_publisher
 
-[![CircleCI](https://circleci.com/gh/ezcater/sidekiq_publisher.svg?style=svg)](https://circleci.com/gh/ezcater/sidekiq_publisher)
+[![Gem Version][gem_badge]][gem_link] [![CircleCI][circle_badge]][circle_link]
+
+[circle_badge]: https://circleci.com/gh/ezcater/sidekiq_publisher.svg?style=svg
+[circle_link]: https://circleci.com/gh/ezcater/sidekiq_publisher
+[gem_badge]: https://badge.fury.io/rb/sidekiq_publisher.svg
+[gem_link]: https://badge.fury.io/rb/sidekiq_publisher
 
 This gem provides support to enqueue jobs for Sidekiq by first staging the job
 in Postgres and relying on a separate process to communicate with Sidekiq/Redis.
@@ -138,22 +143,23 @@ end
 
 #### ActiveJob Exception Reporting
 
-Many exception monitoring service (e.g. Sentry, Airbrake, Honeybadger, etc) already provide basic integration support for `Sidekiq`. 
-These integration should also work with `SidekiqPublisher`. 
-However, you may need to explicitly include 
+Many exception monitoring service (e.g. Sentry, Airbrake, Honeybadger, etc) already provide basic integration support for `Sidekiq`.
+These integration should also work with `SidekiqPublisher`.
+However, you may need to explicitly include
 `ActiveJob::QueueAdapters::SidekiqPublisherAdapter` as a compatible adapter for this to work properly.
 
 Alternatively, you can manually report the exception:
 
  ```ruby
 retry_on SomeError, attempts: 10 do |_job, exception|
-  Raven.capture_exception(exception, extra: { custom: :foo }) # Reporting using the Sentry gem 
+  Raven.capture_exception(exception, extra: { custom: :foo }) # Reporting using the Sentry gem
 end
 ```
 
 ### SidekiqPublisher::Worker
 
-Sidekiq workers are usually defined by including `Sidekiq::Worker` in a class.
+Sidekiq workers are usually defined by including `Sidekiq::Job` or
+`Sidekiq::Worker` in a class.
 
 To use the `SidekiqPublisher`, this can be replaced by including
 `SidekiqPublisher::Worker`. The usual `perform_async`, etc methods will be

data/lib/sidekiq_publisher/client.rb

@@ -12,9 +12,9 @@ module SidekiqPublisher
 
       pushed = 0
       with_connection do |conn|
-        conn.multi do
+        conn.multi do |transaction|
           payloads.each do |payload|
-            atomic_push(conn, [payload])
+            atomic_push(transaction, [payload])
             pushed += 1
           end
         end

data/lib/sidekiq_publisher/compatibility.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module SidekiqPublisher
+  module Compatibility
+    class << self
+      # Sidekiq::Worker will be renamed to Sidekiq::Job in sidekiq 7.0.0 and a
+      # deprecation warning will be printed in sidekiq 6.4.0, per
+      # mperham/sidekiq#4971. Sidekiq 6.2.2 (mperham/sidekiq@8e36432) introduces
+      # an alias and 6.3.0 includes it when the gem is loaded. This alias is
+      # used here to ensure future compatibility.
+      def sidekiq_job_class
+        @_sidekiq_job_class ||= Gem::Dependency.new("sidekiq", ">= 6.3.0").then do |dependency|
+          if dependency.match?(Gem.loaded_specs["sidekiq"])
+            Sidekiq::Job
+          else
+            Sidekiq::Worker
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SidekiqPublisher
-  VERSION = "2.0.1"
+  VERSION = "2.2.0"
 end

data/lib/sidekiq_publisher/worker.rb

@@ -3,7 +3,7 @@
 module SidekiqPublisher
   module Worker
     def self.included(base)
-      base.include(Sidekiq::Worker)
+      base.include(SidekiqPublisher::Compatibility.sidekiq_job_class)
       base.singleton_class.public_send(:alias_method, :sidekiq_client_push, :client_push)
       base.extend(ClassMethods)
     end

data/lib/sidekiq_publisher.rb

@@ -3,6 +3,7 @@
 require "active_support"
 require "active_support/core_ext/numeric/time"
 require "sidekiq_publisher/version"
+require "sidekiq_publisher/compatibility"
 require "sidekiq_publisher/instrumenter"
 require "sidekiq_publisher/metrics_reporter"
 require "sidekiq_publisher/exception_reporter"

data/sidekiq_publisher.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   # Set "allowed_push_post" to control where this gem can be published.
   if spec.respond_to?(:metadata)
     spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
+    spec.metadata["rubygems_mfa_required"] = "true"
   else
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
@@ -47,7 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "database_cleaner"
-  spec.add_development_dependency "ddtrace", ">= 0.39.0"
+  spec.add_development_dependency "ddtrace", ">= 0.39.0", "< 1.0"
   spec.add_development_dependency "ezcater_matchers"
   spec.add_development_dependency "ezcater_rubocop", "1.0.2"
   spec.add_development_dependency "factory_bot"
@@ -61,5 +61,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "activerecord-postgres_pub_sub", ">= 0.4.0"
   spec.add_runtime_dependency "activesupport", ">= 5.1", "< 6.2"
-  spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 7.0"
+  spec.add_runtime_dependency "sidekiq", ">= 5.0.4", "< 6.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_publisher
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - ezCater, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-01 00:00:00.000000000 Z
+date: 2022-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -73,6 +73,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.39.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,6 +83,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.39.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ezcater_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -263,7 +269,7 @@ dependencies:
         version: 5.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -273,7 +279,7 @@ dependencies:
         version: 5.0.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 6.4.2
 description: Publisher for enqueuing jobs to Sidekiq
 email:
 - engineering@ezcater.com
@@ -311,6 +317,7 @@ files:
 - lib/generators/sidekiq_publisher/templates/create_sidekiq_publisher_jobs.rb
 - lib/sidekiq_publisher.rb
 - lib/sidekiq_publisher/client.rb
+- lib/sidekiq_publisher/compatibility.rb
 - lib/sidekiq_publisher/datadog_apm.rb
 - lib/sidekiq_publisher/engine.rb
 - lib/sidekiq_publisher/exception_reporter.rb
@@ -330,6 +337,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -345,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Publisher for enqueuing jobs to Sidekiq