spicycode-micronaut 0.2.4 → 0.2.5

data/Rakefile

@@ -12,6 +12,8 @@ begin
     s.authors = ["Chad Humphries"] 
     s.files =  FileList["[A-Z]*", "{bin,lib,examples}/**/*"] 
   end 
+rescue => e
+  puts "Jeweler, or one of its dependencies blew right up. #{e}"
 rescue LoadError 
   puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com" 
 end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
 :major: 0
 :minor: 2
+:patch: 5

data/examples/example_helper.rb

@@ -8,9 +8,7 @@ def with_ruby(version)
   yield if RUBY_PLATFORM =~ Regexp.compile("^#{version}")
 end
 
-with_ruby("1.8") do
-  gem :mocha
-end
+with_ruby("1.8") { gem :mocha }
 
 require File.expand_path(File.dirname(__FILE__) + "/resources/example_classes")
 
@@ -45,5 +43,6 @@ Micronaut.configure do |c|
   c.mock_with :mocha
   c.color_enabled = not_in_editor?
   c.filter_run :focused => true
+  c.profile_examples = true
   #c.formatter = :documentation
 end

data/examples/lib/micronaut/behaviour_example.rb

@@ -236,7 +236,7 @@ describe Micronaut::Behaviour do
 
   end
 
-  describe "#run_examples" do
+  pending "#run_examples" do
 
     def stub_behaviour
       stub_everything('behaviour', :metadata => { :behaviour => { :name => 'behaviour_name' }})
@@ -290,7 +290,12 @@ describe Micronaut::Behaviour do
 
 
     it "should be able to access the before all ivars in the before_all_ivars hash" do
-      running_example.behaviour.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
+      with_ruby('1.8') do
+        running_example.behaviour.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
+      end
+      with_ruby('1.9') do
+        running_example.behaviour.before_all_ivars.should include(:@before_all_top_level => 'before_all_top_level')
+      end
     end
     
     describe "but now I am nested" do

data/examples/lib/micronaut/formatters/base_formatter_example.rb

@@ -76,12 +76,8 @@ describe Micronaut::Formatters::BaseFormatter do
     @formatter.should have_interface_for(:example_started).with(1).argument
   end
 
-  it "should have example_failed as an interface with two arguments" do
-    @formatter.should have_interface_for(:example_failed).with(2).arguments
-  end
-
-  it "should have example_pending as an interface with two arguments" do
-    @formatter.should have_interface_for(:example_pending).with(2).arguments
+  it "should have example_finished as an interface with one argument" do
+    @formatter.should have_interface_for(:example_finished).with(1).arguments
   end
 
   it "should have start_dump as an interface with 1 arguments" do
@@ -122,4 +118,4 @@ describe Micronaut::Formatters::BaseFormatter do
     
   end
   
-end
+end

data/examples/lib/micronaut/formatters/progress_formatter_example.rb

@@ -21,41 +21,9 @@ describe Micronaut::Formatters::ProgressFormatter do
      @output.string.should =~ /Finished in 3 seconds\n2 examples/i
    end
    
-   it "should produce standard summary" do
-     @formatter.start_dump(3)
-     @formatter.example_pending(running_example, "message")
-     @output.rewind
-     @formatter.dump_summary
-     @output.string.should =~ /Finished in 3 seconds\n2 examples/i
-   end
-   
-   describe "when color is enabled" do
-     
-     before do
-       @formatter.stubs(:trace?).returns(false)
-       @formatter.stubs(:color_enabled?).returns(true)
-     end
-   
-     it "should output a green dot for passing spec" do
-       @formatter.example_passed("spec")
-       @output.string.should == "\e[32m.\e[0m"
-     end
-   
-     it "should push red F for failure spec" do
-       @formatter.example_failed("spec", Micronaut::Expectations::ExpectationNotMetError.new)
-       @output.string.should == "\e[31mF\e[0m"
-     end
-   
-     it "should push magenta F for error spec" do
-       @formatter.example_failed("spec", RuntimeError.new)
-       @output.string.should == "\e[35mF\e[0m"
-     end
-     
-   end
-   
    it "should push nothing on start" do
      @formatter.start(4)
      @output.string.should == ""
    end
    
