sqewer 8.1.0 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e5fc06a5281d8f654c015e190e1c2a7ac67a2fda1ccb2d1b14efbb8ecc30452
-  data.tar.gz: 570bb873fc72efb58bc93d8ccda578fc3ee0005105f2cc49e86383115e9657c5
+  metadata.gz: 4fd3e716de2cc1860f1c1638f8cfe0f21b965c82b0026c1315eb13c8668b5056
+  data.tar.gz: a727f9e4e226811b7553efe1daff8bda680ac03a61bc37f6c3c2020b410b7351
 SHA512:
-  metadata.gz: 6efd7484bc5acf361314b09d0d5525fb9396b285df5fd5ee8e65e0d7dc53c0735f97273210f9adf9495f2a013e58f8a071c0d221303787499e6bf7b63ecc87cd
-  data.tar.gz: 37b8754720c2e9b327ebc5f3df5ac320fc9291f0e6447dcb68881fec861c69ed2917154c0dda57e48e6f120dd9ee60dbccbcf43b183319928b70917e836bc990
+  metadata.gz: 036f10c4debed8416fe639adcfc3e7f38d1e9fc4825f01892e98d518997823b7c1291f6ad51190d3f79f49027d843862b3b92f79c0f4da73f1bebbea3078e6c8
+  data.tar.gz: 0cc332e0f3ab31d02254356b33c3b097cf0700f259f87ed63734a61d9df47817b119fa3f7f8ddd427ed624ea1ee72b7bd0a25105127273392cb906693c520f21

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @WeTransfer/WeTransfer-CodeOwners

data/.github/dependabot.yml

@@ -0,0 +1,16 @@
+---
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+      time: "10:00"
+      timezone: Europe/Amsterdam
+  - package-ecosystem: bundler
+    directory: /
+    registries: "*"
+    schedule:
+      interval: daily
+      time: "09:00"
+      timezone: Europe/Amsterdam

data/.github/workflows/main.yml

@@ -9,26 +9,24 @@ jobs:
     strategy:
       matrix:
         ruby:
+          - 3.2
           - 3.1
           - 3.0
-          - 2.7
-          - 2.6
         gemfile:
-          - gemfiles/Gemfile.rails-5.0.x
-          - gemfiles/Gemfile.rails-5.1.x
-          - gemfiles/Gemfile.rails-6.0.x
+          - gemfiles/Gemfile.rails-6.1.x
+          - gemfiles/Gemfile.rails-7.0.x
     env:
       SQS_QUEUE_URL: 'sqlite3://tmp/sqewer.sqlite3'
       AWS_REGION: 'eu-central-1'
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: install gems
       run: |
-        gem install sqlite3
+        gem install sqlite3 -v '~> 1.0'
         gem install bundler
         bundle install --gemfile ${{ matrix.gemfile }}
     - name: Tests

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 10.0.0
+- Ensure all worker threads exit if a thread dies in case of an unhandled exception, to avoid "zombie" workers (running without any consumer thread)
+
+### 9.0.0
+- Add support for Ruby 3.2 and Rails 7
+- Remove support for Ruby 2.6, 2.7 and Rails 5 and 6.0
+
 ### 8.1.0
 - dropped dependency on `ks` gem
 - added rails6 and ruby3/3.1 to test matrix

data/README.md

@@ -48,7 +48,7 @@ The messages will only be deleted from SQS once the job execution completes with
 
 ## Requirements
 
-Ruby 2.6+, version 2 of the AWS SDK. You can also run Sqewer backed by a SQLite database file, which can be handy for development situations.
+Ruby 3+, version 2 of the AWS SDK. You can also run Sqewer backed by a SQLite database file, which can be handy for development situations.
 
 ## Job storage
 
@@ -415,4 +415,3 @@ the Ruby standard library alone.
 ## Copyright
 
 Copyright (c) 2016 WeTransfer. See LICENSE.txt for further details.
-

data/gemfiles/{Gemfile.rails-5.1.x → Gemfile.rails-6.1.x}

@@ -4,5 +4,5 @@ source "http://rubygems.org"
 gemspec path: __dir__ + '/..'
 
 gem 'sqlite3', "~> 1.3", ">= 1.3.6"
-gem 'activejob', "~> 5.1.0"
-gem 'activerecord', "~> 5.1.0"
+gem 'activejob', "~> 6.1.0"
+gem 'activerecord', "~> 6.1.0"

data/gemfiles/{Gemfile.rails-6.0.x → Gemfile.rails-7.0.x}

@@ -4,5 +4,5 @@ source "http://rubygems.org"
 gemspec path: __dir__ + '/..'
 
 gem 'sqlite3', "~> 1.3", ">= 1.3.6"
-gem 'activejob', "~> 6.0.0"
-gem 'activerecord', "~> 6.0.0"
+gem 'activejob', "~> 7.0.0"
+gem 'activerecord', "~> 7.0.0"

data/lib/sqewer/extensions/active_job_adapter.rb

