schmurfy-bacon 1.2.2 → 1.3.0

data/Rakefile

@@ -1,71 +1,10 @@
-# Rakefile for Bacon.  -*-ruby-*-
+# encoding: utf-8
 require "bundler/gem_tasks"
 
 
 desc "Run all the tests"
 task :default => [:test]
 
-desc "Do predistribution stuff"
-task :predist => [:chmod, :changelog, :rdoc]
-
-
-desc "Make an archive as .tar.gz"
-task :dist => [:test, :predist] do
-  sh "git archive --format=tar --prefix=#{release}/ HEAD^{tree} >#{release}.tar"
-  sh "pax -waf #{release}.tar -s ':^:#{release}/:' RDOX ChangeLog doc"
-  sh "gzip -f -9 #{release}.tar"
-end
-
-# Helper to retrieve the "revision number" of the git tree.
-def git_tree_version
-  if File.directory?(".git")
-    @tree_version ||= `git describe`.strip.sub('-', '.')
-    @tree_version << ".0"  unless @tree_version.count('.') == 2
-  else
-    $: << "lib"
-    require 'bacon'
-    @tree_version = Bacon::VERSION
-  end
-  @tree_version
-end
-
-def gem_version
-  git_tree_version.gsub(/-.*/, '')
-end
-
-def release
-  "bacon-#{git_tree_version}"
-end
-
-def manifest
-  `git ls-files`.split("\n") - [".gitignore"]
-end
-
-
-desc "Make binaries executable"
-task :chmod do
-  Dir["bin/*"].each { |binary| File.chmod(0775, binary) }
-end
-
-desc "Generate a ChangeLog"
-task :changelog do
-  File.open("ChangeLog", "w") { |out|
-    `git log -z`.split("\0").map { |chunk|
-      author = chunk[/Author: (.*)/, 1].strip
-      date = chunk[/Date: (.*)/, 1].strip
-      desc, detail = $'.strip.split("\n", 2)
-      detail ||= ""
-      detail = detail.gsub(/.*darcs-hash:.*/, '')
-      detail.rstrip!
-      out.puts "#{date}  #{author}"
-      out.puts "  * #{desc.strip}"
-      out.puts detail  unless detail.empty?
-      out.puts
-    }
-  }
-end
-
-
 desc "Generate RDox"
 task "RDOX" do
   sh "bin/bacon -Ilib --automatic --specdox >RDOX"
@@ -77,43 +16,4 @@ task :test do
 end
 
 
-begin
-  $" << "sources"  if defined? FromSrc
-  require 'rubygems'
-
-  require 'rake'
-  require 'rake/clean'
-  require 'rake/packagetask'
-  require 'fileutils'
-rescue LoadError
-  # Too bad.
-else
-  spec = Gem::Specification.new do |s|
-    s.name            = "bacon"
-    s.version         = gem_version
-    s.platform        = Gem::Platform::RUBY
-    s.summary         = "a small RSpec clone"
-
-    s.description = <<-EOF
-Bacon is a small RSpec clone weighing less than 350 LoC but
-nevertheless providing all essential features.
-
-http://github.com/chneukirchen/bacon
-    EOF
-
-    s.files           = manifest + %w(RDOX ChangeLog)
-    s.bindir          = 'bin'
-    s.executables     << 'bacon'
-    s.require_path    = 'lib'
-    s.extra_rdoc_files = ['README', 'RDOX']
-    s.test_files      = []
-
-    s.author          = 'Christian Neukirchen'
-    s.email           = 'chneukirchen@gmail.com'
-    s.homepage        = 'http://github.com/chneukirchen/bacon'
-  end
-
-  task :gem => [:chmod, :changelog]
-end
-
 

data/examples/em_spec.rb

@@ -0,0 +1,51 @@
+require 'rubygems'
+
+$LOAD_PATH.unshift << File.expand_path('../../lib/', __FILE__)
+
+require 'bacon/ext/em'
+require 'bacon'
+
+Bacon.summary_on_exit
+
+def run_something_later(&block)
+  EM::add_timer(0.1) do
+    block.call("something")
+  end
+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
+  end
+  
+  it 'ends immediately' do
+    EM::reactor_running?.should == true
+    1.should == 1
+    # without action EM::stop is called after our code
+  end
+  
+  it 'requires time (simple)' do
+    # suppose this method do something
+    # 0.1s after the call
+    run_something_later do |s|
+      s.should == "something"
+    end
+    
+    wait(0.2)
+  end
+  
+  
+  it 'requires time (less simple)' do
+    v = 1
+    EM::add_timer(0.2){ v = 2 }
+    
+    # wait 0.2s and then execute the passed block
+    wait(0.2){ v.should == 2 }
+  end
+  
+end

