simplekiq 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20c1cf9ee3200ead5a9c6c0bba128b1688c1a7c7ecab72caaf024341c2d8ba35
-  data.tar.gz: 1b749cdbdead50f3458912b641b20cdf186a2e53a4581d8bd15a91df7e2bfa4b
+  metadata.gz: f267eca4633ec71afa7595061707ffdea9a94c9f7b0db7dde1296a6aa314f66f
+  data.tar.gz: 52f52165d23bc71277f86c8c6ce049b42566b188ed484efa14cf974901e94dbe
 SHA512:
-  metadata.gz: 5b77d61ceca98ea9d78e491b527e0a181b3e51803581083b39b0fece0303c9d0736e5b66eb3e68fed45222da5f66e6cb75ba82ecaa8034f0b8dd52bf252958bf
-  data.tar.gz: 91afa04b5e0879132c777dc816887f81ed4de6cdf04c916066fc1d634202eca0a8dbef32173c1a8329ffd0902135669be57ed6e33e1d44d228e5352193a89fcf
+  metadata.gz: c4722a45b623489cd739ff5cd2b41711fb0c5004bfcc3f7775eddb9b31f7c0a18a582b6d890531ade1bd6a06acc59497867b5db2725aaa15009b37ae21c0f4bf
+  data.tar.gz: 0ee6f33a11201f94ce846968be2ec471c9292bc0e6d63bf6e7b3bc68eff688198714470405d4b0e5b32192a6e892b409964d7368b6050467ab6f350eae510875

data/.circleci/config.yml

@@ -1,22 +1,15 @@
 version: 2.1
 
-orbs:
-  gem: doximity/gem-publisher@0
-
 executors:
   ruby:
     resource_class: small
     docker:
-      - image: cimg/ruby:2.6
-        environment:
-          BUNDLE_VERSION: "~> 2.1.4"
+      - image: cimg/ruby:3.3
   ruby-with-redis:
     resource_class: small
     docker:
-      - image: cimg/ruby:2.6
-        environment:
-          BUNDLE_VERSION: "~> 2.1.4"
-      - image: redis:4-alpine
+      - image: cimg/ruby:3.3
+      - image: redis:6.2
         command: redis-server
 
 # yaml anchor filters
@@ -48,18 +41,11 @@ jobs:
           name: Install Bundler specific version
           command: |
             gem install bundler --version "${BUNDLE_VERSION}" --force
-      - restore_cache:
-          keys:
-            - v4-bundle-{{ checksum "Gemfile.lock" }}-
       - run:
           name: Install Ruby Dependencies
           command: |
             bundle config set --local path 'vendor/bundle'
             bundle install --jobs=4 --retry=3
-      - save_cache:
-          key: v4-bundle-{{ checksum "Gemfile.lock" }}-
-          paths:
-            - vendor/bundle
       - run:
           name: Run Tests
           command: bundle exec rake ci:specs
@@ -75,41 +61,10 @@ jobs:
             - vendor/bundle
 
 workflows:
-
   main:
     jobs:
       - build:
           <<: *always_run
