taskinator 0.3.11 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e57a5add32ebc7ffc6af22bbe9768db6c89f896f
-  data.tar.gz: 434f7323883114425d9f24351f503557a2cc72c2
+SHA256:
+  metadata.gz: 231c6c9f1bdcf8bb1a7fb38c0ebd0c893f61f49051d94ace5714233a207ad651
+  data.tar.gz: 9c66bf91f8420f3fff69487e095a5c36986409f7249224f03ba0b53fdd427190
 SHA512:
-  metadata.gz: 917159bb5af8a31a8ea8ef8dc76b2cdb1a0c78336fc163fd38af2b63e327692550e3eecf92275bdc5f3fe24f7e17ab93d053809bb3a23b99ed69b1d9b01d9938
-  data.tar.gz: 0ff149a53cb1952b160e9cf3c4d3eb196da080c2dd0f63112a63c0511cec01258f5d47a548326ddd03cbeda5cf8fd056fb85c54d57677e2a0a41aba363d30eec
+  metadata.gz: 0e322ccc3214ed171bd75b14b4ebaa7e51c1e1ba33b3f7f292c707059f166566a8b8c08235442d26922b0cd8a8c2affa320af03d069d33b0fce4d9ffe7485e95
+  data.tar.gz: d16a3220d1be357c77e7a47d3e2c426a99549c3d350979f534a176ec3919444551956d4d41e6b7389e245fe39c1286d7ef60e6f07b1155f3aeae7e9cdce1398b

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.1
+ruby-2.7.2

data/.travis.yml

@@ -6,11 +6,10 @@ services:
   - redis-server
 
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.6
-  - 2.2.0
-  - 2.2.2
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
 
 script: 'bundle exec rake spec'
 

data/Gemfile

@@ -15,10 +15,10 @@ gem 'resque_spec'     , '>= 0.16.0'
 # other
 gem 'bundler'         , '>= 1.6.0'
 gem 'rake'            , '>= 10.3.0'
-gem 'activesupport'   , '~> 4.2.0'
+gem 'activesupport'   , '~> 5.2.0'
 gem 'rspec'
-gem 'coveralls'       , '>= 0.7.0'
+gem 'coveralls'       , '>= 0.8.22'
 gem 'pry'             , '>= 0.9.0'
 gem 'pry-byebug'      , '>= 1.3.0'
 
-gem 'fakeredis'       , '~> 0.6.0'
+gem 'fakeredis'       , '~> 0.7.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    taskinator (0.3.11)
+    taskinator (0.3.16)
       builder (>= 3.2.2)
       connection_pool (>= 2.2.0)
       globalid (~> 0.3)
@@ -9,108 +9,115 @@ PATH
       redis (>= 3.2.1)
       redis-namespace (>= 1.5.2)
       redis-semaphore (>= 0.2.4)
