taskinator 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 683a1ffedb432057d353d7ebbc31dff766bce83c
-  data.tar.gz: 92c78c8a6e2c87769269147557c9c2cb13be52fa
+  metadata.gz: 2f06333f9729441692c47b0eecc144080b2711ff
+  data.tar.gz: 4b6db6e7787af743783a45dea8070813d9d2df9e
 SHA512:
-  metadata.gz: d9449a313b53581d06109e16d6f1a268a5f786848fc4d725e0852b773dbe99b1a68898a88c0d077bfb48590b976dbc4ca821e9207f20b50343f924493c35d9aa
-  data.tar.gz: 5c621a66e20dfef0f7800482ea5dd308c7470393537022791d3398a4f12c9350ca40a89267de82a149adcaf5c8561ae8b6aa732826ab85843e0f330cb701396f
+  metadata.gz: 4d352409fcbfce51f8591779c291cee6a2fcecd2513a33d07657c8e85045654af4af639908704e3e9f7fda3c72859781bf36d96c7e4dfdbb48decd3e2a38e161
+  data.tar.gz: c849ec329437762c590e2858c794729cf08264343907692ba564a9a7cd5858da7109452c88bb9777299a36726008feea3dfb4201706913be011ad4996c7e0621

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+v0.3.1 - 16 Sep 2015
+---
+Added redis-semaphore gem, for fix to concurrent processes completion logic.
+
 v0.3.0 - 28 Aug 2015
 ---
 Added created_at and updated_at to process and task as attributes.

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/mperham/sidekiq.git
-  revision: b0cdd4cc868e7564b78ee34965067e025ec41689
+  revision: 50fc8ee7c3f7c5e4049db598c0e14465a67a877c
   specs:
     sidekiq (3.5.0)
       celluloid (~> 0.17.0)
@@ -12,16 +12,17 @@ GIT
 PATH
   remote: .
   specs:
-    taskinator (0.3.0)
+    taskinator (0.3.1)
       connection_pool (>= 2.2.0)
       json (>= 1.8.2)
       redis (>= 3.2.1)
       redis-namespace (>= 1.5.2)
+      redis-semaphore (>= 0.2.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.3)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -29,7 +30,7 @@ GEM
       tzinfo (~> 1.1)
     byebug (5.0.0)
       columnize (= 0.9.0)
-    celluloid (0.17.1.1)
+    celluloid (0.17.1.2)
       bundler
       celluloid-essentials
       celluloid-extras
@@ -39,37 +40,37 @@ GEM
       dotenv
       nenv
       rspec-logsplit (>= 0.1.2)
-      timers (~> 4.0.0)
-    celluloid-essentials (0.20.2)
+      timers (>= 4.1.1)
+    celluloid-essentials (0.20.2.1)
       bundler
       dotenv
       nenv
       rspec-logsplit (>= 0.1.2)
-      timers (~> 4.0.0)
-    celluloid-extras (0.20.0)
+      timers (>= 4.1.1)
+    celluloid-extras (0.20.1)
       bundler
       dotenv
       nenv
       rspec-logsplit (>= 0.1.2)
-      timers (~> 4.0.0)
-    celluloid-fsm (0.20.0)
+      timers (>= 4.1.1)
+    celluloid-fsm (0.20.1)
       bundler
       dotenv
       nenv
       rspec-logsplit (>= 0.1.2)
-      timers (~> 4.0.0)
-    celluloid-pool (0.20.0)
+      timers (>= 4.1.1)
+    celluloid-pool (0.20.1)
       bundler
       dotenv
       nenv
       rspec-logsplit (>= 0.1.2)
-      timers (~> 4.0.0)
-    celluloid-supervision (0.20.1)
+      timers (>= 4.1.1)
+    celluloid-supervision (0.20.1.1)
       bundler
       dotenv
       nenv
       rspec-logsplit (>= 0.1.2)
-      timers (~> 4.0.0)
+      timers (>= 4.1.1)
     coderay (1.1.0)
     columnize (0.9.0)
     connection_pool (2.2.0)
