backburner-allq 1.0.48 → 1.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc1ca3dfb947978928b105c72d983339dad44979592aed6fd7915556475af4d
-  data.tar.gz: 1d4cad4b40e7d4cfec6b547f176f0e1764af4cabce2da280eebb54a075431ee2
+  metadata.gz: acf9b46b2b02f7e4e2241ef41f42077b29781a5e861c27c7e82d7e0e1e4510e1
+  data.tar.gz: 0ad6e2b7056e53f04d7376d7a24c893c8c90dfa7b6022644f6f4fc2eee935713
 SHA512:
-  metadata.gz: 71847829e284ebc3765aeabcdf7ae87f4f21d6615ffc512ce072b96191ceeb8e1a5b7dbd86454796afd2b217b60513638aa5b617e8bf440cc2546642cf06b00c
-  data.tar.gz: e1a66316f5f301f3190b51a5a725026427b01bdd5178d0c7d74ddcfdb4f80d98c3d0adc91a935b429bf355a49b8f9cbf22cb16a809d1b4c07d07aed4fc3f88a9
+  metadata.gz: 8ac82950188d5377de0ae59399849bee1ce3a890a501baedb5c0e3ef021ab62b157491bf23da0cb3a9385162fb1bbde47e2797d217de37d54df6a478a25979a6
+  data.tar.gz: c1f6602b23cde86ba7d47153be36b65cb2f0aec45b6a08fab240bd9ab1530327425f0d1307637ab4c8957cc326a2d5331b60aa9753c7963705638bd9bd9b33b4

data/deploy.sh

@@ -1,3 +1,3 @@
 echo "Did you update the version?"
 gem build backburner-allq.gemspec
-gem push backburner-allq-1.0.48.gem
+gem push backburner-allq-1.0.50.gem

data/docker-compose.yml

@@ -1,4 +1,5 @@
 version: '3'
+
 services:
   allq-client:
     networks:
@@ -6,10 +7,12 @@ services:
     image: "blitline/allq_client"
     environment:
       - SERVER_STRING=allq-server:5555
+      - ALLQ_DEBUG=true
     depends_on:
       - allq-server
     ports:
       - 8090:8090
+      - 7766:7766
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "echo '{\"action\":\"peek\",\"params\":{\"tube\":\"default\", \"buried\":true}}' | socat - tcp4-connect:127.0.0.1:7768"]

data/lib/backburner/allq_wrapper.rb

@@ -91,6 +91,7 @@ module Backburner
   class AllQWrapper
     DEFAULT_TIMEOUT = 17_800
     def initialize(url = 'localhost:8090')
+      puts "URL = #{url}"
       allq_conf = Allq::Configuration.new do |config|
         config.host = url
       end
@@ -121,6 +122,10 @@ module Backburner
       @client.release_put(job.id, delay: delay)
     end
 
+    def set_children_started(parent_job_id)
+      @client.set_children_started_put(parent_job_id)
+    end
+
     def bury(job)
       @client.bury_put(job.id)
     end

data/lib/backburner/connection.rb

@@ -120,6 +120,7 @@ module Backburner
       options[:limit] = opt[:limit] if opt[:limit]
       options[:is_parent] = opt[:is_parent] if opt[:is_parent]
 
+puts "OPTIONS2 #{options}"
       # Overwrite originals
       opt.merge!(options)
       @allq_wrapper.put(data, options)

data/lib/backburner/performable.rb

@@ -1,5 +1,3 @@
-require 'backburner/async_proxy'
-
 module Backburner
   module Performable
     def self.included(base)

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "1.0.48"
+  VERSION = "1.0.50"
 end

data/lib/backburner/worker.rb

@@ -1,5 +1,3 @@
-require 'backburner/job'
-
 module Backburner
   #
   # @abstract Subclass and override {#process_tube_names}, {#prepare} and {#start} to implement
@@ -35,7 +33,6 @@ module Backburner
           options[k] = options[k].call job_class, args
         end
       end
-
       options[:shard_key] = options[:shard_key].nil? ? 'X' : options[:shard_key].to_s
       pri   = resolve_priority(options[:pri] || job_class)
       delay = [0, options[:delay].to_i].max
@@ -59,6 +56,7 @@ module Backburner
             ttr: ttr
           }
           options.merge!(send_data)
