spicycode-micronaut 0.1.8.3 → 0.1.8.5

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems/specification'
 require 'lib/micronaut/rake_task'
 
 GEM = "micronaut"
-GEM_VERSION = "0.1.8.3"
+GEM_VERSION = "0.1.8.5"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://github.com/spicycode/micronaut"
@@ -72,4 +72,4 @@ namespace :examples do
 
 end
 
-task :default => 'examples:coverage'
+task :default => 'examples:coverage'

data/examples/example_helper.rb

@@ -3,8 +3,14 @@ $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
 require 'micronaut'
 require 'rubygems'
-gem :mocha
 
+def with_ruby(version)
+  yield if RUBY_PLATFORM =~ Regexp.compile("^#{version}")
+end
+
+with_ruby("1.8") do
+  gem :mocha
+end
 require File.expand_path(File.dirname(__FILE__) + "/resources/example_classes")
 
 module Micronaut
@@ -19,10 +25,6 @@ module Micronaut
   end
 end
 
-def with_ruby(version)
-  yield if RUBY_PLATFORM =~ Regexp.compile("^#{version}")
-end
-
 def remove_last_describe_from_world
   Micronaut.world.behaviours.pop
 end

data/lib/micronaut/behaviour.rb

@@ -2,7 +2,7 @@ module Micronaut
   class Behaviour
     include Micronaut::Matchers 
     
-    attr_accessor :running_example
+    attr_accessor :running_example, :reporter
     
     def self.inherited(klass)
       super
@@ -103,23 +103,23 @@ module Micronaut
     end
 
     def self.metadata
-      @metadata
+      @metadata ||= { :behaviour => {} }
     end
 
     def self.name
-      @metadata[:behaviour][:name]
+      metadata[:behaviour][:name]
     end
 
     def self.describes
-      @metadata[:behaviour][:describes]
+      metadata[:behaviour][:describes]
     end
 
     def self.description
-      @metadata[:behaviour][:description]
+      metadata[:behaviour][:description]
     end
     
     def self.file_path
-      @metadata[:behaviour][:file_path]
+      metadata[:behaviour][:file_path]
     end
    
     def self.describe(*args, &behaviour_block)
@@ -191,40 +191,12 @@ module Micronaut
     def self.run(reporter)
       return true if examples.empty?
 
+      behaviour_instance = new
       reporter.add_behaviour(self)
+      eval_before_alls(behaviour_instance)
+      success = examples_to_run.all? { |ex| ex.run(behaviour_instance, reporter) }
+      eval_after_alls(behaviour_instance)
       
-      group = new
-      eval_before_alls(group)
-      success = true
-
-      examples_to_run.each do |ex|
-        group.running_example = ex
-        reporter.example_started(ex)
-
-        execution_error = nil
-        begin
-          group._setup_mocks
-          eval_before_eachs(group)
-
-          if ex.example_block
-            group.instance_eval(&ex.example_block)
-            group._verify_mocks
-            reporter.example_passed(ex)
-          else
-            reporter.example_pending(ex, 'Not yet implemented')
-          end
-        rescue Exception => e
-          reporter.example_failed(ex, e)
-          execution_error ||= e
-        ensure
-          eval_after_eachs(group)
-          group._teardown_mocks
-        end
-
-        success &= execution_error.nil?
-      end
-      eval_after_alls(group)
-      group.running_example = nil
       success
     end
 
@@ -239,8 +211,8 @@ module Micronaut
     end
 
     def self.to_s
-      self == Micronaut::Behaviour ? 'Micronaut::Behaviour' : @metadata[:behaviour][:name]
+      self == Micronaut::Behaviour ? 'Micronaut::Behaviour' : name
     end
     
   end
-end
+end

data/lib/micronaut/example.rb

@@ -18,6 +18,55 @@ module Micronaut
     def to_s
       inspect
     end
+
+    def run_before_each
+      @behaviour_instance._setup_mocks
+      @behaviour.eval_before_eachs(@behaviour_instance)
+    end
+
+    def run_after_each
+      @behaviour.eval_after_eachs(@behaviour_instance)
+      @behaviour_instance._verify_mocks
+    ensure
+      @behaviour_instance._teardown_mocks
+    end
+
+    def run_example
+      if example_block
+        @behaviour_instance.instance_eval(&example_block)
+        @behaviour_instance._verify_mocks
+        @reporter.example_passed(self)
+      else
+        @reporter.example_pending(self, 'Not yet implemented')
+      end
+    end
+
+    def run(behaviour_instance, reporter)
+      @behaviour_instance, @reporter = behaviour_instance, reporter
+      @behaviour_instance.running_example = self
+      @reporter.example_started(self)
+
+      all_systems_nominal = true
+
+      begin
+        run_before_each
+        run_example
+      rescue Exception => e
+        @reporter.example_failed(self, e)
+        all_systems_nominal = false
+      end
+
+      begin
+        run_after_each
+      rescue Exception => e
+        @reporter.example_failed(self, e)
+        all_systems_nominal = false
+      ensure
+        @behaviour_instance.running_example = nil
+      end
+
+      all_systems_nominal
+    end
   
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.8.3
+  version: 0.1.8.5
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2009-01-03 00:00:00 -08:00
+date: 2009-01-05 00:00:00 -08:00
 default_executable: micronaut
 dependencies: []