schmurfy-bacon 1.3.2 → 1.3.3

data/examples/em_spec.rb

@@ -2,8 +2,8 @@ require 'rubygems'
 
 $LOAD_PATH.unshift << File.expand_path('../../lib/', __FILE__)
 
-require 'bacon/ext/em'
 require 'bacon'
+require 'bacon/ext/em'
 
 Bacon.summary_on_exit
 
@@ -14,10 +14,6 @@ def run_something_later(&block)
 end
 
 describe 'AsynchronousSpec' do  
-  # tell bacon we want to run inside
-  # the EventMachine reactor
-  with_eventmachine!
-  
   before do
     # Eventmachine is running, yeah !
     EM::reactor_running?.should == true
@@ -48,4 +44,13 @@ describe 'AsynchronousSpec' do
     wait(0.2){ v.should == 2 }
   end
   
+  # if done is called the test ends early
+  # but the block passed to wait is till called
+  should 'end early' do
+    v = 1
+    EM::add_timer(0.2){ v+= 1; done }
+    EM::add_timer(0.3){ v = 3 }
+    wait(1){ v.should == 2 }
+  end
+  
 end

data/examples/nested_contexts_spec.rb

@@ -9,7 +9,6 @@ Bacon.summary_on_exit
 
 
 describe 'Main context' do
-  with_eventmachine!
   
   before do
     # EM::reactor_running?.should == true

data/lib/bacon.rb

@@ -140,14 +140,15 @@ module Bacon
       end
     end
     
-    def describe(*args, &block)
-      context = Bacon::Context.new(args.join(' '), &block)
-      (parent_context = self).methods(false).each {|e|
-        class<<context; self end.send(:define_method, e) {|*args| parent_context.send(e, *args)}
-      }
-      @before.each { |b| context.before(&b) }
-      @after.each { |b| context.after(&b) }
-      context.run
+    def create_context(name, &block)
+      Bacon::Context.new(name, &block)
+    end
+    
+    def run
+      Counter[:context_depth] += 1
+      Bacon.handle_specification(name) { instance_eval(&block) }
+      Counter[:context_depth] -= 1
+      self
     end
   end
   
@@ -161,13 +162,6 @@ module Bacon
       @before, @after = [], []
       @block = block
     end
-    
-    def run
-      Counter[:context_depth] += 1
-      Bacon.handle_specification(name) { instance_eval(&block) }
-      Counter[:context_depth] -= 1
-      self
-    end
 
     def before(&block); @before << block; end
     def after(&block);  @after << block; end
@@ -184,6 +178,18 @@ module Bacon
       end
     end
     
+    def describe(*args, &block)
+      context = create_context(args.join(' '), &block)
+      
+      # define any user methods in the new context so
+      # that helpers defined in main describe can be used in nested contexts
+      (parent_context = self).methods(false).each {|e|
+        class<<context; self end.send(:define_method, e) {|*args| parent_context.send(e, *args)}
+      }
+      @before.each { |b| context.before(&b) }
+      @after.each { |b| context.after(&b) }
+      context.run
+    end
     
     def focus(spec_str)
       raise "focused test forbidden" unless Bacon::allow_focused_run?

data/lib/bacon/ext/em.rb

@@ -10,49 +10,40 @@ require 'eventmachine'
 # ever be raised.
 # 
 module Bacon
-  class Context
-    def with_eventmachine!
-      (class << self; self; end).send(:include, EMSpec)
-    end
-  end
-  
   module EMSpec # :nodoc:
 
     def wait(timeout = 0.1, &block)
-      waiting_fiber = Fiber.current
+      @waiting_fiber = Fiber.current
       EM::cancel_timer(@timeout)
-      @timeout = EM::add_timer(timeout){ waiting_fiber.resume }
+      @timeout = EM::add_timer(timeout){ @waiting_fiber.resume }
       Fiber.yield
       
+      @waiting_fiber = nil
+      
       block.call if block
     end
     
     def done
       EM.cancel_timer(@timeout)
-      EM.stop
-    end
-
-    def describe(*, &block)
-      super do
-        with_eventmachine!
-        block.call
-      end
+      @waiting_fiber.resume if @waiting_fiber
     end
-
-    def run_requirement(desc, spec)
-      raise "block required" unless block
-
-      @timeout_interval = nil
-
-      EM.run do
-        Fiber.new do
-          super
-          done
-        end.resume
+    
+    def run(*)
+      subcontext =  EM::reactor_running?
+      if subcontext
+        super
+      else
+        EM::run do
+          Fiber.new do
+            super
+            EM::stop_event_loop
+          end.resume
+        end
+        
       end
     end
 
   end
   
-  
+  Context.send(:include, EMSpec)
 end

data/lib/bacon/version.rb

@@ -1,3 +1,3 @@
 module Bacon
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schmurfy-bacon
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70215709703120 !ruby/object:Gem::Requirement
+  requirement: &70253621968160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70215709703120
+  version_requirements: *70253621968160
 description: ! 'Bacon is a small RSpec clone weighing less than 350 LoC but
 
   nevertheless providing all essential features.
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 414404718689880390
+      hash: 3307888883450251243
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 414404718689880390
+      hash: 3307888883450251243
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11