taskinator 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffc2664d7ab51f381c4de1671eb127df7ecbab5629e2941fc7015bc11c70e2d0
-  data.tar.gz: cb5f4a17be38e6f62b7ea3901b53af02e55216827c4f95518ba4fefcfb8e0d25
+  metadata.gz: 231c6c9f1bdcf8bb1a7fb38c0ebd0c893f61f49051d94ace5714233a207ad651
+  data.tar.gz: 9c66bf91f8420f3fff69487e095a5c36986409f7249224f03ba0b53fdd427190
 SHA512:
-  metadata.gz: 64e1c2b5e62469d1d6328dcb3bf6b8738171e5d5b6335694092107bac16a3c7dd464dec35c8fd482e8b41e5bbe6369a6c3db9ade1b47b24c9a814aba8af56ed2
-  data.tar.gz: cb91edc3acfff89281b35983f907dfdb2eb11d1b6760f9da334465d9f4e548b3069533bdd0d5b262368ab8b955002536830da8031929cec15655ec2e24d2e1d1
+  metadata.gz: 0e322ccc3214ed171bd75b14b4ebaa7e51c1e1ba33b3f7f292c707059f166566a8b8c08235442d26922b0cd8a8c2affa320af03d069d33b0fce4d9ffe7485e95
+  data.tar.gz: d16a3220d1be357c77e7a47d3e2c426a99549c3d350979f534a176ec3919444551956d4d41e6b7389e245fe39c1286d7ef60e6f07b1155f3aeae7e9cdce1398b

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.1
+ruby-2.7.2

data/.travis.yml

@@ -6,10 +6,10 @@ services:
   - redis-server
 
 rvm:
-  - 2.2.10
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.2
 
 script: 'bundle exec rake spec'
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    taskinator (0.3.15)
+    taskinator (0.3.16)
       builder (>= 3.2.2)
       connection_pool (>= 2.2.0)
       globalid (~> 0.3)
@@ -10,54 +10,57 @@ PATH
       redis-namespace (>= 1.5.2)
       redis-semaphore (>= 0.2.4)
       statsd-ruby (~> 1.4.0)
+      thwait (~> 0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.1)
+    activesupport (5.2.4.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    builder (3.2.3)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.3)
-    connection_pool (2.2.2)
-    coveralls (0.8.22)
+    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.16.1)
       term-ansicolor (~> 1.3)
-      thor (~> 0.19.4)
+      thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    delayed_job (4.1.5)
-      activesupport (>= 3.0, < 5.3)
-    diff-lcs (1.3)
-    docile (1.3.1)
+    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.1)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.1.1)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    method_source (0.9.2)
-    minitest (5.11.3)
+    json (2.5.1)
+    method_source (1.0.0)
+    minitest (5.14.3)
     mono_logger (1.1.0)
-    multi_json (1.13.1)
-    mustermann (1.0.3)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    rack (2.0.6)
-    rack-protection (2.0.4)
+    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 (12.3.1)
-    redis (4.0.3)
-    redis-namespace (1.6.0)
+    rake (13.0.3)
+    redis (4.2.5)
+    redis-namespace (1.8.1)
       redis (>= 3.0.4)
     redis-semaphore (0.3.1)
       redis
@@ -72,44 +75,49 @@ GEM
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
       rspec-mocks (>= 3.0.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    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.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-sidekiq (3.0.3)
+      rspec-support (~> 3.10.0)
+    rspec-sidekiq (3.1.0)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.8.0)
-    sidekiq (5.2.3)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
+    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.2)
-    sinatra (2.0.4)
+    sinatra (2.1.0)
       mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.4)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
       tilt (~> 2.0)
     statsd-ruby (1.4.0)
-    term-ansicolor (1.7.0)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.19.4)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tilt (2.0.8)
-    tins (1.20.2)
-    tzinfo (1.2.5)
+    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)
@@ -134,4 +142,4 @@ DEPENDENCIES
   taskinator!
 
 BUNDLED WITH
-   1.17.1
+   2.2.11

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.15"
+  VERSION = "0.3.16"
 end

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/taskinator.gemspec

@@ -29,4 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'builder'                     , '>= 3.2.2'
   spec.add_dependency 'globalid'                    , '~> 0.3'
   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.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         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.7.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A simple orchestration library for running complex processes or workflows