schmurfy-bacon 1.3.4 → 1.3.5

data/lib/bacon/ext/em.rb

@@ -11,11 +11,25 @@ require 'eventmachine'
 # 
 module Bacon
   module EMSpec # :nodoc:
-
+    class << self
+      attr_accessor :context_fiber
+    end
+    
+    def wakeup
+      # this should be enough but for some reason the reactor
+      # idles for 20 seconds on EM::stop before really exiting
+      # @waiting_fiber.resume
+      
+      if @waiting_fiber
+        EM::next_tick { @waiting_fiber.resume }
+      end
+    end
+    
     def wait(timeout = 0.1, &block)
       @waiting_fiber = Fiber.current
       EM::cancel_timer(@timeout)
-      @timeout = EM::add_timer(timeout){ @waiting_fiber.resume }
+      EM::add_timer(timeout, &method(:wakeup))
+      
       Fiber.yield
       
       @waiting_fiber = nil
@@ -25,19 +39,25 @@ module Bacon
     
     def done
       EM.cancel_timer(@timeout)
-      @waiting_fiber.resume if @waiting_fiber
+      wakeup
     end
     
     def run(*)
-      subcontext =  EM::reactor_running?
-      if subcontext
+      if EMSpec.context_fiber == Fiber.current
         super
       else
         EM::run do
-          Fiber.new do
-            super
-            EM::stop_event_loop
-          end.resume
+          
+          EMSpec.context_fiber = Fiber.new do
+            begin
+              super
+              EM::stop_event_loop
+            ensure
+              EMSpec.context_fiber = nil
+            end
+          end
+          
+          EMSpec.context_fiber.resume
         end
         
       end

data/lib/bacon/version.rb

@@ -1,3 +1,3 @@
 module Bacon
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/lib/output/better_output.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 require 'term/ansicolor'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schmurfy-bacon
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70328114246540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70328114246540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Bacon is a small RSpec clone weighing less than 350 LoC but
 
   nevertheless providing all essential features.
@@ -77,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3752377546693975737
+      hash: 2049935721437851805
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,10 +91,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3752377546693975737
+      hash: 2049935721437851805
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: a small RSpec clone