@@ -1,14 +1,6 @@
 # ActiveJob docs: http://edgeguides.rubyonrails.org/active_job_basics.html
 # Example adapters ref: https://github.com/rails/rails/tree/master/activejob/lib/active_job/queue_adapters
 module ActiveJob
-  # Only prepend the module with keyword argument acceptance when the version is 4
-  # ActiveJob 5.x supports kwargs out of the box
-  if ActiveJob::VERSION::MAJOR <= 4
-    module Execution
-      prepend PerformWithKeywords
-    end
-  end
-
   module QueueAdapters
     # Handle Rails ActiveJob through sqewer.
     # Set it up like so:
@@ -56,48 +48,32 @@ module ActiveJob
             Base.execute(job)
           end
         end
-        
+
         private
-        
+
         def with_active_record_connection_from_pool
           ActiveRecord::Base.connection_pool.with_connection { yield }
         end
-        
+
         def active_record_defined_and_connected?
           defined?(ActiveRecord) && ActiveRecord::Base.connected?
         end
-        
+
       end
 
-      def self.enqueue(active_job) #:nodoc:
+      def enqueue(*args)
         wrapped_job = Performable.from_active_job(active_job)
 
         Sqewer.submit!(wrapped_job)
       end
 
-      def self.enqueue_at(active_job, timestamp) #:nodoc:
+      def enqueue_at(*args)
         wrapped_job = Performable.from_active_job(active_job)
 
         delta_t = (timestamp - Time.now.to_i).to_i
 
         Sqewer.submit!(wrapped_job, delay_seconds: delta_t)
       end
-
-      # ActiveJob in Rails 4 resolves the symbol value you give it
-      # and then tries to call enqueue_* methods directly on what
-      # got resolved. In Rails 5, first Rails will call .new on
-      # what it resolved from the symbol and _then_ call enqueue
-      # and enqueue_at on that what has gotten resolved. This means
-      # that we have to expose these methods _both_ as class methods
-      # and as instance methods.
-      # This can be removed when we stop supporting Rails 4.
-      def enqueue_at(*args)
-        self.class.enqueue_at(*args)
-      end
-      
-      def enqueue(*args)
-        self.class.enqueue(*args)
-      end
     end
   end
 end

data/lib/sqewer/version.rb

@@ -1,3 +1,3 @@
 module Sqewer
-  VERSION = '8.1.0'
+  VERSION = '10.0.0'
 end

data/lib/sqewer/worker.rb

@@ -89,8 +89,14 @@ class Sqewer::Worker
     @logger.info { '[worker] Starting with %d consumer threads' % @num_threads }
     @execution_queue = Queue.new
 
-    consumers = (1..@num_threads).map do
+    # Ensure that unhandled exceptions inside threads make the worker fail,
+    # to avoid silent failures with no consumer threads running.
+    Thread.abort_on_exception = true
+
+    consumers = (1..@num_threads).each_with_index.map do |_, index|
       Thread.new do
+        Thread.current[:role] = :consumer
+        Thread.current[:id] = index
         loop { take_and_execute }
       end
     end
@@ -99,6 +105,7 @@ class Sqewer::Worker
     # grab new messages and place them on the local queue.
     owning_worker = self # self won't be self anymore in the thread
     provider = Thread.new do
+      Thread.current[:role] = :provider
       loop do
         begin
           break if stopping?

data/sqewer.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Process jobs from SQS}
   spec.description   = %q{A full-featured library for all them SQS worker needs}
   spec.homepage      = "https://github.com/WeTransfer/sqewer"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the "allowed_push_host"
   # to allow pushing to a single host or delete this section to allow pushing to any host.

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sqewer
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 10.0.0
 platform: ruby
 authors:
 - Julik Tarkhanov
 - Andrei Horak
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -246,9 +246,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
 - ".github/workflows/main.yml"
 - ".gitignore"
 - ".yardopts"
@@ -260,9 +262,8 @@ files:
 - bin/sqewer
 - bin/sqewer_rails
 - example.env
-- gemfiles/Gemfile.rails-5.0.x
-- gemfiles/Gemfile.rails-5.1.x
-- gemfiles/Gemfile.rails-6.0.x
+- gemfiles/Gemfile.rails-6.1.x
+- gemfiles/Gemfile.rails-7.0.x
 - lib/sqewer.rb
 - lib/sqewer/atomic_counter.rb
 - lib/sqewer/cli.rb
@@ -288,7 +289,7 @@ homepage: https://github.com/WeTransfer/sqewer
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -296,15 +297,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.17
+signing_key:
 specification_version: 4
 summary: Process jobs from SQS
 test_files: []

data/gemfiles/Gemfile.rails-5.0.x

@@ -1,8 +0,0 @@
-source "http://rubygems.org"
-
-# Gemspec as base dependency set
-gemspec path: __dir__ + '/..'
-
-gem 'sqlite3', '~> 1.3.6'
-gem 'activejob', "~> 5.0.0"
-gem 'activerecord', "~> 5.0.0"