spicycode-micronaut 0.1.4.3 → 0.1.4.4

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 
 GEM = "micronaut"
-GEM_VERSION = "0.1.4.3"
+GEM_VERSION = "0.1.4.4"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://spicycode.com"

data/examples/example_helper.rb

@@ -37,6 +37,6 @@ Micronaut.configure do |config|
   config.color_enabled = use_color?
   config.formatter = :progress
   config.profile_examples = false
-  config.filter_run :options => { :focused => true, :using_mocks => true }
+  config.filter_run :options => { :focused => true }
   config.autorun!
 end

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

@@ -84,16 +84,16 @@ describe Micronaut::Formatters::BaseFormatter do
     @formatter.should have_interface_for(:example_pending).with(2).arguments
   end
 
-  it "should have start_dump as an interface with zero arguments" do
-    @formatter.should have_interface_for(:start_dump).with(0).arguments
+  it "should have start_dump as an interface with 1 arguments" do
+    @formatter.should have_interface_for(:start_dump).with(1).arguments
   end
 
   it "should have dump_failures as an interface with no arguments" do
     @formatter.should have_interface_for(:dump_failures).with(0).arguments
   end
 
-  it "should have dump_summary as an interface with 4 arguments" do
-    @formatter.should have_interface_for(:dump_summary).with(4).arguments
+  it "should have dump_summary as an interface with zero arguments" do
+    @formatter.should have_interface_for(:dump_summary).with(0).arguments
   end
 
   it "should have dump_pending as an interface with zero arguments" do

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

@@ -2,64 +2,67 @@ require File.expand_path(File.dirname(__FILE__) + "/../../../example_helper")
 
 describe Micronaut::Formatters::ProgressFormatter do
   
