concurrently 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2433cf85e8e22dae4f8753c3f0bf8da68d0a307
-  data.tar.gz: 5fc75f82d8f23b989b9f73171cb11aa8dd7dc6e7
+  metadata.gz: e10c69de9f9db4d13d7411544b336709be235688
+  data.tar.gz: a519b852d6ac6d07689daf39bd893fe1594c76eb
 SHA512:
-  metadata.gz: 6a69bfe30abb26229e12195fc514c1a2766c0cf1531a5c72a4bf872ef358deaa5e28eae06eae537786f82a159a0071695913b93cc367989d30b90cc489b18879
-  data.tar.gz: 28990344bb12e54ca9318f7396753e2a929cdbf80a8942ce2c00a2742b4e82a003c4e7c3db5e1f0001658bcbb815fd821cd3b1fc0bdbd8b1df0fddd2c30155cc
+  metadata.gz: e81443aec073e777bb7bdb18a293383716d66028a884d773208205aae52a15f2af993ed8f427f78e4515d83b379b07ee287c3d5f1ac2f10c478267258aff2872
+  data.tar.gz: 87102e7ee79831c03975175f52527b78da04100d6ddaaca56e479b208f59d03a362ea5ddbf3df16f08d37bf41d5157978c222f1b3c1afbb3e920f3e3b6d7b3e2

data/guides/Troubleshooting.md

@@ -178,8 +178,8 @@ managing IOs (e.g. closing them).
 Every evaluation rescues the following errors: `NoMemoryError`, `ScriptError`,
 `SecurityError`, `StandardError` and `SystemStackError`. These are all errors
 that should not have an immediate influence on other evaluations or the
-application as a whole. They will not leak to the event loop and will not tear
-it down.
+application as a whole. They will be rescued and do not leak to the event loop
+and thus will not tear it down.
 
 All other errors happening during an evaluation *will* tear down the event
 loop. These error types are: `SignalException`, `SystemExit` and the general

data/lib/all/concurrently/evaluation.rb

@@ -35,7 +35,10 @@ module Concurrently
     # @private
     #
     # The fiber the evaluation runs inside.
-    attr_reader :fiber
+    def __resume__(result)
+      @scheduled = false
+      @fiber.resume result
+    end
 
     # @!attribute [r] waiting?
     #
@@ -73,7 +76,7 @@ module Concurrently
     # because of a manual call of {Kernel#await_resume!}.
     #
     # @return [:resumed]
-    # @raise [Error] if the evaluation is not waiting
+    # @raise [Error] if the evaluation is already scheduled to resume
     #
     # @example
     #   # Control flow is indicated by (N)
@@ -90,6 +93,9 @@ module Concurrently
     #   # (5)
     #   evaluation.await_result # => :result
     def resume!(result = nil)
+      raise Error, "already scheduled to resume" if @scheduled
+      @scheduled = true
+
       run_queue = Concurrently::EventLoop.current.run_queue
 
       # Cancel running the fiber if it has already been scheduled to run; but

data/lib/all/concurrently/event_loop/run_queue.rb

@@ -96,7 +96,7 @@ module Concurrently
         evaluation.resume result
       when Proc::Evaluation
         @current_evaluation = evaluation
-        evaluation.fiber.resume result
+        evaluation.__resume__ result
       when Evaluation
         @current_evaluation = nil
         Fiber.yield result

data/lib/all/concurrently/proc/evaluation.rb

@@ -235,12 +235,22 @@ module Concurrently
       @concluded = true
 
       if Fiber.current != @fiber
-        # Cancel fiber by resuming it with itself as argument
-        @fiber.resume @fiber
+        # Cancel its fiber by resuming it with itself as argument
+        @fiber.resume Cancelled
       end
 
       @awaiting_result.each{ |evaluation, override| evaluation.resume! (override or result) }
       :concluded
     end
+
+    # Schedules the evaluation to be resumed
+    #
+    # For details see: {Concurrently::Evaluation#resume!}
+    #
+    # @raise [Evaluation::Error] if the evaluation is already concluded
+    def resume!(*)
+      raise Evaluation::Error, "already concluded to #{@result.inspect}" if @concluded
+      super
+    end
   end
 end

data/lib/all/concurrently/proc/fiber.rb

@@ -20,7 +20,7 @@ module Concurrently
         while true
           evaluation_bucket ||= EMPTY_EVALUATION_BUCKET
 
-          result = if proc == self
+          result = if proc.equal? Proc::Evaluation::Cancelled
             # If we are given this very fiber when starting itself it means it
             # has been evaluated right before its start. In this case just
             # yield back to the evaluating fiber.
@@ -31,9 +31,9 @@ module Concurrently
 
             :cancelled
           elsif not Proc === proc
-            # This should never happen. If it does it means something with code
-            # of this library is not right.
-            raise Concurrently::Error, "concurrent proc not started properly."
+            raise Concurrently::Error, "Concurrent evaluation not started " <<
+              "properly. This should never happen and if it does it means " <<
+              "there is a bug in Concurrently."
           else
             begin
               result = proc.__proc_call__ *args

data/lib/all/concurrently/version.rb

@@ -4,5 +4,5 @@
 # The namespace this library lives in
 module Concurrently
   # The version
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/all/kernel.rb

@@ -131,13 +131,11 @@ module Kernel
     end
     evaluation.instance_variable_set :@waiting, false
 
-    # If result is this very evaluation it means this evaluation has been evaluated
-    # prematurely.
-    if evaluation.fiber == result
+    if Concurrently::Proc::Evaluation::Cancelled.equal? result
       run_queue.cancel evaluation # in case the evaluation has already been scheduled to resume
       raise Concurrently::Proc::Evaluation::Cancelled, ''
-    elsif Concurrently::Evaluation::TimeoutError == result
-      raise result, "evaluation timed out after #{seconds} second(s)"
+    elsif Concurrently::Evaluation::TimeoutError.equal? result
+      raise Concurrently::Evaluation::TimeoutError, "evaluation timed out after #{seconds} second(s)"
     else
       result
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: concurrently
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nio4r