faktory_worker_ruby 1.3.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc45bf7c07e61197705a9283c38e6d399a81701f433d8a5eded1e6cb6b480e3
-  data.tar.gz: ac96de6c442ad806cf3cafa5fc839e5509454a8f315229f4014cddfcd9bbb28e
+  metadata.gz: fe9fd54ed547e42b198c7cf2e2f056203857f0f16a65aafe7126006102f86b3b
+  data.tar.gz: 9ce604181600566d5991a3e9419f8b48a68d1cf657e8731ef5440eeadff5c4e7
 SHA512:
-  metadata.gz: ef6262279803c776c204d2efd58bb547617519bf8277a78e3a46f3789e39bff21220134556f8c209b3d7fd26eb85627b24062f721de3c87324acb0063ec778e4
-  data.tar.gz: 6de7bd208b4ab94ab57b3513159c5ab047f5144fb6152365d52535e3274f8306a416a1124f1c299fe0269542bdb61670958323b8be2285face085f8e3f53ae35
+  metadata.gz: a344b74590b7e16f361fe2be34b69f1d7b07934f59cad91bc06b21dbc619638ac001591e3a5f3e91dabd57526ce1a612f3f28217fe8b61e28b3a29da3104cb0b
+  data.tar.gz: a23358b7b261355de860f811b33218704e0d1ee760b794dec7977137e3b2996c8badab2bf0d9d420d468ed539c4b07c6b893a7e99c761659187ae081a3343ef4

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3"]
     runs-on: ubuntu-latest
     services:
       faktory:

data/.standard.yml

@@ -1,4 +1,4 @@
-ruby_version: 2.5.0
+ruby_version: 2.7.0
 fix: true
 parallel: true
 ignore:

data/Changes.md

@@ -1,5 +1,11 @@
 # Changes
 
+## HEAD
+
+- Allow more connections in pool [#455]
+- Minimum Ruby version is now 2.7.
+- Minimum Rails version is now 6.0.
+
 ## 1.3.0
 
 - Fix `faktory/testing` [#74]

data/Gemfile.lock

@@ -1,69 +1,92 @@
 PATH
   remote: .
   specs:
-    faktory_worker_ruby (1.3.0)
+    faktory_worker_ruby (2.0.0)
       connection_pool (~> 2.2, >= 2.2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activejob (7.0.4.3)
-      activesupport (= 7.0.4.3)
+    activejob (7.1.3)
+      activesupport (= 7.1.3)
       globalid (>= 0.3.6)
-    activesupport (7.0.4.3)
+    activesupport (7.1.3)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     docile (1.4.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
-    i18n (1.12.0)
+    drb (2.2.0)
+      ruby2_keywords
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
-    minitest (5.18.0)
-    minitest-hooks (1.5.0)
+    lint_roller (1.1.0)
+    minitest (5.21.2)
+    minitest-hooks (1.5.1)
       minitest (> 5.3)
-    parallel (1.22.1)
-    parser (3.2.2.0)
+    mutex_m (0.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    rubocop (1.48.1)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rubocop (1.59.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-performance (1.16.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    standard (1.25.3)
+    standard (1.33.0)
       language_server-protocol (~> 3.17.0.2)
-      rubocop (~> 1.48.1)
-      rubocop-performance (~> 1.16.0)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.59.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.3)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.3.1)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.20.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -76,3 +99,6 @@ DEPENDENCIES
   rake
   simplecov
   standard
+
+BUNDLED WITH
+   2.4.22

data/faktory_worker_ruby.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.executables = ["faktory-worker"]
   gem.files = `git ls-files | grep -Ev '^(test|myapp|examples)'`.split("\n")
   gem.version = Faktory::VERSION
-  gem.required_ruby_version = ">= 2.5.0"
+  gem.required_ruby_version = ">= 2.7.0"
 
   gem.metadata = {
     "homepage_uri" => "https://contribsys.com/faktory",
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   }
 
   gem.add_dependency "connection_pool", "~> 2.2", ">= 2.2.2"
-  gem.add_development_dependency "activejob", ">= 5.2.0"
+  gem.add_development_dependency "activejob", ">= 6.0.0"
   gem.add_development_dependency "minitest", "~> 5"
   gem.add_development_dependency "minitest-hooks"
   gem.add_development_dependency "rake"

data/lib/faktory/client.rb

@@ -347,9 +347,9 @@ module Faktory
       raise Errno::ECONNRESET, "No response" unless line
       chr = line[0]
       if chr == "+"
-        line[1..-1].strip
+        line[1..].strip
       elsif chr == "$"
-        count = line[1..-1].strip.to_i
+        count = line[1..].strip.to_i
         return nil if count == -1
         data = read(count) if count > 0
         _ = gets # read extra linefeeds
@@ -362,7 +362,7 @@ module Faktory
         #
         # -NOTUNIQUE Job not unique
         # We return ["NOTUNIQUE", "Job not unique"]
-        err = line[1..-1].split(" ", 2)
+        err = line[1..].split(" ", 2)
         raise CommandError, err[1] if err[0] == "ERR"
         err
       else

data/lib/faktory/connection.rb

@@ -6,7 +6,7 @@ module Faktory
   class Connection
     class << self
       def create(options = {})
-        size = Faktory.worker? ? (Faktory.options[:concurrency] + 2) : 5
+        size = Faktory.worker? ? (Faktory.options[:concurrency] + 5) : 20
         ConnectionPool.new(timeout: options[:pool_timeout] || 1, size: size) do
           Faktory::Client.new(**options)
         end

data/lib/faktory/job.rb

@@ -173,7 +173,7 @@ module Faktory
             m = "#{name}="
             undef_method(m) if method_defined?(m) || private_method_defined?(m)
           end
-          define_singleton_method("#{name}=") do |val|
+          define_singleton_method(:"#{name}=") do |val|
             singleton_class.class_eval do
               undef_method(name) if method_defined?(name) || private_method_defined?(name)
               define_method(name) { val }

data/lib/faktory/logging.rb

@@ -62,7 +62,7 @@ module Faktory
     end
 
     def self.logger=(log)
-      @logger = (log || Logger.new(File::NULL))
+      @logger = log || Logger.new(File::NULL)
     end
 
     def logger

data/lib/faktory/rails.rb

@@ -22,7 +22,7 @@ module Faktory
         # None of this matters on the client-side, only within the Faktory executor itself.
         #
         Faktory.configure_worker do |_|
-          if ::Rails::VERSION::MAJOR < 5
+          if ::Rails::VERSION::MAJOR < 6
             raise "Your current version of Rails, #{::Rails::VERSION::STRING}, is not supported"
           end
 
@@ -58,9 +58,9 @@ module Faktory
     end
   end
 
-  if defined?(::Rails) && ::Rails::VERSION::MAJOR < 5
+  if defined?(::Rails) && ::Rails::VERSION::MAJOR < 6
     warn("**************************************************")
-    warn("🚫 ERROR: Faktory Worker does not support Rails versions under 5.x - please ensure your workers are updated")
+    warn("🚫 ERROR: Faktory Worker does not support Rails version < 6.x")
     warn("**************************************************")
     warn("")
   end

data/lib/faktory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Faktory
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faktory_worker_ruby
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Mike Perham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-31 00:00:00.000000000 Z
+date: 2024-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -147,14 +147,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Ruby worker for Faktory