-  before do
-    @output = StringIO.new
-    @formatter = Micronaut::Formatters::ProgressFormatter.new
-    @formatter.stubs(:color_enabled?).returns(false)
-    @formatter.stubs(:output).returns(@output)
-  end
-
-  it "should produce line break on start dump" do
-    @formatter.start_dump
-    @output.string.should == "\n"
-  end
-
-  it "should produce standard summary without pending when pending has a 0 count" do
-    @formatter.dump_summary(3, 2, 1, 0)
-    @output.string.should =~ /Finished in 3 seconds\n2 examples, 1 failures/i
-  end
-  
-  it "should produce standard summary" do
-    @formatter.example_pending(running_example, "message")
-    @output.rewind
-    @formatter.dump_summary(3, 2, 1, 1)
-    @output.string.should =~ /Finished in 3 seconds\n2 examples, 1 failures, 1 pending/i
-  end
-  
-  describe "when color is enabled" do
-    
-    before do
-      @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
-
-  it "should ensure two ':' in the first backtrace" do
-    backtrace = ["/tmp/x.rb:1", "/tmp/x.rb:2", "/tmp/x.rb:3"]
-    @formatter.format_backtrace(backtrace).should == "/tmp/x.rb:1"
-
-    backtrace = ["/tmp/x.rb:1: message", "/tmp/x.rb:2", "/tmp/x.rb:3"]
-    @formatter.format_backtrace(backtrace).should == "/tmp/x.rb:1: message"
-  end
-  
+   before do
+     @output = StringIO.new
+     @formatter = Micronaut::Formatters::ProgressFormatter.new
+     @formatter.start(2)
+     @formatter.stubs(:color_enabled?).returns(false)
+     @formatter.stubs(:output).returns(@output)
+   end
+   
+   it "should produce line break on start dump" do
+     @formatter.start_dump(3)
+     @output.string.should == "\n"
+   end
+   
+   it "should produce standard summary without pending when pending has a 0 count" do
+     @formatter.start_dump(3)
+     @formatter.dump_summary
+     @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(: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
+   
+   it "should ensure two ':' in the first backtrace" do
+     backtrace = ["/tmp/x.rb:1", "/tmp/x.rb:2", "/tmp/x.rb:3"]
+     @formatter.format_backtrace(backtrace).should == "/tmp/x.rb:1"
+   
+     backtrace = ["/tmp/x.rb:1: message", "/tmp/x.rb:2", "/tmp/x.rb:3"]
+     @formatter.format_backtrace(backtrace).should == "/tmp/x.rb:1: message"
+   end
+   
 end

data/lib/micronaut/behaviour.rb

@@ -166,7 +166,7 @@ module Micronaut
       eval_before_alls(group)
       success = true
 
-      examples.each do |ex|
+      examples_to_run.each do |ex|
         group.running_example = ex
         reporter.example_started(ex)
 

data/lib/micronaut/formatters/base_formatter.rb

@@ -2,10 +2,12 @@ module Micronaut
   module Formatters
 
     class BaseFormatter
-      attr_accessor :behaviour
+      attr_accessor :behaviour, :total_example_failed, :total_example_pending
+      attr_reader :example_count, :duration
       
       def initialize
-        @total_example_failed, @total_example_pending, @behaviour = 0, 0, nil
+        @total_example_failed, @total_example_pending, @example_count = 0, 0, 0
+        @behaviour = nil
       end
       
       def configuration
@@ -24,14 +26,6 @@ module Micronaut
         configuration.color_enabled?
       end
       
-      def total_example_failed
-        @total_example_failed
-      end
-      
-      def total_example_pending
-        @total_example_pending
-      end
-      
       def example_profiling_info
         @example_profiling_info ||= []
       end
@@ -51,6 +45,7 @@ module Micronaut
       # This method will only be invoked once, and the next one to be invoked
       # is #add_behaviour
       def start(example_count)
+        @example_count = example_count
       end
 
       # This method is invoked at the beginning of the execution of each behaviour.
@@ -89,7 +84,8 @@ module Micronaut
 
       # 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
+      def start_dump(duration)
+        @duration = duration
       end
 
       # Dumps detailed information about each example failure.
@@ -97,7 +93,7 @@ module Micronaut
       end
 
       # This method is invoked after the dumping of examples and failures.
-      def dump_summary(duration, example_count, failure_count, pending_count)
+      def dump_summary
       end
 
       # This gets invoked after the summary if option is set to do so.

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -47,7 +47,10 @@ module Micronaut
         end
       end
 
-      def dump_summary(duration, example_count, failure_count, pending_count)
+      def dump_summary
+        failure_count = failed_examples.size
+        pending_count = pending_examples.size
+
         output.puts "\nFinished in #{duration} seconds\n"
 
         summary = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failures"

data/lib/micronaut/formatters/progress_formatter.rb

@@ -21,7 +21,8 @@ module Micronaut
         output.flush
       end
 
-      def start_dump
+      def start_dump(duration)
+        super
         output.puts
         output.flush
       end

data/lib/micronaut/runner.rb

@@ -10,43 +10,44 @@ module Micronaut
       at_exit { Micronaut::Runner.new.run(ARGV) ? exit(0) : exit(1) } unless installed_at_exit?
       @installed_at_exit = true
     end
-    
+
     def configuration
       Micronaut.configuration
     end
-    
+
     def formatter
       Micronaut.configuration.formatter
     end
-     
+
     def require_all_behaviours(files_from_args=[])
       files_from_args.each { |file| require file }
     end
-    
+
     def run(args = [])
       require_all_behaviours(args)
-      
+
       total_examples_to_run = Micronaut.world.total_examples_to_run
 
       old_sync, formatter.output.sync = formatter.output.sync, true if formatter.output.respond_to?(:sync=)
 
-      formatter.start(total_examples_to_run)
-
       suite_success = true
 
-      starts_at = Time.now
+      formatter_supports_sync = formatter.output.respond_to?(:sync=)
+      old_sync, formatter.output.sync = formatter.output.sync, true if formatter_supports_sync
+
+      formatter.start(total_examples_to_run) # start the clock
+      start = Time.now
       Micronaut.world.behaviours_to_run.each do |behaviour|
         suite_success &= behaviour.run(formatter)
       end
-      duration = Time.now - starts_at
-
-      formatter.start_dump
+      formatter.start_dump(Time.now - start)
+      
       formatter.dump_failures
-      # TODO: Stop passing in the last two items, the formatter knows this info
-      formatter.dump_summary(duration, total_examples_to_run, formatter.failed_examples.size, formatter.pending_examples.size)
+      formatter.dump_summary
       formatter.dump_pending
-
-      formatter.output.sync = old_sync if formatter.output.respond_to? :sync=
+      formatter.close
+      
+      formatter.output.sync = old_sync if formatter_supports_sync
 
       suite_success
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.4.3
+  version: 0.1.4.4
 platform: ruby
 authors: 
 - Chad Humphries