-          context: sidekiq-enterprise
-      - gem/build:
-          <<: *always_run
-          context: sidekiq-enterprise
-          executor: ruby
-          name: gem-build
-          vendor-cache: false
-          cache-salt: simplekiq-v2
-          requires:
-            - build
-      - pre-release-approval:
-          <<: *pr_only
-          type: approval
-          requires:
-            - gem-build
-      - gem/publish:
-          <<: *pr_only
-          executor: ruby
-          name: gem-publish-pre
-          to_rubygems: true
-          pre_release: true
-          requires:
-            - pre-release-approval
-          context: artifact_publishing
-      - gem/publish:
-          <<: *version_tags_only
-          name: gem-publish-final
-          executor: ruby
-          to_rubygems: true
-          pre_release: false
-          requires:
-            - gem-build
-          context: artifact_publishing
+          context:
+            - sidekiq-enterprise
+            - nexus_readonly

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.0]
+* Only support Sidekiq 7.1 and Sidekiq 8 (dropped support for older versions)
+  [#42](https://github.com/doximity/simplekiq/pull/42)
+
 ## [0.1.0] (pre-release for 1.0)
 * Fix typo in CONTRIBUTORS
   [#5](https://github.com/doximity/simplekiq/pull/5)

data/CONTRIBUTORS.md

@@ -22,6 +22,9 @@
 ### Tiffany Troha (Doximity)
 * Added support for specifying `sidekiq_options` for the child job in `Simplekiq::BatchingJob`
 
+### Lucas Lazzaris (Doximity)
+* Added support for sidekiq 7.x
+
 ### [Daniel Pepper](https://github.com/dpep)
 * On request, graciously took down his unused `simplekiq` placeholder from rubygems so we could continue using the name :raised_hands:
 

data/Gemfile

@@ -1,10 +1,10 @@
 source "https://rubygems.org"
 
-source "https://enterprise.contribsys.com/" do
-  gem "sidekiq-pro", "5.2.1"
+source "https://artifacts.dox.support/repository/gems" do
+  gem "sidekiq-pro", "7.3.6"
 end
 
-gem "sidekiq", "6.1.0"
+gem "sidekiq", "7.3.7"
 
 # Specify your gem's dependencies in simplekiq.gemspec
 gemspec

data/Gemfile.lock

@@ -1,31 +1,44 @@
 PATH
   remote: .
   specs:
-    simplekiq (0.1.0)
-      sidekiq (>= 5.2.9)
-      sidekiq-pro (~> 5.0)
+    simplekiq (0.2.0)
+      sidekiq (>= 7.1, < 9.0)
+      sidekiq-pro (>= 7.1, < 9.0)
+
+GEM
+  remote: https://artifacts.dox.support/repository/gems/
+  specs:
+    json (2.16.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    prism (1.6.0)
+    racc (1.8.1)
+    sidekiq-pro (7.3.6)
+      sidekiq (>= 7.3.7, < 8)
+    unicode-emoji (4.1.0)
 
 GEM
   remote: https://rubygems.org/
-  remote: https://enterprise.contribsys.com/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     coderay (1.1.3)
-    connection_pool (2.2.5)
+    connection_pool (2.5.4)
     diff-lcs (1.5.0)
+    logger (1.7.0)
     method_source (1.0.0)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    parallel (1.27.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
+      racc
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.4)
+    rack (3.2.4)
     rainbow (3.1.1)
     rake (12.3.3)
-    redis (4.7.1)
-    regexp_parser (2.3.1)
-    rexml (3.2.5)
+    redis-client (0.26.1)
+      connection_pool
+    regexp_parser (2.11.3)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -41,32 +54,44 @@ GEM
     rspec-support (3.11.0)
     rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.28.2)
+    rubocop (1.80.2)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.17.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.13.3)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    sidekiq (6.1.0)
-      connection_pool (>= 2.2.2)
-      rack (~> 2.0)
-      redis (>= 4.2.0)
-    sidekiq-pro (5.2.1)
-      connection_pool (>= 2.2.3)
-      sidekiq (>= 6.1.0)
-    standard (1.11.0)
-      rubocop (= 1.28.2)
-      rubocop-performance (= 1.13.3)
-    unicode-display_width (2.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    sidekiq (7.3.7)
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
+    standard (1.51.1)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.80.2)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.8.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.25.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
 
 PLATFORMS
   ruby
@@ -76,10 +101,10 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.2)
   rspec_junit_formatter
-  sidekiq (= 6.1.0)
-  sidekiq-pro (= 5.2.1)!
+  sidekiq (= 7.3.7)
+  sidekiq-pro (= 7.3.6)!
   simplekiq!
   standard
 
 BUNDLED WITH
-   2.1.4
+   2.7.2

data/lib/simplekiq/batch_tracker_job.rb

@@ -7,7 +7,7 @@
 
 module Simplekiq
   class BatchTrackerJob
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     def perform(klass_name, bid, args)
       # In the future, this will likely surface the toplevel batch to a callback method on the

data/lib/simplekiq/batching_job.rb

@@ -61,7 +61,7 @@
 
 module Simplekiq
   module BatchingJob
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     BATCH_CLASS_NAME = "SimplekiqBatch"
 
@@ -93,10 +93,10 @@ module Simplekiq
       # to toggle the behavior on and off.
       if batch
         batch.jobs do
-          handle_batches(args)
+          flush_batches(args)
         end
       else
-        handle_batches(args)
+        flush_batches(args)
       end
     end
 
@@ -104,14 +104,6 @@ module Simplekiq
 
     attr_accessor :batches
 