-end
+end

data/lib/micronaut/behaviour.rb

@@ -50,7 +50,7 @@ module Micronaut
     def self.example(desc=nil, options={}, &block)
       examples << Micronaut::Example.new(self, desc, options.update(:caller => caller[0]), block)
     end
-
+        
     def self.alias_example_to(new_alias, extra_options={})
       new_alias = <<-END_RUBY
                     def self.#{new_alias}(desc=nil, options={}, &block)
@@ -62,7 +62,7 @@ module Micronaut
                   END_RUBY
       module_eval(new_alias, __FILE__, __LINE__)
     end
-    
+
     alias_example_to :it
     alias_example_to :focused, :focused => true
     alias_example_to :disabled, :disabled => true
@@ -196,7 +196,7 @@ module Micronaut
     
     # Runs all examples, returning true only if all of them pass
     def self.run_examples(behaviour_instance, reporter)
-      examples_to_run.map { |ex| ex.run(behaviour_instance, reporter) }.all?
+      examples_to_run.map { |ex| ex.run(behaviour_instance) }.all?
     end
 
     def self.subclass(base_name, &body) # :nodoc:

data/lib/micronaut/example.rb

@@ -8,15 +8,40 @@ module Micronaut
       @behaviour, @description, @options, @example_block = behaviour, desc, options, example_block
       @metadata = @behaviour.metadata.dup
       @metadata[:description] = description
+      @metadata[:execution_result] = {}
       @metadata.update(options)
     end
 
-    def inspect
-      "#{@metadata[:behaviour][:name]} - #{@metadata[:description]}"
+    def record_results(results={})
+      @metadata[:execution_result].update(results)
+    end
+
+    def execution_result
+      @metadata[:execution_result]
     end
     
-    def to_s
-      inspect
+    def run_started
+      record_results :started_at => Time.now
+      Micronaut.configuration.formatter.example_started(self)
+    end
+
+    def run_passed
+      run_finished 'passed'
+    end
+
+    def run_pending(message='Not yet implemented')
+      run_finished 'pending', :pending_message => message
+    end
+
+    def run_failed(exception)
+      run_finished 'failed', :exception_encountered => exception
+    end
+
+    def run_finished(status, results={})
+      record_results results.update(:status => status)
+      finish_time = Time.now
+      record_results :finished_at => finish_time, :run_time => (finish_time - execution_result[:started_at])
+      Micronaut.configuration.formatter.example_finished(self)
     end
 
     def run_before_each
@@ -34,16 +59,17 @@ module Micronaut
     def run_example
       if example_block
         @behaviour_instance.instance_eval(&example_block)
-        @reporter.example_passed(self)
+        run_passed
       else
-        @reporter.example_pending(self, 'Not yet implemented')
+        run_pending
       end
     end
 
-    def run(behaviour_instance, reporter)
-      @behaviour_instance, @reporter = behaviour_instance, reporter
+    def run(behaviour_instance)
+      @behaviour_instance = behaviour_instance
       @behaviour_instance.running_example = self
-      @reporter.example_started(self)
+
+      run_started
 
       all_systems_nominal = true
       exception_encountered = nil
@@ -64,11 +90,19 @@ module Micronaut
       ensure
         @behaviour_instance.running_example = nil
       end
-      
-      @reporter.example_failed(self, exception_encountered) if exception_encountered 
+
+      run_failed(exception_encountered) if exception_encountered
 
       all_systems_nominal
     end
+
+    def inspect
+      "#{@metadata[:behaviour][:name]} - #{@metadata[:description]}"
+    end
+    
+    def to_s
+      inspect
+    end
   
   end
   

data/lib/micronaut/formatters/base_formatter.rb

@@ -2,11 +2,12 @@ module Micronaut
   module Formatters
 
     class BaseFormatter
-      attr_accessor :behaviour, :total_example_failed, :total_example_pending
-      attr_reader :example_count, :duration
+      attr_accessor :behaviour
+      attr_reader :example_count, :duration, :examples
       
       def initialize