+          puts "OPTIONS #{options}"
           response = connection.put(tube_name, serialized_data, options)
         end
         return nil unless Backburner::Hooks.invoke_hook_events(job_class, :after_enqueue, *args)

data/lib/backburner.rb

@@ -2,20 +2,22 @@ require 'allq_rest'
 require 'json'
 require 'uri'
 require 'timeout'
-require 'backburner/version'
-require 'backburner/allq_wrapper'
-require 'backburner/helpers'
-require 'backburner/configuration'
-require 'backburner/logger'
-require 'backburner/connection'
-require 'backburner/hooks'
-require 'backburner/performable'
+require_relative 'backburner/async_proxy'
+require_relative 'backburner/version'
+require_relative 'backburner/allq_wrapper'
+require_relative 'backburner/helpers'
+require_relative 'backburner/configuration'
+require_relative 'backburner/logger'
+require_relative 'backburner/connection'
+require_relative 'backburner/hooks'
+require_relative 'backburner/performable'
 require_relative 'backburner/worker'
 require_relative 'backburner/workers/simple'
-require 'backburner/workers/forking'
-require 'backburner/workers/threads_on_fork'
-require 'backburner/workers/threading'
-require 'backburner/queue'
+require_relative 'backburner/workers/forking'
+require_relative 'backburner/workers/threads_on_fork'
+require_relative 'backburner/workers/threading'
+require_relative 'backburner/queue'
+require_relative 'backburner/job'
 
 module Backburner
   class << self

data/test/allq/back_burner_test.rb

@@ -13,7 +13,8 @@ class TestBackburnerJob
   end
 end
 
-class TestWorker < Backburner::Worker; end
+class TestWorker < Backburner::Worker
+end
 
 describe 'Backburner module' do
   before do
@@ -21,29 +22,6 @@ describe 'Backburner module' do
     clear_jobs!(Backburner.configuration.primary_queue, 'test-plain', 'parent-plain', 'bar.baz.foo')
   end
 
-  describe 'for work method' do
-    it 'invokes worker simple start' do
-      Backburner::Workers::Simple.expects(:start).with(%w[foo bar])
-      Backburner.work('foo', 'bar')
-    end
-
-    it 'invokes other worker if specified in configuration' do
-      Backburner.configure { |config| config.default_worker = TestWorker }
-      TestWorker.expects(:start).with(%w[foo bar])
-      Backburner.work('foo', 'bar')
-    end
-
-    it 'invokes other worker if specified in work method as options' do
-      TestWorker.expects(:start).with(%w[foo bar])
-      Backburner.work('foo', 'bar', worker: TestWorker)
-    end
-
-    it 'invokes worker start with no args' do
-      Backburner::Workers::Simple.expects(:start).with([])
-      Backburner.work
-    end
-  end # work!
-
   describe 'for configuration' do
     it 'remembers the tube_namespace' do
       assert_equal 'demo.test', Backburner.configuration.tube_namespace

data/test/allq/worker_test.rb

@@ -65,7 +65,6 @@ describe 'Backburner::Worker module' do
     worker = Backburner::Workers::Simple.new('demo.test.parent-plain')
     worker.prepare
 
-    TestParentJob.expects(:perform_with_task)
     job = worker.work_one_job(allq_connection, 'demo.test.parent-plain')
     assert_equal job.special, "true"
   end 

data/test/test_helper.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'tempfile'
 require 'minitest/autorun'
+require 'mocha/test_unit'
+
 begin
   require 'mocha/setup'
 rescue LoadError

data/test/worker_test.rb

@@ -1,136 +1,139 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('test_helper', __dir__)
 
-describe "Backburner::Worker module" do
+describe 'Backburner::Worker module' do
   before do
     Backburner.default_queues.clear
-    clear_jobs!(Backburner.configuration.primary_queue, "test-plain", "test.bar", "bar.baz.foo")
+    clear_jobs!(Backburner.configuration.primary_queue, 'test-plain', 'test.bar', 'bar.baz.foo')
   end
 
-  describe "for enqueue class method" do
-    it "should support enqueuing plain job" do
-      Backburner::Worker.enqueue TestPlainJob, [7, 9], :ttr => 100, :pri => 2000
-      pop_one_job("test-plain") do |job, body|
-        assert_equal "TestPlainJob", body["class"]
-        assert_equal [7, 9], body["args"]
+  describe 'for enqueue class method' do
+    it 'should support enqueuing plain job' do
+      Backburner::Worker.enqueue TestPlainJob, [7, 9], ttr: 100, pri: 2000
+      pop_one_job('test-plain') do |job, body|
+        assert_equal 'TestPlainJob', body['class']
+        assert_equal [7, 9], body['args']
         assert_equal 100, job.ttr
         assert_equal 2000, job.pri
       end
     end # plain
 
