pwork 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 249a3ee4b5ad1dd558bcdae10f0309404ec9841693c1f22714904cc8c70f43fb
-  data.tar.gz: 260de7aa9d02fad3f92faf0b00c70bb61689e8a03db64a9bac491c6566b900b3
+  metadata.gz: 5bddce5bdc79b8eb693f8a9ce38dfb2e0e81dbb4fe60b3f0b3a8d92cd72138b9
+  data.tar.gz: c3de3dcc22eb731e4686ae3ee402747653e8c4f6e6e1c4a758abae4e1f705464
 SHA512:
-  metadata.gz: 9da793781dfdfa26129d40240783b5c0b7a923ac6ee42297c9632e02308ad5fa5fee4fecb0b5a8ffc887d5df9f76dafe72739cf6ca4eacdae2637af27930024d
-  data.tar.gz: 0833eacb1192ca4fce94848b952aa151f0c92767e077c85573f15c4acc544133c974c6522e8900b82d85c94be170115e9e6dc5e062b8c888147b4016be10fa78
+  metadata.gz: be9d97bb3d642aac3f4cc8991f319b68056b21b61ffd81f761f1808af1696b35c9e91b13d8fe17d2d5d04739e25370dfd235ba776f23e79b629ba5f3143960fc
+  data.tar.gz: b51e7f88bd67d1c3827e084c4377a58be95579c89c6320ade0b0f0f7f545aadad8e2256b31524861c6612aa9d0d93b871e845f3abafb1b8ddc6890b94fe4801d

data/lib/pwork/async.rb

@@ -4,14 +4,12 @@ require_relative 'async/manager'
 
 module PWork
   module Async
-    def async(options = nil, &block)
+    def async(options = {}, &block)
       if block_given?
+        options[:caller] = self
         PWork::Async.add_task(options, &block)
       else
-        raise PWork::Async::Exceptions::InvalidOptionsError.new(
-          'Unknown async option.'
-        ) unless options == :wait
-        PWork::Async.wait_for_tasks
+        PWork::Async.wait_for_tasks({ caller: self, command: options })
       end
     end
 
@@ -22,9 +20,9 @@ module PWork
     def self.add_task(options, &block)
       manager.start unless manager.running
 
-      options = {} if options == nil
       task = PWork::Async::Task.new.tap do |e|
         e.block = block
+        e.caller = options[:caller]
       end
 
       unless options[:wait] == false
@@ -40,11 +38,20 @@ module PWork
       Thread.current[:pwork_async_tasks] ||= []
     end
 
-    def self.wait_for_tasks
-      until tasks.detect { |t| t.state == :pending || t.state == :active }.nil?
+    def self.wait_for_tasks(options)
+      case options[:command]
+        when :wait
+          task_list = tasks
+        when :wait_local
+          task_list = tasks.select { |t| t.caller == options[:caller] }
+      end
+
+      until task_list.detect { |t| t.state == :pending || t.state == :active }.nil?
         sleep(async_wait_sleep_iteration)
       end
+
       handle_errors
+
       ensure
         Thread.current[:pwork_async_tasks] = []
     end
@@ -54,7 +61,9 @@ module PWork
       tasks.select { |t| t.state == :error }.each do |t|
         error_messages << "Error: #{t.error.message}, #{t.error.backtrace}"
       end
-      raise PWork::Async::Exceptions::TaskError.new("1 or more async errors occurred. #{error_messages.join(' | ')}") if error_messages.length > 0
+      raise PWork::Async::Exceptions::TaskError.new(
+        "1 or more async errors occurred. #{error_messages.join(' | ')}"
+      ) if error_messages.length > 0
       true
     end
 

data/lib/pwork/async/task.rb

@@ -7,6 +7,7 @@ module PWork
       attr_accessor :thread_local_storage
       attr_accessor :error
       attr_accessor :block
+      attr_accessor :caller
       def initialize
         self.id = SecureRandom.uuid
         self.state = :pending

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwork
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - vaughanbrittonsage