-        @total_example_failed, @total_example_pending, @example_count = 0, 0, 0
+        @example_count = 0
+        @examples = []
         @behaviour = nil
       end
       
@@ -35,16 +36,12 @@ module Micronaut
         configuration.color_enabled?
       end
       
-      def example_profiling_info
-        @example_profiling_info ||= []
-      end
-      
       def pending_examples
-        @pending_examples ||= []
+        @pending_examples ||= ::Micronaut.world.find(examples, :execution_result => { :status => 'pending' })
       end
       
       def failed_examples
-        @failed_examples ||= []
+        @failed_examples ||= ::Micronaut.world.find(examples, :execution_result => { :status => 'failed' })
       end
 
       # This method is invoked before any examples are run, right after
@@ -57,6 +54,13 @@ module Micronaut
         @example_count = example_count
       end
 
+      def example_started(example)
+      end
+
+      def example_finished(example)
+        examples << example
+      end
+
       # This method is invoked at the beginning of the execution of each behaviour.
       # +behaviour+ is the behaviour.
       #
@@ -65,31 +69,6 @@ module Micronaut
         @behaviour = behaviour
       end
 
-      # This method is invoked when an +example+ starts.
-      def example_started(example)
-      end
-
-      # This method is invoked when an +example+ passes.
-      def example_passed(example)
-      end
-
-      # This method is invoked when an +example+ fails, i.e. an exception occurred
-      # inside it (such as a failed should or other exception). +counter+ is the 
-      # sequence number of the failure (starting at 1) and +failure+ is the associated 
-      # exception.
-      def example_failed(example, exception)
-        @total_example_failed += 1
-      end
-
-      # This method is invoked when an example is not yet implemented (i.e. has not
-      # been provided a block), or when an ExamplePendingError is raised.
-      # +message+ is the message from the ExamplePendingError, if it exists, or the
-      # default value of "Not Yet Implemented"
-      # +pending_caller+ is the file and line number of the spec which
-      # has called the pending method
-      def example_pending(example, message)
-      end
-
       # This method is invoked after all of the examples have executed. The next method
       # to be invoked after this one is #dump_failure (once for each failed example),
       def start_dump(duration)

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -3,33 +3,11 @@ module Micronaut
   module Formatters
 
     class BaseTextFormatter < BaseFormatter
-            
-      def example_passed(example)
-        super
-        # Why && @start_time
-        if profile_examples? && @start_time
-          example_profiling_info << [example, Time.now - @start_time] 
-        end
-      end
       
-      def example_started(example)
-        super
-        @start_time = Time.now
-      end
-
-      def example_pending(example, message)
-        pending_examples << [example, message]
-      end
-
-      def example_failed(example, exception)
-        super
-        failed_examples << [example, exception]
-      end
-
       def dump_failures
         output.puts
-        failed_examples.each_with_index do |examples_with_exception, index|
-          failed_example, exception = examples_with_exception.first, examples_with_exception.last
+        failed_examples.each_with_index do |failed_example, index|
+          exception = failed_example.execution_result[:exception_encountered]
           padding = '    '
           
           output.puts "#{index.next}) #{failed_example}"
@@ -77,11 +55,11 @@ module Micronaut
         
         # Don't print out profiled info if there are failures, it just clutters the output
         if profile_examples? && failure_count == 0
-          sorted_examples = example_profiling_info.sort_by { |desc, time| time }.last(10)
+          sorted_examples = examples.sort_by { |example| example.execution_result[:run_time] }.reverse.first(10)
           output.puts "\nTop #{sorted_examples.size} slowest examples:\n"        
-          sorted_examples.reverse.each do |ex, time|
-            output.puts "  (#{sprintf("%.7f", time)} seconds) #{ex}"
-            output.puts grey("   # #{ex.metadata[:caller]}")
+          sorted_examples.each do |example|
+            output.puts "  (#{sprintf("%.7f", example.execution_result[:run_time])} seconds) #{example}"
+            output.puts grey("   # #{example.metadata[:caller]}")
           end
         end
         