-    it "should support enqueuing job with class queue priority" do
-      Backburner::Worker.enqueue TestJob, [3, 4], :ttr => 100
+    it 'should support enqueuing job with class queue priority' do
+      Backburner::Worker.enqueue TestJob, [3, 4], ttr: 100
       pop_one_job do |job, body|
-        assert_equal "TestJob", body["class"]
-        assert_equal [3, 4], body["args"]
+        assert_equal 'TestJob', body['class']
+        assert_equal [3, 4], body['args']
         assert_equal 100, job.ttr
         assert_equal 100, job.pri
       end
     end # queue priority
 
-    it "should support enqueuing job with specified named priority" do
-      Backburner::Worker.enqueue TestJob, [3, 4], :ttr => 100, :pri => 'high'
+    it 'should support enqueuing job with specified named priority' do
+      Backburner::Worker.enqueue TestJob, [3, 4], ttr: 100, pri: 'high'
       pop_one_job do |job, body|
-        assert_equal "TestJob", body["class"]
-        assert_equal [3, 4], body["args"]
+        assert_equal 'TestJob', body['class']
+        assert_equal [3, 4], body['args']
         assert_equal 100, job.ttr
         assert_equal 0, job.pri
       end
     end # queue named priority
 
-    it "should support enqueuing job with class queue respond_timeout" do
+    it 'should support enqueuing job with class queue respond_timeout' do
       Backburner::Worker.enqueue TestJob, [3, 4]
       pop_one_job do |job, body|
-        assert_equal "TestJob", body["class"]
-        assert_equal [3, 4], body["args"]
+        assert_equal 'TestJob', body['class']
+        assert_equal [3, 4], body['args']
         assert_equal 300, job.ttr
         assert_equal 100, job.pri
       end
     end # queue respond_timeout
 
-    it "should support enqueuing job with custom queue" do
-      Backburner::Worker.enqueue TestJob, [6, 7], :queue => "test.bar", :pri => 5000
-      pop_one_job("test.bar") do |job, body|
-        assert_equal "TestJob", body["class"]
-        assert_equal [6, 7], body["args"]
+    it 'should support enqueuing job with custom queue' do
+      Backburner::Worker.enqueue TestJob, [6, 7], queue: 'test.bar', pri: 5000
+      pop_one_job('test.bar') do |job, body|
+        assert_equal 'TestJob', body['class']
+        assert_equal [6, 7], body['args']
         assert_equal 0, job.delay
         assert_equal 5000, job.pri
         assert_equal 300, job.ttr
       end
     end # custom
 
-    it "should support async job" do
-      TestAsyncJob.async(:ttr => 100, :queue => "bar.baz.foo").foo(10, 5)
-      pop_one_job("bar.baz.foo") do |job, body|
-        assert_equal "TestAsyncJob", body["class"]
-        assert_equal [nil, "foo", 10, 5], body["args"]
+    it 'should support async job' do
+      TestAsyncJob.async(ttr: 100, queue: 'bar.baz.foo').foo(10, 5)
+      pop_one_job('bar.baz.foo') do |job, body|
+        assert_equal 'TestAsyncJob', body['class']
+        assert_equal [nil, 'foo', 10, 5], body['args']
         assert_equal 100, job.ttr
         assert_equal Backburner.configuration.default_priority, job.pri
       end
     end # async
 
-    it "should support enqueueing job with lambda queue" do
+    it 'should support enqueueing job with lambda queue' do
       expected_queue_name = TestLambdaQueueJob.calculated_queue_name
-      Backburner::Worker.enqueue TestLambdaQueueJob, [6, 7], :queue => lambda { |klass| klass.calculated_queue_name }
-      pop_one_job(expected_queue_name) do |job, body|
-        assert_equal "TestLambdaQueueJob", body["class"]
-        assert_equal [6, 7], body["args"]
+      Backburner::Worker.enqueue TestLambdaQueueJob, [6, 7], queue: ->(klass) { klass.calculated_queue_name }
+      pop_one_job(expected_queue_name) do |_job, body|
+        assert_equal 'TestLambdaQueueJob', body['class']
+        assert_equal [6, 7], body['args']
       end
     end
   end # enqueue
 