-    def handle_batches(args)
-      if !batches.empty?
-        flush_batches(args)
-      else
-        Simplekiq.run_empty_callbacks(self, args: args)
-      end
-    end
-
     def flush_batches(args)
       batch_job_class = self.class.const_get(BATCH_CLASS_NAME)
       sidekiq_batch.description ||= "Simplekiq Batch Jobs for #{self.class.name}, args: #{args}"
@@ -141,7 +133,7 @@ module Simplekiq
   end
 
   class BaseBatch
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     def perform(*args)
       module_parent_of_class.new.perform_batch(*args)
@@ -151,7 +143,7 @@ module Simplekiq
 
     def module_parent_of_class
       # Borrowed from https://apidock.com/rails/Module/module_parent_name
-      parent_name = self.class.name =~ /::[^:]+\Z/ ? $`.freeze : nil
+      parent_name = (self.class.name =~ /::[^:]+\Z/) ? $`.freeze : nil
       parent_name ? Object.const_get(parent_name) : Object
     end
   end

data/lib/simplekiq/orchestration_executor.rb

@@ -3,11 +3,6 @@
 module Simplekiq
   class OrchestrationExecutor
     def self.execute(args:, job:, workflow:)
-      if workflow.empty?
-        Simplekiq.run_empty_callbacks(job, args: args)
-        return
-      end
-
       orchestration_batch = Sidekiq::Batch.new
       orchestration_batch.description = "#{job.class.name} Simplekiq orchestration"
       Simplekiq.auto_define_callbacks(orchestration_batch, args: args, job: job)
@@ -15,7 +10,7 @@ module Simplekiq
       orchestration_batch.jobs do
         Simplekiq::BatchTrackerJob.perform_async(job.class.name, orchestration_batch.bid, args)
 
-        new.run_step(workflow, 0)
+        new.run_step(workflow, 0) unless workflow.empty?
       end
     end
 

data/lib/simplekiq/orchestration_job.rb

@@ -4,9 +4,10 @@ require "forwardable"
 
 module Simplekiq
   module OrchestrationJob
-    include Sidekiq::Worker
+    include Sidekiq::Job
 
     extend Forwardable
+
     def_delegators :orchestration, :run, :in_parallel
 
     def perform(*args)

data/lib/simplekiq/version.rb

@@ -1,3 +1,3 @@
 module Simplekiq
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/lib/simplekiq.rb

@@ -11,13 +11,6 @@ require "simplekiq/batch_tracker_job"
 
 module Simplekiq
   class << self
-    # Empty batches with no jobs will never invoke callbacks, so handle
-    # that case by immediately manually invoking :complete & :success.
-    def run_empty_callbacks(job, args:)
-      job.on_complete(nil, {"args" => args}) if job.respond_to?(:on_complete)
-      job.on_success(nil, {"args" => args}) if job.respond_to?(:on_success)
-    end
-
     def auto_define_callbacks(batch, args:, job:)
       batch.on("death", job.class, "args" => args) if job.respond_to?(:on_death)
       batch.on("complete", job.class, "args" => args) if job.respond_to?(:on_complete)

data/simplekiq.gemspec

@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry"
   spec.add_development_dependency "standard"
 
-  spec.add_dependency "sidekiq", ">= 5.2.9"
-  spec.add_dependency "sidekiq-pro", "~> 5.0"
+  spec.add_dependency "sidekiq", ">= 7.1", "< 9.0"
+  spec.add_dependency "sidekiq-pro", ">= 7.1", "< 9.0"
 end

data/tasks/ci.rake

@@ -6,7 +6,7 @@ namespace :ci do
     reports = "tmp/test-results/rspec"
     sh "mkdir -p #{reports}"
     sh "bundle exec rspec ./spec " \
-          "--format progress "\
+          "--format progress " \
           "--format RspecJunitFormatter " \
           "-o #{reports}/results.xml"
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: simplekiq
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jack Noble
 - John Wilkinson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2025-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -87,28 +87,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.9
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.9
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: sidekiq-pro
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '9.0'
 description: Provides tools for representing long chains of parallel and serial jobs
   in a flat, simple way.
 email:
@@ -145,7 +157,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/doximity/simplekiq
   source_code_uri: https://github.com/doximity/simplekiq
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +172,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.11
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Sidekiq-based workflow orchestration library
 test_files: []