@@ -154,4 +132,4 @@ module Micronaut
     
   end
 
-end
+end

data/lib/micronaut/formatters/documentation_formatter.rb

@@ -25,9 +25,27 @@ module Micronaut
         @previous_nested_behaviours = described_behaviour_chain
       end
 
-      def example_failed(example, exception)
+      def output_for(example)
+        case example.execution_result[:status]
+        when 'failed'
+          failure_output(example, example.execution_result[:exception_encountered])
+        when 'pending'
+          pending_output(example, example.execution_result[:pending_message])
+        when 'passed'
+          passed_output(example)
+        else
+          red(example.execution_result[:status])
+        end
+      end
+
+      def example_finished(example)
         super
-        expectation_not_met = exception.is_a?(Micronaut::Expectations::ExpectationNotMetError)
+        output.puts output_for(example)
+        output.flush
+      end
+
+      def failure_output(example, exception)
+        expectation_not_met = exception.is_a?(::Micronaut::Expectations::ExpectationNotMetError)
         
         message = if expectation_not_met
           "#{current_indentation}#{example.description} (FAILED)"
@@ -35,20 +53,15 @@ module Micronaut
           "#{current_indentation}#{example.description} (ERROR)"
         end
 
-        output.puts(expectation_not_met ? red(message) : magenta(message))
-        output.flush
+        expectation_not_met ? red(message) : magenta(message)
       end
 
-      def example_passed(example)
-        super
-        output.puts green("#{current_indentation}#{example.description}")
-        output.flush
+      def passed_output(example)
+        green("#{current_indentation}#{example.description}")
       end
 
-      def example_pending(example, message)
-        super
-        output.puts yellow("#{current_indentation}#{example.description} (PENDING: #{message})")
-        output.flush
+      def pending_output(example, message)
+        yellow("#{current_indentation}#{example.description} (PENDING: #{message})")
       end
 
       def current_indentation
@@ -62,4 +75,4 @@ module Micronaut
     end
     
   end
-end
+end

data/lib/micronaut/formatters/progress_formatter.rb

@@ -3,22 +3,19 @@ module Micronaut
     
     class ProgressFormatter < BaseTextFormatter
       
-      def example_failed(example, exception)
-        super
-        output.print colorise('F', exception)
-        output.flush
+      def output_for(example)
+        case example.execution_result[:status]
+        when 'failed' then colorise('F', example.execution_result[:exception_encountered])
+        when 'pending' then yellow('*')
+        when 'passed' then green('.')
+        else
+          red(example.execution_result[:status])
+        end
       end
 
-      def example_passed(example)
+      def example_finished(example)
         super
-        output.print green('.')
-        output.flush
-      end
-
-      def example_pending(example, message)
-        super
-        output.print yellow('*')
-        output.flush
+        output.print output_for(example)
       end
 
       def start_dump(duration)
@@ -27,11 +24,7 @@ module Micronaut
         output.flush
       end
 
-      def method_missing(sym, *args)
-        # ignore
-      end
-      
     end
     
   end
-end
+end

data/lib/micronaut/world.rb

@@ -18,7 +18,7 @@ module Micronaut
       if filter
         @behaviours_to_run = filter_behaviours
         if @behaviours_to_run.size == 0 && Micronaut.configuration.run_all_when_everything_filtered?
-          puts "No behaviours were matched by #{filter.inspect}, running all"
+          puts "No examples were matched by #{filter.inspect}, running all"
           # reset the behaviour list to all behaviours, and add back all examples
           @behaviours_to_run = @behaviours
           @behaviours.each { |b| b.examples_to_run.replace(b.examples) }

data/lib/micronaut.rb

@@ -31,7 +31,6 @@ module Micronaut
 
   def self.configure
     yield configuration if block_given?
-    configuration.autorun!
   end
   
   def self.world

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-13 00:00:00 -08:00
+date: 2009-03-10 00:00:00 -07:00
 default_executable: micronaut
 dependencies: []
 
@@ -19,8 +19,9 @@ executables:
 - micronaut
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
+- LICENSE
 files: 
 - History.txt
 - LICENSE