-  describe "for start class method" do
-    it "should initialize and start the worker instance" do
-      ech = stub
-      Backburner::Worker.expects(:new).with("foo").returns(ech)
-      ech.expects(:start)
-      Backburner::Worker.start("foo")
-    end
-  end # start
-
-  describe "for tube_names accessor" do
+  # describe "for start class method" do
+  #   it "should initialize and start the worker instance" do
+  #     ech = stub
+  #     Backburner::Worker.expects(:new).with("foo").returns(ech)
+  #     ech.expects(:start)
+  #     Backburner::Worker.start("foo")
+  #     object = mock()
+  #     object.expects(:expected_method).with() { |value| value % 4 == 0 }
+  #     object.expected_method(16)
+  #   end
+  # end # start
+
+  describe 'for tube_names accessor' do
     before do
-      Backburner.default_queues << "baz"
-      Backburner.default_queues << "bam"
+      Backburner.default_queues << 'baz'
+      Backburner.default_queues << 'bam'
     end
 
-    it "supports retrieving tubes" do
-      worker = Backburner::Worker.new(["foo", "bar"])
-      assert_equal ["foo", "bar"], worker.tube_names
+    it 'supports retrieving tubes' do
+      worker = Backburner::Worker.new(%w[foo bar])
+      assert_equal %w[foo bar], worker.tube_names
     end
 
-    it "supports single tube array arg" do
-      worker = Backburner::Worker.new([["foo", "bar"]])
-      assert_equal ["foo", "bar"], worker.tube_names
+    it 'supports single tube array arg' do
+      worker = Backburner::Worker.new([%w[foo bar]])
+      assert_equal %w[foo bar], worker.tube_names
     end
 
-    it "supports empty nil array arg with default values" do
+    it 'supports empty nil array arg with default values' do
       worker = Backburner::Worker.new([nil])
-      assert_equal ['baz', 'bam'], worker.tube_names
+      assert_equal %w[baz bam], worker.tube_names
     end
 
-    it "supports single tube arg" do
-      worker = Backburner::Worker.new("foo")
-      assert_equal ["foo"], worker.tube_names
+    it 'supports single tube arg' do
+      worker = Backburner::Worker.new('foo')
+      assert_equal ['foo'], worker.tube_names
     end
 
-    it "supports empty array arg with default values" do
+    it 'supports empty array arg with default values' do
       worker = Backburner::Worker.new([])
-      assert_equal ['baz', 'bam'], worker.tube_names
+      assert_equal %w[baz bam], worker.tube_names
     end
 
-    it "supports nil arg with default values" do
+    it 'supports nil arg with default values' do
       worker = Backburner::Worker.new(nil)
-      assert_equal ['baz', 'bam'], worker.tube_names
+      assert_equal %w[baz bam], worker.tube_names
     end
   end # tube_names
 
-  describe "for custom serialization" do
+  describe 'for custom serialization' do
     before do
       Backburner.configure do |config|
         @old_parser = config.job_parser_proc
         @old_serializer = config.job_serializer_proc
-        config.job_parser_proc = lambda { |body| Marshal.load(body) }
-        config.job_serializer_proc = lambda { |body| Marshal.dump(body) }
+        config.job_parser_proc = ->(body) { Marshal.load(body) }
+        config.job_serializer_proc = ->(body) { Marshal.dump(body) }
       end
     end
 
@@ -142,10 +145,10 @@ describe "Backburner::Worker module" do
       end
     end
 
-    it "should support enqueuing a job" do
-      Backburner::Worker.enqueue TestPlainJob, [7, 9], :ttr => 100, :pri => 2000
-      pop_one_job("test-plain") do |job, body|
-        assert_equal "TestPlainJob", body[:class]
+    it 'should support enqueuing a job' do
+      Backburner::Worker.enqueue TestPlainJob, [7, 9], ttr: 100, pri: 2000
+      pop_one_job('test-plain') do |job, body|
+        assert_equal 'TestPlainJob', body[:class]
         assert_equal [7, 9], body[:args]
         assert_equal 100, job.ttr
         assert_equal 2000, job.pri

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.48
+  version: 1.0.50
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2024-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allq_rest
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Reliable allq background job processing made easy for Ruby and Sinatra