rsanheim-micronaut 0.1.3.2 → 0.1.4.1

data/examples/lib/micronaut/world_example.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../example_helper")
 
 class Bar; end
+class Foo; end
 
 describe Micronaut::World do
 
@@ -23,13 +24,25 @@ describe Micronaut::World do
       @bg1 = Micronaut::Behaviour.describe(Bar, "find group-1", options_1) { }
       @bg2 = Micronaut::Behaviour.describe(Bar, "find group-2", options_2) { }
       @bg3 = Micronaut::Behaviour.describe(Bar, "find group-3", options_3) { }
-      @behaviours = [@bg1, @bg2, @bg3]
+      @bg4 = Micronaut::Behaviour.describe(Foo, "find these examples") do
+        it('I have no options') {}
+        it("this is awesome", :awesome => true) {}
+        it("this is too", :awesome => true) {}
+        it("not so awesome", :awesome => false) {}
+        it("I also have no options") {}
+      end
+      @behaviours = [@bg1, @bg2, @bg3, @bg4]
     end
 
     after(:all) do
       Micronaut::World.behaviours.delete(@bg1)
       Micronaut::World.behaviours.delete(@bg2)
       Micronaut::World.behaviours.delete(@bg3)
+      Micronaut::World.behaviours.delete(@bg4)
+    end
+    
+    it "should find awesome examples" do
+      Micronaut::World.find(@bg4.examples, :options => {:awesome => true}).should == [@bg4.examples[1], @bg4.examples[2]]
     end
     
     it "should find no groups when given no search parameters" do

data/lib/micronaut/behaviour.rb

@@ -45,7 +45,7 @@ module Micronaut
     end
 
     def self.it(desc=nil, options={}, &block)
-      examples << Micronaut::Example.new(self, desc, options, block)
+      examples << Micronaut::Example.new(self, desc, options.update(:caller => caller[0]), block)
     end
     
     def self.focused(desc=nil, options={}, &block)
@@ -206,6 +206,6 @@ module Micronaut
     def self.to_s
       self == Micronaut::Behaviour ? 'Micronaut::Behaviour' : name
     end
-
+    
   end
 end

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -33,17 +33,24 @@ module Micronaut
         @failed_examples << [example, exception]
       end
 
-      def dump_failures        
+      def dump_failures
         @output.puts
         @failed_examples.each_with_index do |examples_with_exception, index|
           example, exception = examples_with_exception.first, examples_with_exception.last
+          padding = '    '
           @output.puts "#{index.next}) #{example}"
-          @output.puts colorise(exception.message, exception)
-          @output.puts format_backtrace(exception.backtrace)
+          # @output.puts "#{padding}failing statement:  #{read_failed_line(example.options[:caller])}\n"
+          @output.puts "#{padding}#{colorise(exception.message, exception).strip}"
+          @output.puts grey("#{padding}# #{format_backtrace(exception.backtrace)}")
           @output.puts 
           @output.flush
         end
       end
+      
+      def read_failed_line(file_path_with_line_number)
+        file_path, line_number = file_path_with_line_number.split(':')
+        open(file_path, 'r') { |f| f.readlines[line_number.to_i + 1].strip }
+      end
 
       def colorise(s, failure)
         if failure.is_a?(Micronaut::Expectations::ExpectationNotMetError)
@@ -56,7 +63,7 @@ module Micronaut
       def dump_summary(duration, example_count, failure_count, pending_count)
         @output.puts "\nFinished in #{duration} seconds\n"
 
-        summary = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+        summary = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failures"
         summary << ", #{pending_count} pending" if pending_count > 0  
 
         if failure_count == 0
@@ -74,6 +81,7 @@ module Micronaut
           @output.puts "\nTop 10 slowest examples:\n"        
           sorted_examples.last(10).reverse.each do |desc, time|
             @output.puts "  (#{sprintf("%.7f", time)} seconds) #{desc}"
+            @output.puts grey("   # #{desc.options[:caller]}")
           end
         end
         
@@ -86,6 +94,7 @@ module Micronaut
           @output.puts "Pending:"
           @pending_examples.each do |pending_example, message|
             @output.puts "\n  #{pending_example.behaviour}\n  - #{pending_example.description}"
+            @output.puts grey("    # #{pending_example.options[:caller]}")
           end
         end
         @output.flush
@@ -99,8 +108,8 @@ module Micronaut
 
       def format_backtrace(backtrace)
         return "" if backtrace.nil?
-        cleansed = backtrace.map { |line| backtrace_line(line) }.compact.join("\n")
-        cleansed.empty? ? backtrace : cleansed
+        cleansed = backtrace.map { |line| backtrace_line(line) }.compact
+        cleansed.empty? ? backtrace.join("\n") : cleansed.first
       end
 
       protected
@@ -140,6 +149,10 @@ module Micronaut
       def blue(text)
         color(text, "\e[34m")
       end
+      
+      def grey(text)
+        color(text, "\e[90m")
+      end
 
     end
     

data/lib/micronaut/runner.rb

@@ -41,11 +41,10 @@ module Micronaut
       duration = Time.now - starts_at
 
       options.formatter.start_dump
-      options.formatter.dump_pending
       options.formatter.dump_failures
-
       # TODO: Stop passing in the last two items, the formatter knows this info
       options.formatter.dump_summary(duration, total_examples, options.formatter.failed_examples.size, options.formatter.pending_examples.size)
+      options.formatter.dump_pending
 
       options.formatter.output.sync = old_sync if options.formatter.output.respond_to? :sync=
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rsanheim-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.3.2
+  version: 0.1.4.1
 platform: ruby
 authors: 
 - Chad Humphries