schmurfy-bacon 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea7c27ccb28ae6e7707322abba88d6fa1aca484
-  data.tar.gz: 8bf200c3679a9b723921c1bb559e39b9c7fa3cc6
+  metadata.gz: fdf1716e96ece289c24b2259f51862f8e0b0f847
+  data.tar.gz: 9def49fb3291dc30d43fd135e13ea4475f92c01b
 SHA512:
-  metadata.gz: b8439c232a0d8389bcb7bf4dc22dbe2cfb1cce26bb3434b09d508fcfaec219c9926390406827a23e766ebde4620bf2d5beb5af45018c4098747497abb6bba8cf
-  data.tar.gz: 7e1d88c1ca35cd09e289468444fc72615f1f9843cb662b99fcc50cd8093c05caeca3066a9613d601a31618bf7568638650a0ab60d5521b20a89a126780a6f638
+  metadata.gz: 203c99df1e7b83eff110d5dcfed5f607fbd7ff681f844b10de394b7c9fb9ed1d29c53a665500ef55d2e4c8272546e7ce7270d9a63fd7add7f01a92f351daced6
+  data.tar.gz: bc35ea931662f4076c35f8e74df08739a149875e86d50cc3fe146fe458f07c640ba020a3e79eccb72680303980f72c36a0d102afcf45f02193432be819515c5a

data/lib/bacon/ext/em_threads.rb

@@ -1,76 +1,22 @@
-
-require 'thread'
-require 'eventmachine'
-
-#
-# This module allows you to run your specs inside an eventmachine loop
-# check examples/em_spec.rb for usage.
-# 
-# Be aware that it does not work like the em-spec gem, no timeout error will
-# ever be raised.
-# 
 module Bacon
-  module EMSpec # :nodoc:
-    class << self
-      attr_accessor :context_thread
-    end
-    
-    def wakeup
-      # this should be enough but for some reason the reactor
-      # idles for 20 seconds on EM::stop before really exiting
-      # @waiting_thread.resume
-      
-      if @waiting_thread
-        EM::next_tick { @waiting_thread.wakeup }
-      end
-    end
-    
-    def wait(timeout = 0.1, &block)
-      @waiting_thread = Thread.current
-      EM::cancel_timer(@timeout)
-      @timeout = EM::add_timer(timeout, &method(:wakeup))
-      
-      sleep
-      
-      @waiting_thread = nil
-      
-      block.call if block
-    end
-    
-    def done
-      EM.cancel_timer(@timeout)
-      wakeup
-    end
-    
-    def new_thread(&block)
-      Thread.new(&block)
-    end
-    
+  module Threaded
+
     def run(*)
-      if EMSpec.context_thread == Thread.current
-        super
-      else
-        EM::run do
-          EM::error_handler do |err|
-            ::Bacon::store_error(err, "(EM Loop)")
-          end
-          
-          new_thread do
-            EMSpec.context_thread = Thread.current
-            begin
-              super
-              EM::stop_event_loop
-            ensure
-              EMSpec.context_thread = nil
-            end
+      if Thread.main == Thread.current
+        EM.next_tick do
+          Thread.new do
+            sleep(0.1)
+            super
+            EM::stop_event_loop()
           end
-          
+
         end
-        
+      else
+        super
       end
     end
 
   end
-  
-  Context.send(:include, EMSpec)
+
+  Context.send(:prepend, Threaded)
 end

data/lib/bacon/version.rb

@@ -1,3 +1,3 @@
 module Bacon
-  VERSION = "1.7.0"
+  VERSION = "1.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schmurfy-bacon
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Christian Neukirchen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor