taskinator 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea786056f74987f21643d392336032d09896df7ddc01d462a78a257a19088d8
-  data.tar.gz: f693f14e2dac9341f1c83c6bf04b12da9d96261498198cc712e71be5b4b51955
+  metadata.gz: ae9476e48721568bd268135aac66ccf70f0b1f9f5737e2db7c25ab22033e6e3b
+  data.tar.gz: bba571d2cc60c017636187a88cd770889c5ac644726ac4094134d6ea48a9decd
 SHA512:
-  metadata.gz: 6151322f48c6215c41ffeeb6fc08d43aa871f9f76d04f628c80d29fa423b22fb0a3ee589803efd1503c3b59491bc4e2ace36879f801638898b9ace0557e4f180
-  data.tar.gz: 65ba806d211f62c8ff12ea3c036b037f53567a17f1a848129ba8f737d4fc0267be7435d6e315591afa81527275042bf22cc04066c74684b6cc54b0e3ce8691f8
+  metadata.gz: 5d2912f45a9200d3f2abce1cc4fd651b2369d0663cbad219e0e16fe08990ad0f9ecdbf49402d5d2774581dd111fd0b3141f2bbe939214114094de13f3eae7d8e
+  data.tar.gz: dd35c73baf37a5ba20bc43faebeb855fa5445c0559f331c7f8c144d0d5fcb27c05b0e72b8030d31a42b985d5322a8e539db8113c0b43341b41bbde2a8c8cfb2f

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+v0.5.0 - 18 Feb 2022
+---
+Removed unused `ProcessWorker` class and related queue methods.
+Refactored `TestQueueAdapter` to correctly implement queue adapter for use in specs.
+Added deprecation for `Taskinator::Process::Concurrent#concurrency_method` option.
+
+v0.4.7 - 17 Feb 2022
+---
+Use newer format for `pipelined` and `multi` requests in Redis.
+
+v0.4.6 - 12 Feb 2022
+---
+Upgrade actionpack for [information vulnerability fix](https://github.com/virtualstaticvoid/taskinator/security/dependabot/3).
+
+v0.4.5 - 30 Jan 2022
+---
+Upgrade sidekiq dependency for [CVE-2022-23837](https://github.com/advisories/GHSA-jrfj-98qg-qjgv).
+
 v0.4.4 - 17 Jan 2022
 ---
 Add support for `ActiveJob`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    taskinator (0.4.7)
+    taskinator (0.5.0)
       builder (>= 3.2.2)
       connection_pool (>= 2.2.0)
       globalid (~> 0.3)

data/lib/taskinator/process.rb

@@ -222,12 +222,15 @@ module Taskinator
 
     class Concurrent < Process
       attr_reader :complete_on
+
+      # <b>DEPRECATED:</b> concurrency_method will be removed in a future version.
       attr_reader :concurrency_method
 
       def initialize(definition, complete_on=CompleteOn::Default, options={})
         super(definition, options)
         @complete_on = complete_on
         @concurrency_method = options.delete(:concurrency_method) || :thread
+        warn("[DEPRECATED]: concurrency_method will be removed in a future version.") if @concurrency_method == :fork
       end
 
       def enqueue
@@ -246,6 +249,7 @@ module Taskinator
           complete! # weren't any tasks to start with
         else
           if concurrency_method == :fork
+            warn("[DEPRECATED]: concurrency_method will be removed in a future version.")
             tasks.each do |task|
               fork do
                 task.start!

data/lib/taskinator/queues/active_job.rb

@@ -18,12 +18,6 @@ module Taskinator
           .perform_later(definition.name, uuid, Taskinator::Persistence.serialize(args))
       end
 
-      def enqueue_process(process)
-        queue = process.queue || @config[:process_queue]
-        ProcessWorker.set(:queue => queue)
-          .perform_later(process.uuid)
-      end
-
       def enqueue_task(task)
         queue = task.queue || @config[:task_queue]
         TaskWorker.set(:queue => queue)
@@ -36,12 +30,6 @@ module Taskinator
         end
       end
 
-      class ProcessWorker < ApplicationJob
-        def perform(process_uuid)
-          Taskinator::ProcessWorker.new(process_uuid).perform
-        end
-      end
-
       class TaskWorker < ApplicationJob
         def perform(task_uuid)
           Taskinator::TaskWorker.new(task_uuid).perform

data/lib/taskinator/queues/delayed_job.rb

@@ -17,11 +17,6 @@ module Taskinator
         ::Delayed::Job.enqueue CreateProcessWorker.new(definition.name, uuid, Taskinator::Persistence.serialize(args)), :queue => queue
       end
 
-      def enqueue_process(process)
-        queue = process.queue || @config[:process_queue]
-        ::Delayed::Job.enqueue ProcessWorker.new(process.uuid), :queue => queue
-      end
-
       def enqueue_task(task)
         queue = task.queue || @config[:task_queue]
         ::Delayed::Job.enqueue TaskWorker.new(task.uuid), :queue => queue
@@ -33,12 +28,6 @@ module Taskinator
         end
       end
 
-      ProcessWorker = Struct.new(:process_uuid) do
-        def perform
-          Taskinator::ProcessWorker.new(process_uuid).perform
-        end
-      end
-
       TaskWorker = Struct.new(:task_uuid) do
         def perform
           Taskinator::TaskWorker.new(task_uuid).perform

data/lib/taskinator/queues/resque.rb

@@ -15,10 +15,6 @@ module Taskinator
           @queue = config[:definition_queue]
         end
 
-        ProcessWorker.class_eval do
-          @queue = config[:process_queue]
-        end
-
         TaskWorker.class_eval do
           @queue = config[:task_queue]
         end
@@ -30,11 +26,6 @@ module Taskinator
         Resque.enqueue_to(queue, CreateProcessWorker, definition.name, uuid, Taskinator::Persistence.serialize(args))
       end
 
-      def enqueue_process(process)
-        queue = process.queue || Resque.queue_from_class(ProcessWorker)
-        Resque.enqueue_to(queue, ProcessWorker, process.uuid)
-      end
-
       def enqueue_task(task)
         queue = task.queue || Resque.queue_from_class(TaskWorker)
         Resque.enqueue_to(queue, TaskWorker, task.uuid)
@@ -46,12 +37,6 @@ module Taskinator
         end
       end
 
-      class ProcessWorker
-        def self.perform(process_uuid)
-          Taskinator::ProcessWorker.new(process_uuid).perform
-        end
-      end
-
       class TaskWorker
         def self.perform(task_uuid)
           Taskinator::TaskWorker.new(task_uuid).perform

data/lib/taskinator/queues/sidekiq.rb

@@ -17,11 +17,6 @@ module Taskinator
         CreateProcessWorker.client_push('class' => CreateProcessWorker, 'args' => [definition.name, uuid, Taskinator::Persistence.serialize(args)], 'queue' => queue)
       end
 
-      def enqueue_process(process)
-        queue = process.queue || @config[:process_queue]
-        TaskWorker.client_push('class' => ProcessWorker, 'args' => [process.uuid], 'queue' => queue)
-      end
-
       def enqueue_task(task)
         queue = task.queue || @config[:task_queue]
         TaskWorker.client_push('class' => TaskWorker, 'args' => [task.uuid], 'queue' => queue)
@@ -35,14 +30,6 @@ module Taskinator
         end
       end
 
-      class ProcessWorker
-        include ::Sidekiq::Worker
-
-        def perform(process_uuid)
-          Taskinator::ProcessWorker.new(process_uuid).perform
-        end
-      end
-
       class TaskWorker
         include ::Sidekiq::Worker
 

data/lib/taskinator/queues.rb

@@ -33,11 +33,6 @@ module Taskinator
         adapter.enqueue_create_process(definition, uuid, args)
       end
 
-      def enqueue_process(process)
-        Taskinator.logger.info("Enqueuing process #{process}")
-        adapter.enqueue_process(process)
-      end
-
       def enqueue_task(task)
         Taskinator.logger.info("Enqueuing task #{task}")
         adapter.enqueue_task(task)

data/lib/taskinator/version.rb

@@ -1,3 +1,3 @@
 module Taskinator
-  VERSION = "0.4.7"
+  VERSION = "0.5.0"
 end

data/lib/taskinator.rb

@@ -26,7 +26,6 @@ require 'taskinator/tasks'
 require 'taskinator/process'
 
 require 'taskinator/task_worker'
-require 'taskinator/process_worker'
 require 'taskinator/create_process_worker'
 
 require 'taskinator/executor'

data/spec/support/test_queue.rb

@@ -2,38 +2,42 @@ module Taskinator
   module Queues
 
     def self.create_test_queue_adapter(config={})
-      TestQueueAdapter.new
+      TestQueueAdapter.new(config)
     end
 
     def self.create_test_queue_worker_adapter(config={})
-      QueueWorkerAdapter.new
+      TestQueueWorkerAdapter.new(config)
     end
 
+    #
+    # this is a no-op adapter, it tracks enqueued processes and tasks
+    #
     class TestQueueAdapter
 
-      attr_reader :creates
-      attr_reader :tasks
-
-      def initialize
+      def initialize(config={})
         clear
       end
 
-      def clear
-        @creates = []
-        @tasks = []
-        @jobs = []
-      end
-
       def enqueue_create_process(definition, uuid, args)
-        @creates << [definition, uuid, args]
+        @processes << [definition, uuid, args]
       end
 
       def enqueue_task(task)
         @tasks << task
       end
 
+      # helpers
+
+      attr_reader :processes
+      attr_reader :tasks
+
+      def clear
+        @processes = []
+        @tasks = []
+      end
+
       def empty?
-        @creates.empty? && @tasks.empty? && @jobs.empty?
+        @processes.empty? && @tasks.empty?
       end
 
     end
@@ -41,7 +45,7 @@ module Taskinator
     #
     # this is a "synchronous" implementation for use in testing
     #
-    class QueueWorkerAdapter < TestQueueAdapter
+    class TestQueueWorkerAdapter < TestQueueAdapter
 
       def enqueue_create_process(definition, uuid, args)
         super
@@ -57,6 +61,8 @@ module Taskinator
         end
       end
 
+      private
+
       def invoke(&block)
         block.call
       end

data/spec/taskinator/definition_spec.rb

@@ -156,7 +156,7 @@ describe Taskinator::Definition do
       # if an error is raised, then the context was incorrect
       expect {
         subject.create_process
-      }.to_not raise_error(StandardError)
+      }.not_to raise_error
     end
 
     context "is instrumented" do

data/spec/taskinator/queues/active_job_spec.rb

@@ -35,27 +35,6 @@ describe Taskinator::Queues::ActiveJobAdapter, :active_job do
     end
   end
 
-  describe "ProcessWorker" do
-    it "enqueues processes" do
-      worker = adapter::ProcessWorker
-      subject.enqueue_process(double('process', :uuid => uuid, :queue => nil))
-
-      expect(worker).to have_been_enqueued.with(uuid)
-    end
-
-    it "enqueues process to specified queue" do
-      worker = adapter::ProcessWorker
-      subject.enqueue_process(double('process', :uuid => uuid, :queue => :other))
-
-      expect(worker).to have_been_enqueued.with(uuid).on_queue(:other)
-    end
-
-    it "calls process worker" do
-      expect_any_instance_of(Taskinator::ProcessWorker).to receive(:perform)
-      adapter::ProcessWorker.new.perform(uuid)
-    end
-  end
-
   describe "TaskWorker" do
     it "enqueues tasks" do
       worker = adapter::TaskWorker

data/spec/taskinator/queues/delayed_job_spec.rb

@@ -30,24 +30,6 @@ describe Taskinator::Queues::DelayedJobAdapter, :delayed_job do
     end
   end
 
-  describe "ProcessWorker" do
-    it "enqueues processes" do
-      expect {
-        subject.enqueue_process(double('process', :uuid => uuid, :queue => nil))
-      }.to change(Delayed::Job.queue, :size).by(1)
-    end
-
-    it "enqueues process to specified queue" do
-      subject.enqueue_process(double('process', :uuid => uuid, :queue => :other))
-      expect(Delayed::Job.contains?(adapter::ProcessWorker, uuid, :other)).to be
-    end
-
-    it "calls process worker" do
-      expect_any_instance_of(Taskinator::ProcessWorker).to receive(:perform)
-      adapter::ProcessWorker.new(uuid).perform
-    end
-  end
-
   describe "TaskWorker" do
     it "enqueues tasks" do
       expect {

data/spec/taskinator/queues/resque_spec.rb

@@ -34,27 +34,6 @@ describe Taskinator::Queues::ResqueAdapter, :resque do
     end
   end
 
-  describe "ProcessWorker" do
-    it "enqueues processes" do
-      worker = adapter::ProcessWorker
-      subject.enqueue_process(double('process', :uuid => uuid, :queue => nil))
-
-      expect(worker).to have_queued(uuid)
-    end
-
-    it "enqueues process to specified queue" do
-      worker = adapter::ProcessWorker
-      subject.enqueue_process(double('process', :uuid => uuid, :queue => :other))
-
-      expect(worker).to have_queued(uuid).in(:other)
-    end
-
-    it "calls process worker" do
-      expect_any_instance_of(Taskinator::ProcessWorker).to receive(:perform)
-      adapter::ProcessWorker.perform(uuid)
-    end
-  end
-
   describe "TaskWorker" do
     it "enqueues tasks" do
       worker = adapter::TaskWorker

data/spec/taskinator/queues/sidekiq_spec.rb

@@ -33,25 +33,6 @@ describe Taskinator::Queues::SidekiqAdapter, :sidekiq do
     end
   end
 
-  describe "ProcessWorker" do
-    it "enqueues processes" do
-      worker = adapter::ProcessWorker
-      process = double('process', :uuid => uuid, :queue => nil)
-      subject.enqueue_process(process)
-      expect(worker).to have_enqueued_sidekiq_job(process.uuid)
-    end
-
-    it "enqueues process to specified queue" do
-      subject.enqueue_process(double('process', :uuid => uuid, :queue => :other))
-      expect(adapter::ProcessWorker).to be_processed_in_x(:other)
-    end
-
-    it "calls process worker" do
-      expect_any_instance_of(Taskinator::ProcessWorker).to receive(:perform)
-      adapter::ProcessWorker.new.perform(uuid)
-    end
-  end
-
   describe "TaskWorker" do
     it "enqueues tasks" do
       worker = adapter::TaskWorker

data/spec/taskinator/queues/test_queue_adapter_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Taskinator::Queues::TestQueueAdapter do
+
+  # sanity check for the test adapter
+
+  it_should_behave_like "a queue adapter", :test_queue, Taskinator::Queues::TestQueueAdapter
+
+end

data/spec/taskinator/test_flows_spec.rb

@@ -98,10 +98,14 @@ describe TestFlows do
         let(:definition) { TestFlows::EmptySequentialProcessTest }
         subject { definition.create_process }
 
+        it "contains 3 tasks" do
+          expect(subject.tasks.length).to eq(3)
+        end
+
         it "invokes each task" do
-          # this doesn't work...
-          # expect_any_instance_of(Taskinator::Executor).to receive(:do_task_x).exactly(3).times
-          # subject.start!
+          expect_any_instance_of(definition).to receive(:task_0)
+          expect_any_instance_of(definition).to receive(:task_1)
+          expect_any_instance_of(definition).to receive(:task_2)
 
           expect {
             subject.enqueue!
@@ -113,10 +117,14 @@ describe TestFlows do
         let(:definition) { TestFlows::EmptyConcurrentProcessTest }
         subject { definition.create_process }
 
+        it "contains 3 tasks" do
+          expect(subject.tasks.length).to eq(3)
+        end
+
         it "invokes each task" do
-          # this doesn't work...
-          # expect_any_instance_of(Taskinator::Executor).to receive(:do_task_x).exactly(3).times
-          # subject.start!
+          expect_any_instance_of(definition).to receive(:task_0)
+          expect_any_instance_of(definition).to receive(:task_1)
+          expect_any_instance_of(definition).to receive(:task_2)
 
           expect {
             subject.enqueue!
@@ -173,11 +181,11 @@ describe TestFlows do
     end
 
     describe "job" do
-
+      pending
     end
 
     describe "subprocess" do
-
+      pending
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskinator
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-17 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -161,7 +161,6 @@ files:
 - lib/taskinator/logger.rb
 - lib/taskinator/persistence.rb
 - lib/taskinator/process.rb
-- lib/taskinator/process_worker.rb
 - lib/taskinator/queues.rb
 - lib/taskinator/queues/active_job.rb
 - lib/taskinator/queues/delayed_job.rb
@@ -204,11 +203,11 @@ files:
 - spec/taskinator/instrumentation_spec.rb
 - spec/taskinator/persistence_spec.rb
 - spec/taskinator/process_spec.rb
-- spec/taskinator/process_worker_spec.rb
 - spec/taskinator/queues/active_job_spec.rb
 - spec/taskinator/queues/delayed_job_spec.rb
 - spec/taskinator/queues/resque_spec.rb
 - spec/taskinator/queues/sidekiq_spec.rb
+- spec/taskinator/queues/test_queue_adapter_spec.rb
 - spec/taskinator/queues_spec.rb
 - spec/taskinator/task_spec.rb
 - spec/taskinator/task_worker_spec.rb
@@ -271,11 +270,11 @@ test_files:
 - spec/taskinator/instrumentation_spec.rb
 - spec/taskinator/persistence_spec.rb
 - spec/taskinator/process_spec.rb
-- spec/taskinator/process_worker_spec.rb
 - spec/taskinator/queues/active_job_spec.rb
 - spec/taskinator/queues/delayed_job_spec.rb
 - spec/taskinator/queues/resque_spec.rb
 - spec/taskinator/queues/sidekiq_spec.rb
+- spec/taskinator/queues/test_queue_adapter_spec.rb
 - spec/taskinator/queues_spec.rb
 - spec/taskinator/task_spec.rb
 - spec/taskinator/task_worker_spec.rb

data/lib/taskinator/process_worker.rb

@@ -1,13 +0,0 @@
-module Taskinator
-  class ProcessWorker
-    attr_reader :uuid
-
-    def initialize(uuid)
-      @uuid = uuid
-    end
-
-    def perform
-      # TODO: build the process, and enqueue it. after it completes, report back to the containing process
-    end
-  end
-end

data/spec/taskinator/process_worker_spec.rb

@@ -1,5 +0,0 @@
-require 'spec_helper'
-
-describe Taskinator::ProcessWorker do
-  pending
-end