eetee 0.0.1 → 0.0.2

data/Gemfile

@@ -11,4 +11,6 @@ group(:test) do
   gem 'guard'
   gem 'rb-fsevent'
   gem 'growl'
+  
+  gem 'eventmachine',    '~> 1.0.0'
 end

data/README.md

@@ -77,7 +77,7 @@ The guard is included inside the gem, just look at the Guardfile for the gem for
 Allow mocha expectations to be considered as E.T. expectations.
 
 ## rack
-Boilet plate around rack-test to test rack applications.
+abstraction around rack-test to test rack applications.
 
 ## time
 Some time helpers:

data/examples/eventmachine/em.rb

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'eetee'
+require 'eetee/ext/em'
+
+describe 'context' do
+  before do
+    @fib = Fiber.current
+  end
+  
+  should 'run in a fiber inside EventMachine' do
+    @fib.should == Fiber.current
+    EM.reactor_running?.should == true
+  end
+  
+  describe 'nested context' do
+    should 'run in a fiber inside EventMachine' do
+      @fib.should == Fiber.current
+      EM.reactor_running?.should == true
+    end
+  end
+end

data/lib/eetee/assertion_wrapper.rb

@@ -24,8 +24,8 @@ module EEtee
       end
       
       invert_helper(
-        "expected to raise #{error_class}, got #{err.class}",
-        "expected not to raise #{error_class}"
+        "expected to raise #{error_class}, got #{err.class} (#{err.message})",
+        "expected not to raise #{error_class} (#{err.message})"
       ) do
         err.class.should == error_class
       end
@@ -60,7 +60,8 @@ module EEtee
     end
     
     def method_missing(name, *args, &block)
-      ::EEtee.current_test.reporter.increment_assertions()
+      ::EEtee.current_reporter.increment_assertions()
+      
       ret = @object.__send__(name, *args, &block)
       
       if !!ret == !!@invert

data/lib/eetee/context.rb

@@ -2,7 +2,8 @@ module EEtee
   
   module SharedContextMethods
     def before(&block)
-      instance_eval(&block)
+      @before ||= []
+      @before << block
     end
     
     def describe(description, &block)
@@ -22,6 +23,7 @@ module EEtee
         
     def it(label, opts = {}, &block)
       if !@_focus_mode || opts[:focus]
+        (@before || []).each{|b| instance_eval(&b) }
         Test.new(label, @_reporter, &block)
       end
     end
@@ -51,7 +53,16 @@ module EEtee
     end
     
     def run(&block)
-      instance_eval(&block)
+      run = ->{
+        EEtee.current_reporter = @_reporter
+        instance_eval(&block)
+      }
+      
+      if defined? super
+        super(&run)
+      else
+        run.call()
+      end
     end
     
     def run_shared(name, *args)

data/lib/eetee/ext/em.rb

@@ -0,0 +1,67 @@
+
+require 'fiber'
+
+gem 'eventmachine'
+require 'eventmachine'
+
+module EEtee::EMSpec
+  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, &method(:wakeup))
+    
+    Fiber.yield
+    
+    @waiting_fiber = nil
+    
+    block.call if block
+  end
+  
+  def done
+    EM.cancel_timer(@timeout)
+    wakeup
+  end
+  
+  def run(&block)
+    if EMSpec.context_fiber == Fiber.current
+      block.call()
+    else
+      EM::run do
+        EM::error_handler do |err|
+          test = EEtee.current_test || EEtee::Test.new("(EM Loop)", @_reporter){}
+          @_reporter.add_error( EEtee::Error.new(err, test))
+        end
+        
+        EMSpec.context_fiber = Fiber.new do
+          begin
+            block.call()
+            EM::stop_event_loop
+          ensure
+            EMSpec.context_fiber = nil
+          end
+        end
+        
+        EMSpec.context_fiber.resume
+      end
+      
+    end
+  end
+  
+  
+end
+
+EEtee::Context.__send__(:include, EEtee::EMSpec)

data/lib/eetee/reporter.rb

@@ -18,6 +18,16 @@ module EEtee
       @assertion_count += 1
     end
     
+    ##
+    # Declare an error, only use this
+    # when we are "outside" of the current
+    # flow like with EventMachine
+    # 
+    # @param [RuntimeError] an error
+    def add_error(err)
+      @errors << err
+    end
+    
     def around_context(ctx, &block)
       @indent += 1
       block.call()

data/lib/eetee/version.rb

@@ -1,3 +1,3 @@
 module EEtee
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/eetee.rb

@@ -30,6 +30,16 @@ module EEtee
     def enable_focus_mode
       @enable_focus_mode
     end
+    
+    
+    
+    def current_reporter
+      @reporter_instance
+    end
+    
+    def current_reporter=(reporter)
+      @reporter_instance = reporter
+    end
   end
   
   

data/specs/unit/context_spec.rb

@@ -22,10 +22,22 @@ describe 'Context' do
     Thread.new do
       ctx = EEtee::Context.new("a context", 0, @reporter, :@a => 234){ }
       ctx.before{ a = @a }
+      ctx.should("do nothing"){} # just to run the before block
     end.join
     a.should == 234
   end
   
+  should 'run the before blocks before every test' do
+    n = 0
+    Thread.new do
+      ctx = EEtee::Context.new("a context", 0, @reporter){ }
+      ctx.before{ n = 1 }
+      ctx.should("test 1"){ n += 2 }
+      ctx.should("test 2"){ n += 2 }
+    end.join
+    n.should == 3
+  end
+  
   should 'copy instance variables in nested contexts' do
     a = b = nil
     Thread.new do

data/specs/unit/test_spec.rb

@@ -3,7 +3,9 @@ require File.expand_path('../../spec_helper', __FILE__)
 describe 'Test' do
   before do
     @reporter = stub('Reporter')
+    @reporter.stubs(:increment_assertions)
     @reporter.stubs(:around_test).yields
+    EEtee.stubs(:current_reporter).returns(@reporter)
   end
   
   should 'execute given block in context' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eetee
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-18 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -42,6 +42,7 @@ files:
 - README.md
 - Rakefile
 - eetee.gemspec
+- examples/eventmachine/em.rb
 - examples/extensions/extension.rb
 - examples/extensions/test.rb
 - examples/focus/focus.rb
@@ -51,6 +52,7 @@ files:
 - lib/eetee/assertion_wrapper.rb
 - lib/eetee/context.rb
 - lib/eetee/errors.rb
+- lib/eetee/ext/em.rb
 - lib/eetee/ext/mocha.rb
 - lib/eetee/ext/rack.rb
 - lib/eetee/ext/time.rb
@@ -85,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 496812950380161431
+      hash: -1848565578778888050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,10 +96,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 496812950380161431
+      hash: -1848565578778888050
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Another test framework