eetee 0.0.4 → 0.0.5

data/Gemfile

@@ -13,4 +13,5 @@ group(:test) do
   gem 'growl'
   
   gem 'eventmachine',    '~> 1.0.0'
+  gem 'rb-blink1'
 end

data/examples/eventmachine/em.rb

@@ -2,11 +2,37 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'eetee'
+require 'eetee/ext/mocha'
 require 'eetee/ext/em'
 
+class EMHandler < EM::Connection
+  def initialize(arg)
+    @arg = arg
+  end
+  
+  def receive_data(data)
+    @arg.toto()
+  end
+end
+
+
+
 describe 'context' do
   before do
     @fib = Fiber.current
+    @port = 23456 + rand(100)
+    @srv = EM::start_server('127.0.0.1', @port, EMHandler, mock('Trash'))
+  end
+  
+  should 'wait packet (and fails)' do
+    
+    socket = EM::connect('127.0.0.1', @port)
+    
+    EM::add_timer(0.1) do
+      socket.send_data("data")
+    end
+    
+    wait(1)
   end
   
   should 'run in a fiber inside EventMachine' do

data/lib/eetee/assertion_wrapper.rb

@@ -35,8 +35,8 @@ module EEtee
     
     def close?(target, error_margin)
       invert_helper(
-        "expected #{target} += #{error_margin}, got #{target}",
-        "expected to be outside of #{target} += #{error_margin}, got #{target}"
+        "expected #{target} += #{error_margin}, got #{@object}",
+        "expected to be outside of #{target} += #{error_margin}, got #{@object}"
       ) do
         (target-error_margin .. target+error_margin).should.include?(@object)
       end
@@ -65,7 +65,9 @@ module EEtee
       ret = @object.__send__(name, *args, &block)
       
       if !!ret == !!@invert
-        if args.empty?
+        if ((name == :'==') || (name == :'!=')) && (!@object.nil? || !args[0].nil?)
+          msg = "\n#{@object}\n#{name}\n#{args[0]}\n=> #{ret} (size: #{@object.size} / #{args[0].size})"
+        elsif args.empty?
           msg = "#{@object.inspect}.#{name}() => #{ret}"
         else
           msg = "#{@object.inspect}.#{name}(#{args}) => #{ret}"

data/lib/eetee/context.rb

@@ -1,17 +1,28 @@
 module EEtee
   
+  NOT_CLONEABLE_TYPES = [Fixnum, NilClass, TrueClass, FalseClass].freeze
+    
   module SharedContextMethods
     def before(&block)
       @before ||= []
       @before << block
     end
     
+    def after(&block)
+      @after ||= []
+      @after << block
+    end
+    
     def describe(description, &block)
       vars = {}
       
       instance_variables.reject{|name| name.to_s.start_with?('@_') }.each do |name|
         value = instance_variable_get(name)
-        vars[name] = value
+        if NOT_CLONEABLE_TYPES.include?(value.class)
+          vars[name] = value
+        else
+          vars[name] = value.clone
+        end
       end
       
       Context.new(description, @_level + 1, @_reporter, vars, @_focus_mode, &block)
@@ -23,8 +34,12 @@ module EEtee
         
     def it(label, opts = {}, &block)
       if !@_focus_mode || opts[:focus]
-        (@before || []).each{|b| instance_eval(&b) }
-        Test.new(label, @_reporter, &block)
+        begin
+          (@before || []).each{|b| instance_eval(&b) }
+          Test.new(label, @_reporter, &block)
+        ensure
+          (@after || []).each{|b| instance_eval(&b) }
+        end
       end
     end
   end
@@ -37,6 +52,8 @@ module EEtee
     def description; @_description; end
     def level; @_level; end
     
+    alias_method :context_description, :description
+    
     def initialize(description, level, reporter, vars = {}, focus_mode = false, &block)
       vars.each do |name, value|
         instance_variable_set(name, value)

data/lib/eetee/reporter.rb

@@ -1,6 +1,6 @@
 module EEtee
   class Reporter
-    attr_reader :failures, :errors, :assertion_count, :test_count
+    attr_reader :failures, :errors, :assertion_count, :empty, :test_count
     
     def initialize
       @errors = []

data/lib/eetee/reporters/console.rb

@@ -6,7 +6,7 @@ module EEtee
   module Reporters
     
     ##
-    # Advanced text output designed to be used in a open
+    # Advanced text output designed to be used in an open
     # console.
     # 
     class Console < Reporter

data/lib/eetee/runner.rb

@@ -6,7 +6,7 @@ module EEtee
     extend Forwardable
     attr_reader :focus_mode
     