data/examples/mocha_spec.rb

@@ -0,0 +1,24 @@
+require 'rubygems'
+
+$LOAD_PATH.unshift << File.expand_path('../../lib/', __FILE__)
+
+require 'bacon'
+require 'bacon/ext/mocha'
+
+Bacon.summary_on_exit
+
+def call_it(target)
+  target.do_something()
+end
+
+describe 'MochaSpec' do
+  before do
+    @m = mock()
+  end
+  
+  it 'should call method on mock' do
+    @m.expects(:do_something)
+    call_it(@m)
+  end
+  
+end

data/lib/bacon/ext/em.rb

@@ -0,0 +1,68 @@
+
+require 'eventmachine'
+
+#
+# This module allows you to run your specs inside an eventmachine loop
+# check examples/em_spec.rb for usage.
+# 
+# Be aware that it does not work like the em-spec gem, no timeout error will
+# 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)
+      @timeout_interval = timeout
+      @end_check = 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!
+        block.call
+      end
+    end
+
+    def execute_spec(&block)
+      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
+
+        end
+      end
+    end
+
+  end
+  
+  
+end

data/lib/bacon/ext/mocha.rb

@@ -0,0 +1,35 @@
+
+require 'mocha'
+
+#
+# This extension ensure that mocha expectations are considered
+# as bacon tests. Amongst other thing it allows to have a test
+# containing only mocha expectations.
+# 
+module Bacon
+  module MochaRequirementsCounter
+    def self.increment
+      Counter[:requirements] += 1
+    end
+  end
+  
+  class Context
+    include Mocha::API
+    
+    alias_method :it_before_mocha, :it
+    
+    def it(description, &block)
+      it_before_mocha(description) do
+        begin
+          mocha_setup
+          block.call
+          mocha_verify(MochaRequirementsCounter)
+        rescue Mocha::ExpectationError => e
+          raise Error.new(:failed, "#{e.message}\n#{e.backtrace[0...10].join("\n")}")
+        ensure
+          mocha_teardown
+        end
+      end
+    end
+  end
+end

data/lib/bacon/version.rb

@@ -1,3 +1,3 @@
 module Bacon
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/lib/bacon.rb

@@ -73,11 +73,8 @@ module Bacon
   end
   
   module ContextAssertions
-    def it(description, &block)
-      return  unless description =~ RestrictName
-      block ||= lambda { should.flunk "not implemented" }
-      Counter[:specifications] += 1
-      run_requirement description, block
+    def execute_spec(&block)
+      block.call
     end
     
     def describe(*args, &block)
@@ -124,6 +121,13 @@ module Bacon
         super(*args,&block)
       end
     end
+    
+    def it(description, &block)
+      return  unless description =~ RestrictName
+      block ||= lambda { should.flunk "not implemented" }
+      Counter[:specifications] += 1
+      run_requirement description, block
+    end
 
     def run_requirement(description, spec)
       Bacon.handle_requirement description do
@@ -131,9 +135,13 @@ module Bacon
           Counter[:depth] += 1
           rescued = false
           begin
-            @before.each { |block| instance_eval(&block) }
-            prev_req = Counter[:requirements]
-            instance_eval(&spec)
+            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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schmurfy-bacon
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-31 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70355136826660 !ruby/object:Gem::Requirement
+  requirement: &70141825879320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70355136826660
+  version_requirements: *70141825879320
 description: ! 'Bacon is a small RSpec clone weighing less than 350 LoC but
 
   nevertheless providing all essential features.
@@ -44,10 +44,14 @@ files:
 - Rakefile
 - bacon.gemspec
 - bin/bacon
+- examples/em_spec.rb
+- examples/mocha_spec.rb
 - lib/autotest/bacon.rb
 - lib/autotest/bacon_rspec.rb
 - lib/autotest/discover.rb
 - lib/bacon.rb
+- lib/bacon/ext/em.rb
+- lib/bacon/ext/mocha.rb
 - lib/bacon/version.rb
 - lib/output/better_output.rb
 - lib/output/knock_output.rb
@@ -71,7 +75,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2533530908022743327
+      hash: 3626099875100681830
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -80,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2533530908022743327
+      hash: 3626099875100681830
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11