-      statsd-ruby (~> 1.2.0)
+      statsd-ruby (~> 1.4.0)
+      thwait (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+    activesupport (5.2.4.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    builder (3.2.2)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.2)
-    connection_pool (2.2.0)
-    coveralls (0.8.15)
+    builder (3.2.4)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    connection_pool (2.2.3)
+    coveralls (0.8.23)
       json (>= 1.8, < 3)
-      simplecov (~> 0.12.0)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.1)
-      tins (>= 1.6.0, < 2)
-    delayed_job (4.1.2)
-      activesupport (>= 3.0, < 5.1)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    fakeredis (0.6.0)
-      redis (~> 3.2)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    method_source (0.8.2)
-    minitest (5.9.1)
+      thor (>= 0.19.4, < 2.0)
+      tins (~> 1.6)
+    delayed_job (4.1.9)
+      activesupport (>= 3.0, < 6.2)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    e2mmap (0.1.0)
+    fakeredis (0.7.0)
+      redis (>= 3.2, < 5.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    json (2.5.1)
+    method_source (1.0.0)
+    minitest (5.14.3)
     mono_logger (1.1.0)
-    multi_json (1.12.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.4.0)
-      byebug (~> 9.0)
-      pry (~> 0.10)
-    rack (1.6.4)
-    rack-protection (1.5.3)
+    multi_json (1.15.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
+      byebug (~> 11.0)
+      pry (~> 0.13.0)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
-    rake (11.3.0)
-    redis (3.3.1)
-    redis-namespace (1.5.2)
-      redis (~> 3.0, >= 3.0.4)
+    rake (13.0.3)
+    redis (4.2.5)
+    redis-namespace (1.8.1)
+      redis (>= 3.0.4)
     redis-semaphore (0.3.1)
       redis
-    resque (1.26.0)
+    resque (2.0.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
+      redis-namespace (~> 1.6)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque_spec (0.17.0)
-      resque (>= 1.19.0)
+    resque_spec (0.18.1)
+      resque (>= 1.26.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
       rspec-mocks (>= 3.0.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-sidekiq (2.2.0)
-      rspec (~> 3.0, >= 3.0.0)
+      rspec-support (~> 3.10.0)
+    rspec-sidekiq (3.1.0)
+      rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.5.0)
-    sidekiq (4.2.3)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
+    rspec-support (3.10.2)
+    ruby2_keywords (0.0.4)
+    sidekiq (6.1.3)
+      connection_pool (>= 2.2.2)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    statsd-ruby (1.2.1)
-    term-ansicolor (1.4.0)
+    simplecov-html (0.10.2)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    statsd-ruby (1.4.0)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    tins (1.12.0)
-    tzinfo (1.2.2)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    thwait (0.2.0)
+      e2mmap
+    tilt (2.0.10)
+    tins (1.28.0)
+      sync
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     vegas (0.1.11)
       rack (>= 1.0.0)
@@ -119,11 +126,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 4.2.0)
+  activesupport (~> 5.2.0)
   bundler (>= 1.6.0)
-  coveralls (>= 0.7.0)
+  coveralls (>= 0.8.22)
   delayed_job (~> 4.1.0)
-  fakeredis (~> 0.6.0)
+  fakeredis (~> 0.7.0)
   pry (>= 0.9.0)
   pry-byebug (>= 1.3.0)
   rake (>= 10.3.0)
@@ -135,4 +142,4 @@ DEPENDENCIES
   taskinator!
 
 BUNDLED WITH
-   1.13.4
+   2.2.11

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://secure.travis-ci.org/virtualstaticvoid/taskinator.png?branch=master)](http://travis-ci.org/virtualstaticvoid/taskinator)
 [![Code Climate](https://codeclimate.com/github/virtualstaticvoid/taskinator.png)](https://codeclimate.com/github/virtualstaticvoid/taskinator)
 [![Coverage Status](https://coveralls.io/repos/virtualstaticvoid/taskinator/badge.png)](https://coveralls.io/r/virtualstaticvoid/taskinator)
-[![Dependency Status](https://gemnasium.com/virtualstaticvoid/taskinator.svg)](https://gemnasium.com/virtualstaticvoid/taskinator)
 
 A simple orchestration library for running complex processes or workflows in Ruby. Processes are defined using a simple DSL, where the sequences and
 tasks are defined. Processes can then be queued for execution. Sequences can be synchronous or asynchronous, and the overall process can be monitored

data/lib/taskinator.rb

@@ -3,6 +3,7 @@ require 'yaml'
 require 'securerandom'
 require 'redis-semaphore'
 require 'benchmark'
+require 'delegate'
 
 require 'taskinator/version'
 

data/lib/taskinator/process.rb

@@ -199,6 +199,12 @@ module Taskinator
       end
 
       def task_completed(task)
+        # deincrement the count of pending sequential tasks
+        pending = deincr_pending_tasks
+
+        Taskinator.statsd_client.count("taskinator.#{definition.name.underscore.parameterize}.pending", pending)
+        Taskinator.logger.info("Completed task for process '#{uuid}'. Pending is #{pending}.")
+
         next_task = task.next
         if next_task
           next_task.enqueue!
@@ -258,9 +264,6 @@ module Taskinator
       end
 
       def task_completed(task)
-        # skip if failed
-        return if failed?
-
         # deincrement the count of pending concurrent tasks
         pending = deincr_pending_tasks
 

data/lib/taskinator/version.rb

@@ -1,3 +1,3 @@
 module Taskinator
-  VERSION = "0.3.11"
+  VERSION = "0.3.16"
 end

data/spec/examples/queue_adapter_examples.rb

@@ -14,9 +14,9 @@ shared_examples_for "a queue adapter" do |adapter_name, adapter_type|
     it { expect(subject).to respond_to(:enqueue_create_process) }
 
     it "should enqueue a create process" do
-      expect {
+      expect(
         subject.enqueue_create_process(double('definition', :name => 'definition', :queue => nil), 'xx-xx-xx-xx', :foo => :bar)
-      }.to_not raise_error(StandardError)
+      ).to_not be_nil
     end
   end
 
@@ -24,9 +24,9 @@ shared_examples_for "a queue adapter" do |adapter_name, adapter_type|
     it { expect(subject).to respond_to(:enqueue_task) }
 
     it "should enqueue a task" do
-      expect {
+      expect(
         subject.enqueue_task(double('task', :uuid => 'xx-xx-xx-xx', :queue => nil))
-      }.to_not raise_error(StandardError)
+      ).to_not be_nil
     end
   end
 

data/spec/spec_helper.rb

@@ -60,10 +60,7 @@ RSpec.configure do |config|
   end
 
   config.before(:each, :redis => true) do
-    Taskinator.redis = { :namespace => 'taskinator:test' }
-    Taskinator.redis do |conn|
-      conn.flushdb
-    end
+    Taskinator.redis = { :namespace => "taskinator:test:#{SecureRandom.uuid}" }
   end
 
   config.before(:each, :sidekiq => true) do

data/spec/taskinator/process_spec.rb

@@ -288,6 +288,23 @@ describe Taskinator::Process do
         subject.task_completed(task1)
       end
 
+      it "deincrements the pending task count" do
+        tasks.each {|t| subject.tasks << t }
+        task1 = tasks[0]
+        task2 = tasks[1]
+
+        allow(task2).to receive(:enqueue!)
+
+        pending_count = tasks.count
+        allow(subject).to receive(:deincr_pending_tasks) { pending_count -= 1 }
+
+        subject.task_completed(task1)
+        expect(pending_count).to eq(tasks.count - 1)
+
+        subject.task_completed(task2)
+        expect(pending_count).to eq(tasks.count - 2)
+      end
+
       it "completes if no more tasks" do
         tasks.each {|t| subject.tasks << t }
         task2 = tasks[1]
@@ -296,6 +313,30 @@ describe Taskinator::Process do
 
         subject.task_completed(task2)
       end
+
+      it "completes if failed task gets retried" do
+        tasks.each {|t| subject.tasks << t }
+        task1 = tasks[0]
+        task2 = tasks[1]
+
+        allow(task2).to receive(:enqueue!)
+
+        expect(subject).to receive(:fail!).and_call_original
+        expect(subject).to receive(:complete!).and_call_original
+
+        subject.task_completed(task1)
+        expect(subject.completed?).to_not be
+        expect(subject.failed?).to_not be
+
+        subject.task_failed(task2, StandardError.new)
+        expect(subject.completed?).to_not be
+        expect(subject.failed?).to be
+
+        # "retry" the task
+        subject.task_completed(task2)
+        expect(subject.completed?).to be
+        expect(subject.failed?).to_not be
+      end
     end
 
     describe "#tasks_completed?" do
@@ -315,6 +356,28 @@ describe Taskinator::Process do
       end
     end
 
+    describe "#task_failed" do
+      it "fails when tasks fail" do
+        tasks.each {|t| subject.tasks << t }
+
+        error = StandardError.new
+
+        expect(subject).to receive(:fail!).with(error)
+
+        subject.task_failed(tasks.first, error)
+      end
+
+      it "doesn't deincement pending task count" do
+        tasks.each {|t| subject.tasks << t }
+
+        expect(subject).to_not receive(:deincr_pending_tasks)
+
+        error = StandardError.new
+
+        subject.task_failed(tasks.first, error)
+      end
+    end
+
     describe "#accept" do
       it { expect(subject).to be_a(Taskinator::Persistence) }
 
@@ -422,7 +485,8 @@ describe Taskinator::Process do
         process = Taskinator::Process.define_concurrent_process_for(definition, Taskinator::CompleteOn::First)
         tasks.each {|t| process.tasks << t }
 
-        allow(process).to receive(:deincr_pending_tasks) { tasks.count - 1 }
+        pending_count = tasks.count
+        allow(process).to receive(:deincr_pending_tasks) { pending_count -= 1 }
 
         expect(process).to receive(:complete!).once.and_call_original
 
@@ -450,6 +514,82 @@ describe Taskinator::Process do
           expect(process.completed?).to be(false) unless pending_count < 1
         end
       end
+
+      it "deincrements the pending task count" do
+        tasks.each {|t| subject.tasks << t }
+        task1 = tasks[0]
+        task2 = tasks[1]
+
+        pending_count = tasks.count
+        allow(subject).to receive(:deincr_pending_tasks) { pending_count -= 1 }
+
+        subject.task_completed(task1)
+        expect(pending_count).to eq(tasks.count - 1)
+
+        subject.task_completed(task2)
+        expect(pending_count).to eq(tasks.count - 2)
+      end
+
+      describe "completes if failed task gets retried" do
+        it "after first task succeeds" do
+          tasks.each {|t| subject.tasks << t }
+          task1 = tasks[0]
+          task2 = tasks[1]
+
+          pending_count = tasks.count
+          allow(subject).to receive(:deincr_pending_tasks) { pending_count -= 1 }
+          allow(task2).to receive(:enqueue!)
+
+          expect(subject).to receive(:fail!).and_call_original
+          expect(subject).to receive(:complete!).and_call_original
+
+          # first task succeeds
+          subject.task_completed(task1)
+          expect(pending_count).to eq(tasks.count - 1)
+
+          # second task fails
+          subject.task_failed(task2, StandardError.new)
+
+          expect(subject.failed?).to be
+          expect(pending_count).to eq(tasks.count - 1)
+
+          # "retry" the task
+          subject.task_completed(task2)
+
+          expect(pending_count).to eq(tasks.count - 2)
+          expect(subject.failed?).to_not be
+          expect(subject.completed?).to be
+        end
+
+        it "after first task fails" do
+          tasks.each {|t| subject.tasks << t }
+          task1 = tasks[0]
+          task2 = tasks[1]
+
+          pending_count = tasks.count
+          allow(subject).to receive(:deincr_pending_tasks) { pending_count -= 1 }
+          allow(task2).to receive(:enqueue!)
+
+          expect(subject).to receive(:fail!).and_call_original
+          expect(subject).to receive(:complete!).and_call_original
+
+          # first task fails
+          subject.task_failed(task2, StandardError.new)
+          expect(subject.failed?).to be
+          expect(pending_count).to eq(tasks.count)
+
+          # second task succeeds
+          subject.task_completed(task1)
+          expect(pending_count).to eq(tasks.count - 1)
+
+          # "retry" the task
+          subject.task_completed(task2)
+
+          expect(pending_count).to eq(tasks.count - 2)
+          expect(subject.failed?).to_not be
+          expect(subject.completed?).to be
+        end
+      end
     end
 
     describe "#task_failed" do
@@ -462,6 +602,16 @@ describe Taskinator::Process do
 
         subject.task_failed(tasks.first, error)
       end
+
+      it "doesn't deincement pending task count" do
+        tasks.each {|t| subject.tasks << t }
+
+        expect(subject).to_not receive(:deincr_pending_tasks)
+
+        error = StandardError.new
+
+        subject.task_failed(tasks.first, error)
+      end
     end
 
     describe "#tasks_completed?" do

data/spec/taskinator/queues/sidekiq_spec.rb

@@ -18,7 +18,7 @@ describe Taskinator::Queues::SidekiqAdapter, :sidekiq do
       worker = adapter::CreateProcessWorker
       definition = MockDefinition.create
       subject.enqueue_create_process(definition, uuid, :foo => :bar)
-      expect(worker).to have_enqueued_job(definition.name, uuid, args)
+      expect(worker).to have_enqueued_sidekiq_job(definition.name, uuid, args)
     end
 
     it "enqueues to specified queue" do
@@ -38,7 +38,7 @@ describe Taskinator::Queues::SidekiqAdapter, :sidekiq do
       worker = adapter::ProcessWorker
       process = double('process', :uuid => uuid, :queue => nil)
       subject.enqueue_process(process)
-      expect(worker).to have_enqueued_job(process.uuid)
+      expect(worker).to have_enqueued_sidekiq_job(process.uuid)
     end
 
     it "enqueues process to specified queue" do
@@ -57,7 +57,7 @@ describe Taskinator::Queues::SidekiqAdapter, :sidekiq do
       worker = adapter::TaskWorker
       task = double('task', :uuid => uuid, :queue => nil)
       subject.enqueue_task(task)
-      expect(worker).to have_enqueued_job(task.uuid)
+      expect(worker).to have_enqueued_sidekiq_job(task.uuid)
     end
 
     it "enqueues task to specified queue" do

data/taskinator.gemspec

@@ -28,5 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'                        , '>= 1.8.2'
   spec.add_dependency 'builder'                     , '>= 3.2.2'
   spec.add_dependency 'globalid'                    , '~> 0.3'
-  spec.add_dependency 'statsd-ruby'                 , '~> 1.2.0'
+  spec.add_dependency 'statsd-ruby'                 , '~> 1.4.0'
+  spec.add_dependency 'thwait'                      , '~> 0.2'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskinator
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.16
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -114,14 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: thwait
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Simple process orchestration
 email:
 - virtualstaticvoid@gmail.com
@@ -232,8 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A simple orchestration library for running complex processes or workflows