-    def_delegators :@reporter, :failures, :errors, :assertions, :test_count
+    def_delegators :@reporter, :failures, :errors, :empty, :assertions, :test_count
     
     def initialize
       @reporter = EEtee.default_reporter_class.new
@@ -34,7 +34,7 @@ module EEtee
       paths.each do |path|
         if File.exist?(path)
           data = File.read(path)
-          if data =~ /^\s+(should|it).*?,\s+:focus => true do$/
+          if data =~ /^\s+(should|it).*?,\s+:?focus.* do$/
             puts "Focus enabled."
             @focus_mode = true
           else

data/lib/eetee/version.rb

@@ -1,3 +1,3 @@
 module EEtee
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/eetee.rb

@@ -34,11 +34,11 @@ module EEtee
     
     
     def current_reporter
-      @reporter_instance
+      Thread.current[:eetee_reporter]
     end
     
     def current_reporter=(reporter)
-      @reporter_instance = reporter
+      Thread.current[:eetee_reporter] = reporter
     end
   end
   

data/lib/guard/eetee.rb

@@ -1,10 +1,14 @@
 require 'guard'
 require 'guard/guard'
 
-gem 'guard', '~> 1.5.3'
-
 module Guard
-  class EEtee < Guard
+  class Eetee < Guard
+    ERROR_COLOR = [255, 56, 84].freeze
+    EMPTY_COLOR = [0, 159, 193].freeze
+    FAILURES_COLOR = [226, 117, 0].freeze
+    SUCCESS_COLOR = [0, 219, 5].freeze
+    FADE_DURATION = 200
+
     
     def self.template(*)
       File.read(
@@ -16,6 +20,8 @@ module Guard
     # @param [Array<Guard::Watcher>] watchers the Guard file watchers
     # @param [Hash] options the custom Guard options
     def initialize(watchers = [], options = {})
+      @reporter_class = options.delete(:reporter)
+      @with_blink1 = options.delete(:blink1)      
       super
     end
 
@@ -28,6 +34,12 @@ module Guard
     # Called when `stop|quit|exit|s|q|e + enter` is pressed (when Guard quits).
     # @raise [:task_has_failed] when stop has failed
     def stop
+      if @with_blink1
+        @blink1 = Blink1.new
+        @blink1.open()
+        @blink1.set_rgb(0,0,0)
+        @blink1.close()
+      end
       puts "Guard::EEtee stopped."
     end
 
@@ -50,6 +62,12 @@ module Guard
     def run_on_changes(paths)
       pid = Kernel.fork do
         require 'eetee'
+        
+        if @reporter_class
+          EEtee.default_reporter_class = EEtee::Reporters.const_get(@reporter_class)
+        end
+
+        
         runner = EEtee::Runner.new
         runner.run_files(paths)
         runner.report_results()
@@ -59,6 +77,28 @@ module Guard
         
         focus_mode = runner.focus_mode
         
+        if @with_blink1
+          blink1 = Blink1.new
+          blink1.open()
+          
+          if runner.errors.size > 0
+            blink1.fade_to_rgb(FADE_DURATION, *ERROR_COLOR)
+            
+          elsif runner.failures.size > 0
+            blink1.fade_to_rgb(FADE_DURATION, *FAILURES_COLOR)
+            
+          elsif runner.empty.size > 0
+            blink1.fade_to_rgb(FADE_DURATION, *EMPTY_COLOR)
+            
+          else
+            blink1.fade_to_rgb(FADE_DURATION, *SUCCESS_COLOR)
+            
+          end
+          
+          blink1.close()
+        end
+
+        
         if failures > 0
           Notifier.notify("Specs: #{failures} Failures (#{tests} tests) #{focus_mode ? '(focus)' : ''}",
               :image => :failed

data/specs/unit/context_spec.rb

@@ -9,31 +9,118 @@ describe 'Context' do
   
   should 'run block in context' do
     a = nil
+    test_th_id = nil
+    
+    @reporter.stubs(:increment_assertions)
+    
+    th_id = Thread.current.object_id
+    
     Thread.new do
       EEtee::Context.new("a context", 0, @reporter, :@a => 34) do
+        test_th_id = Thread.current.object_id
         a = @a
       end
     end.join
+    
+    th_id.should.not == test_th_id
     a.should == 34
   end
   
   should 'run before block in same context' do
     a = nil
     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
+      EEtee::Context.new("a context", 0, @reporter, :@a => 234) do
+        before{ a = @a }
+        should("do nothing"){} # just to run the before block
+      end
     end.join
     a.should == 234
   end
   
+  should 'allow tests to use the context description' do
+    a = nil
+    Thread.new do
+      EEtee::Context.new("a context", 0, @reporter, :@a => 234) do
+        should("do nothing"){ a = context_description() }
+      end
+    end.join
+    a.should == "a context"
+  end
+  
+  should 'allow tests to use the nested context description' do
+    a = nil
+    Thread.new do
+      EEtee::Context.new("a context", 0, @reporter, :@a => 234) do
+        describe("sub context") do
+          should("do nothing"){ a = context_description() }
+        end
+      end
+    end.join
+    a.should == "sub context"
+  end
+  
+  should 'run after block in same context' do
+    a = nil
+    Thread.new do
+      EEtee::Context.new("a context", 0, @reporter, :@a => 234) do
+        after{ a = @a }
+        should("do nothing"){} # just to run the before block
+      end
+    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 }
+      EEtee::Context.new("a context", 0, @reporter) do
+        before{ n = 1 }
+        should("test 1"){ n += 2 }
+        should("test 2"){ n += 2 }
+      end
+    end.join
+    n.should == 3
+  end
+  
+  should 'run the after blocks after every test' do
+    n = 0
+    Thread.new do
+      EEtee::Context.new("a context", 0, @reporter) do
+        after{ n = 1 }
+        should("test 1"){ n += 2 }
+        should("test 2"){ n += 2 }
+      end
+    end.join
+    n.should == 1
+  end
+  
+  should 'run the after blocks after when an error occured in test' do
+    n = 0
+    Thread.new do
+      begin
+        EEtee::Context.new("a context", 0, @reporter) do
+          after{ n = 1 }
+          should("test 1"){ raise "toto" }
+        end
+      rescue
+      end
+    end.join
+    n.should == 1
+  end
+  
+  should 'only run the rigth before blocks' do
+    n = 0
+    Thread.new do
+      EEtee::Context.new("a context", 0, @reporter) do
+        before{ n = 1 }
+        
+        describe("sub context") do
+          before { n = 10 }
+        end
+        
+        should("test 1"){ n += 2 }
+      end
     end.join
     n.should == 3
   end
@@ -41,8 +128,9 @@ describe 'Context' do
   should 'copy instance variables in nested contexts' do
     a = b = nil
     Thread.new do
-      ctx = EEtee::Context.new("a context", 0, @reporter, :@a => 98, :@b => "string"){ }
-      ctx.describe("nested context"){ a = @a; b = @b }
+      EEtee::Context.new("a context", 0, @reporter, :@a => 98, :@b => "string") do
+        describe("nested context"){ a = @a; b = @b }
+      end
     end.join
     a.should == 98
     b.should == "string"
@@ -53,8 +141,9 @@ describe 'Context' do
     EEtee::Test.expects(:new).with("should test something", @reporter)
     Thread.new do
       begin
-        ctx = EEtee::Context.new("a context", 0, @reporter, :@a => 98, :@b => "string"){ }
-        ctx.should("test something"){ 1.should == 1 }
+        EEtee::Context.new("a context", 0, @reporter, :@a => 98, :@b => "string") do
+          should("test something"){ 1.should == 1 }
+        end
       rescue Exception => ex
         err = ex
       end
@@ -69,9 +158,10 @@ describe 'Context' do
     
     Thread.new do
       begin
-        ctx = EEtee::Context.new("a context", 0, @reporter, {:@a => 98, :@b => "string"}, true){ }
-        ctx.should("test something", :focus => true){ n = 1 }
-        ctx.should("test something"){ n = 2 }
+        EEtee::Context.new("a context", 0, @reporter, {:@a => 98, :@b => "string"}, true) do
+          should("test something", :focus => true){ n = 1 }
+          should("test something"){ n = 2 }
+        end
       rescue Exception => ex
         err = ex
       end
@@ -87,10 +177,12 @@ describe 'Context' do
     
     Thread.new do
       begin
-        ctx = EEtee::Context.new("a context", 0, @reporter, {:@a => 98, :@b => "string"}, true){ }
-        ctx2 = ctx.describe("nested"){}
-        ctx2.should("test something", :focus => true){ n = 1 }
-        ctx2.should("test something"){ n = 2 }
+        EEtee::Context.new("a context", 0, @reporter, {:@a => 98, :@b => "string"}, true) do
+          describe("nested") do
+            should("test something", :focus => true){ n = 1 }
+            should("test something"){ n = 2 }
+          end
+        end
       rescue Exception => ex
         err = ex
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eetee
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-09 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3442233292551276854
+      hash: 1275779178498727194
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3442233292551276854
+      hash: 1275779178498727194
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23