tmm1-em-spec 0.1.1 → 0.1.2

data/lib/em/spec.rb

@@ -2,18 +2,23 @@ require File.dirname(__FILE__) + '/../ext/fiber18'
 
 require 'bacon'
 
-class Bacon::Context
-  alias :_it :it
+class Bacon::FiberedContext < Bacon::Context
   def it *args
-    _it(*args){ if block_given? then yield; Fiber.yield end }
+    super{
+      if block_given?
+        yield
+        Fiber.yield
+      end
+    }
   end
 
   def done
     EM.next_tick{
+      :done.should == :done
       $bacon_fiber.resume if $bacon_fiber
     }
   end
-end unless Bacon::Context.method_defined? :_it
+end
 
 require 'eventmachine'
 
@@ -25,7 +30,7 @@ module EventMachine
     EM.run{
       Bacon.summary_on_exit
       ($bacon_fiber = Fiber.new{
-                        Bacon::Context.new(args.join(' '), &blk).run
+                        Bacon::FiberedContext.new(args.join(' '), &blk).run
                         EM.stop_event_loop
                       }).resume
     }
@@ -33,33 +38,48 @@ module EventMachine
   class << self; alias :describe :spec; end
 end
 
-EM.describe EventMachine do
+if __FILE__ == $0
 
-  should 'work' do
-    1.should == 1
-    done
+  describe 'Bacon' do
+    should 'work as normal outside EM.describe' do
+      1.should == 1
+    end
   end
 
-  should 'have timers' do
-    start = Time.now
-
-    EM.add_timer(0.5){
-      (Time.now-start).should.be.close 0.5, 0.1
+  EM.describe EventMachine do
+    should 'work' do
       done
-    }
-  end
+    end
 
-  should 'have periodic timers' do
-    num = 0
-    start = Time.now
+    should 'have timers' do
+      start = Time.now
 
-    timer = EM.add_periodic_timer(0.5){
-      if (num += 1) == 2
-        (Time.now-start).should.be.close 1.0, 0.1
-        EM.__send__ :cancel_timer, timer
+      EM.add_timer(0.5){
+        (Time.now-start).should.be.close 0.5, 0.1
         done
-      end
-    }
+      }
+    end
+
+    should 'have periodic timers' do
+      num = 0
+      start = Time.now
+
+      timer = EM.add_periodic_timer(0.5){
+        if (num += 1) == 2
+          (Time.now-start).should.be.close 1.0, 0.1
+          EM.__send__ :cancel_timer, timer
+          done
+        end
+      }
+    end
+
+    should 'have deferrables' do
+      defr = EM::DefaultDeferrable.new
+      defr.timeout(1)
+      defr.errback{
+        done
+      }
+    end
   end
 
-end if __FILE__ == $0
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tmm1-em-spec
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,20 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-01 00:00:00 -07:00
+date: 2009-02-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.0
+        version: 0.12.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: bacon
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,7 +43,6 @@ extra_rdoc_files: []
 files: 
 - README
 - lib/em/spec.rb
-- lib/ext/em.rb
 - lib/ext/fiber18.rb
 has_rdoc: false
 homepage: http://github.com/tmm1/em-spec

data/lib/ext/em.rb

@@ -1,37 +0,0 @@
-begin
-  require 'eventmachine'
-rescue LoadError
-  require 'rubygems'
-  require 'eventmachine'
-end
-
-# copied from EM trunk, will be removed when 0.12.1 is released
-if EM::VERSION < '0.12.1'
-    
-  def EventMachine::run blk=nil, tail=nil, &block
-    @tails ||= []
-    tail and @tails.unshift(tail)
-
-    if reactor_running?
-      (b = blk || block) and b.call # next_tick(b)
-    else
-      @conns = {}
-      @acceptors = {}
-      @timers = {}
-      begin
-        @reactor_running = true
-        initialize_event_machine
-        (b = blk || block) and add_timer(0, b)
-        run_machine
-      ensure
-        release_machine
-        @reactor_running = false
-      end
-
-      until @tails.empty?
-        @tails.pop.call
-      end
-    end
-  end
-
-end