@@ -86,13 +87,13 @@ GEM
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.0.2)
-    hitimes (1.2.2)
+    hitimes (1.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
     method_source (0.8.2)
-    mime-types (2.6.1)
+    mime-types (2.6.2)
     minitest (5.8.0)
     mono_logger (1.1.0)
     multi_json (1.11.2)
@@ -112,6 +113,8 @@ GEM
     redis (3.2.1)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
+    redis-semaphore (0.2.4)
+      redis
     resque (1.25.2)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
@@ -159,7 +162,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
-    timers (4.0.1)
+    timers (4.1.1)
       hitimes
     tins (1.6.0)
     tzinfo (1.2.2)

data/lib/taskinator/process.rb

@@ -222,6 +222,7 @@ module Taskinator
         end
       end
 
+      # this method only called in-process (usually from the console)
       def start
         if tasks.empty?
           complete! # weren't any tasks to start with
@@ -247,7 +248,17 @@ module Taskinator
       def task_completed(task)
         # when complete on first, then don't bother with subsequent tasks completing
         return if completed? || failed?
-        complete!
+
+        if tasks_completed?
+          # prevent re-entrance so that two tasks completing
+          # simultaneously can't complete the process twice,
+          # which enqueues/starts the same subsequent task
+          Taskinator.redis_mutex(uuid) do
+            # double check, since the status may have
+            # changed while waiting in the mutex
+            complete! if tasks_completed?
+          end
+        end
       end
 
       def tasks_completed?

data/lib/taskinator/version.rb

@@ -1,3 +1,3 @@
 module Taskinator
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/taskinator/workflow.rb

@@ -2,7 +2,8 @@ module Taskinator
   module Workflow
 
     def current_state
-      @current_state ||= load_workflow_state
+      # NB: don't memoize this value (i.e. re-read it each time)
+      @current_state = load_workflow_state
     end
 
     def current_state=(new_state)

data/lib/taskinator.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'yaml'
 require 'securerandom'
+require 'redis-semaphore'
 
 require 'taskinator/version'
 
@@ -62,6 +63,13 @@ module Taskinator
       redis_pool.with(&block)
     end
 
+    def redis_mutex(lockid, options={}, &block)
+      raise ArgumentError, "requires a block" unless block_given?
+      redis do |r|
+        Redis::Semaphore.new(lockid, {:redis => r}.merge(options)).lock(&block)
+      end
+    end
+
     def redis_pool
       @redis ||= Taskinator::RedisConnection.create
     end

data/spec/taskinator/process_spec.rb

@@ -344,7 +344,9 @@ describe Taskinator::Process do
 
   describe Taskinator::Process::Concurrent do
 
-    subject { Taskinator::Process.define_concurrent_process_for(definition) }
+    let(:complete_on) { Taskinator::CompleteOn::Default }
+
+    subject { Taskinator::Process.define_concurrent_process_for(definition, complete_on) }
 
     it_should_behave_like "a process", Taskinator::Process::Concurrent do
 
@@ -414,12 +416,33 @@ describe Taskinator::Process do
     end
 
     describe "#task_completed" do
-      it "completes when tasks complete" do
-        tasks.each {|t| subject.tasks << t }
+      it "completes when tasks complete (CompleteOn::First)" do
+        allow_any_instance_of(Taskinator::Task).to receive(:completed?) { true }
 
-        expect(subject).to receive(:complete!)
+        process = Taskinator::Process.define_concurrent_process_for(definition, Taskinator::CompleteOn::First)
+        tasks.each {|t| process.tasks << t }
+
+        expect(process).to receive(:complete!).and_call_original
+
+        process.task_completed(tasks.first)
+
+        # remaining tasks should do nothing...
+        tasks.each do |task|
+          process.task_completed(task)
+        end
+      end
+
+      it "completes when tasks complete (CompleteOn::Last)" do
+        allow_any_instance_of(Taskinator::Task).to receive(:completed?) { true }
 
-        subject.task_completed(tasks.first)
+        process = Taskinator::Process.define_concurrent_process_for(definition, Taskinator::CompleteOn::Last)
+        tasks.each {|t| process.tasks << t }
+
+        expect(process).to receive(:complete!).and_call_original
+
+        tasks.each do |task|
+          process.task_completed(task)
+        end
       end
     end
 

data/taskinator.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   # core
   spec.add_dependency 'redis'                       , '>= 3.2.1'
   spec.add_dependency 'redis-namespace'             , '>= 1.5.2'
+  spec.add_dependency 'redis-semaphore'             , '>= 0.2.4'
   spec.add_dependency 'connection_pool'             , '>= 2.2.0'
   spec.add_dependency 'json'                        , '>= 1.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskinator
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Chris Stefano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: redis-semaphore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: connection_pool
   requirement: !ruby/object:Gem::Requirement