schmurfy-bacon 1.3.1 → 1.3.2

data/examples/mocha_spec.rb

@@ -8,7 +8,7 @@ require 'bacon/ext/mocha'
 Bacon.summary_on_exit
 
 def call_it(target)
-  target.do_something()
+  target.do_something(42)
 end
 
 describe 'MochaSpec' do
@@ -17,7 +17,7 @@ describe 'MochaSpec' do
   end
   
   it 'should call method on mock' do
-    @m.expects(:do_something)
+    @m.expects(:do_something).with(anything())
     call_it(@m)
   end
   

data/examples/nested_contexts_spec.rb

@@ -0,0 +1,33 @@
+require 'rubygems'
+
+$LOAD_PATH.unshift << File.expand_path('../../lib/', __FILE__)
+
+require 'bacon'
+require 'bacon/ext/em'
+
+Bacon.summary_on_exit
+
+
+describe 'Main context' do
+  with_eventmachine!
+  
+  before do
+    # EM::reactor_running?.should == true
+    @var = 1
+  end
+  
+  should 'pass' do
+    2.should == 2
+  end
+  
+  describe 'sub context 1' do
+    before do
+      @var += 2
+    end
+    
+    should 'pass' do
+      2.should == 2
+      @var.should == 3
+    end
+  end
+end

data/lib/bacon.rb

@@ -86,6 +86,60 @@ module Bacon
       block.call
     end
     
+    def run_requirement(description, spec)
+      Bacon.handle_requirement description do
+        begin
+          Counter[:depth] += 1
+          rescued = false
+          begin
+            prev_req = nil
+            
+            execute_spec do
+              @before.each { |block| instance_eval(&block) }
+              prev_req = Counter[:requirements]
+              instance_eval(&spec)
+            end
+          rescue Object => e
+            rescued = true
+            raise e
+          ensure
+            if Counter[:requirements] == prev_req and not rescued
+              raise Error.new(:missing, "empty specification: #{@name} #{description}")
+            end
+            begin
+              @after.each { |block| instance_eval(&block) }
+            rescue Object => e
+              raise e  unless rescued
+            end
+          end
+        rescue Object => e
+          ErrorLog << "#{e.class}: #{e.message}\n"
+          
+          backtrace = e.backtrace.find_all { |line| line !~ /bin\/bacon|\/bacon\.rb:\d+/ && line !~ /guard|fsevent|thor/ }
+          backtrace = backtrace[0, Bacon.backtrace_size] if Bacon.backtrace_size
+          
+          backtrace.each_with_index do |line, i|
+            ErrorLog << "  #{line}#{i==0 ? ": #@name - #{description}" : ""}\n"
+          end
+          
+          ErrorLog << "\n"
+
+          if e.kind_of? Error
+            Counter[e.count_as] += 1
+            e.count_as.to_s.upcase
+            [:failed]
+          else
+            Counter[:errors] += 1
+            [:error, e]
+          end
+        else
+          ""
+        ensure
+          Counter[:depth] -= 1
+        end
+      end
+    end
+    
     def describe(*args, &block)
       context = Bacon::Context.new(args.join(' '), &block)
       (parent_context = self).methods(false).each {|e|
@@ -149,61 +203,6 @@ module Bacon
       run_requirement description, block
     end
 
-    def run_requirement(description, spec)
-      Bacon.handle_requirement description do
-        begin
-          Counter[:depth] += 1
-          rescued = false
-          begin
-            prev_req = nil
-            
-            execute_spec do
-              @before.each { |block| instance_eval(&block) }
-              prev_req = Counter[:requirements]
-              instance_eval(&spec)
-            end
-          rescue Object => e
-            rescued = true
-            raise e
-          ensure
-            if Counter[:requirements] == prev_req and not rescued
-              raise Error.new(:missing,
-                              "empty specification: #{@name} #{description}")
-            end
-            begin
-              @after.each { |block| instance_eval(&block) }
-            rescue Object => e
-              raise e  unless rescued
-            end
-          end
-        rescue Object => e
-          ErrorLog << "#{e.class}: #{e.message}\n"
-          
-          backtrace = e.backtrace.find_all { |line| line !~ /bin\/bacon|\/bacon\.rb:\d+/ && line !~ /guard|fsevent|thor/ }
-          backtrace = backtrace[0, Bacon.backtrace_size] if Bacon.backtrace_size
-          
-          backtrace.each_with_index do |line, i|
-            ErrorLog << "  #{line}#{i==0 ? ": #@name - #{description}" : ""}\n"
-          end
-          
-          ErrorLog << "\n"
-
-          if e.kind_of? Error
-            Counter[e.count_as] += 1
-            e.count_as.to_s.upcase
-            [:failed]
-          else
-            Counter[:errors] += 1
-            [:error, e]
-          end
-        else
-          ""
-        ensure
-          Counter[:depth] -= 1
-        end
-      end
-    end
-
     def raise?(*args, &block); block.raise?(*args); end
     def throw?(*args, &block); block.throw?(*args); end
     def change?(*args, &block); block.change?(*args); end

data/lib/bacon/ext/em.rb

@@ -1,4 +1,5 @@
 
+require 'fiber'
 require 'eventmachine'
 
 #
@@ -18,21 +19,19 @@ module Bacon
   module EMSpec # :nodoc:
 
     def wait(timeout = 0.1, &block)
-      @timeout_interval = timeout
-      @end_check = block
+      waiting_fiber = Fiber.current
+      EM::cancel_timer(@timeout)
+      @timeout = EM::add_timer(timeout){ waiting_fiber.resume }
+      Fiber.yield
+      
+      block.call if block
     end
     
-    
     def done
-      @end_check.call if @end_check
       EM.cancel_timer(@timeout)
       EM.stop
     end
 
-    def create_timeout_timer(delay = 0.1)
-      EM::add_timer(delay){ done }
-    end
-
     def describe(*, &block)
       super do
         with_eventmachine!
@@ -40,25 +39,16 @@ module Bacon
       end
     end
 
-    def execute_spec(&block)
+    def run_requirement(desc, spec)
       raise "block required" unless block
 
-      super do
-        @timeout_interval = nil
-
-        EM.run do
-          @timeout = create_timeout_timer()
-
-          instance_eval(&block)
-
-          if @timeout_interval
-            EM::cancel_timer(@timeout)
-            @timeout = create_timeout_timer(@timeout_interval)
-          else
-            done
-          end
+      @timeout_interval = nil
 
-        end
+      EM.run do
+        Fiber.new do
+          super
+          done
+        end.resume
       end
     end
 

data/lib/bacon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schmurfy-bacon
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70177919026240 !ruby/object:Gem::Requirement
+  requirement: &70215709703120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70177919026240
+  version_requirements: *70215709703120
 description: ! 'Bacon is a small RSpec clone weighing less than 350 LoC but
 
   nevertheless providing all essential features.
@@ -47,6 +47,7 @@ files:
 - examples/em_spec.rb
 - examples/focus_spec.rb
 - examples/mocha_spec.rb
+- examples/nested_contexts_spec.rb
 - lib/autotest/bacon.rb
 - lib/autotest/bacon_rspec.rb
 - lib/autotest/discover.rb
@@ -76,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3207212041725113050
+      hash: 414404718689880390
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3207212041725113050
+      hash: 414404718689880390
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11