much-timeout 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: 2fa361b98af1eaae451ed91a28d1d9641777eab828716d4c10a3411170f0bc6de3dc8f4c3855b368a2e29badcb23f8082b4d4b237fa89af72c4660a585a80263
-  metadata.gz: 265aaee5763dc7fc6d5208ea42ceefb11dc8cfeb5f70173885c0bd0206ff41dcbe405d9c233b2d6948f72e21d6a1fb9506333852be349c81841db08a2a050afd
+  metadata.gz: 55949c8339e997def24be0b14f3319d93bb1679c887227c8b9f46a7b66c74e21e67181f090fe1b9535d19ffc26dc06387306a300260e05ca60b5af3b8a277bf4
+  data.tar.gz: 279f2401248030112cdcbb8fb4455970057e96b05f5d668b650c708ab889c759787103be4177e33ee0790e64317de66bd3701150be2b6ca8148bec7ba23074eb
 SHA1: 
-  data.tar.gz: 0bbfd0ebdc797ec310f8bc33f39e40a51973e4b5
-  metadata.gz: 3239b0fddda2d296afeab424878e399219bf5fa7
+  metadata.gz: d18a32435d845e9c073cda374377e8ad266eb822
+  data.tar.gz: a099d9630bd0639f17ce857faf3b87659c1f4876

data/README.md

@@ -17,7 +17,7 @@ MuchTimeout.timeout(5) do
 end
 ```
 
-MuchTimeout, in its basic form, is a replacement for Timeout.  The main difference is that `IO.select` on an internal pipe is the mechanism for detecting the timeout.  Another difference is that the block is executed in a separate thread while the select/monitoring occurs in the main thread.
+MuchTimeout, in its basic form, is a replacement for Timeout.  The main difference is that `IO.select` on an internal pipe is the mechanism for detecting the timeout.
 
 **Note**: like Timeout, **`Thread#raise` is used to interrupt the block**.  This technique is [widely](http://blog.headius.com/2008/02/ruby-threadraise-threadkill-timeoutrb.html) [considered](http://www.mikeperham.com/2015/05/08/timeout-rubys-most-dangerous-api/) to be [dangerous](http://jvns.ca/blog/2015/11/27/why-rubys-timeout-is-dangerous-and-thread-dot-raise-is-terrifying/).  Be aware and use responsibly.
 

data/lib/much-timeout.rb

@@ -19,20 +19,18 @@ module MuchTimeout
     reader, writer  = IO.pipe
 
     begin
-      block_thread ||= Thread.new do
-        begin
-          block.call
-        ensure
-          writer.write_nonblock(PIPE_SIGNAL) rescue false
+      main_thread = Thread.current
+      io_select_thread ||= Thread.new do
+        if !::IO.select([reader], nil, nil, seconds)
+          main_thread.raise exception_klass
         end
       end
-      if !!::IO.select([reader], nil, nil, seconds)
-        block_thread.join
-      else
-        block_thread.raise exception_klass
-        block_thread.join
+      begin
+        block.call
+      ensure
+        writer.write_nonblock(PIPE_SIGNAL) rescue false
+        io_select_thread.join
       end
-      block_thread.value
     ensure
       reader.close rescue false
       writer.close rescue false

data/lib/much-timeout/version.rb

@@ -1,3 +1,3 @@
 module MuchTimeout
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: much-timeout
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-06-07 00:00:00 Z
+date: 2016-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert