spicycode-micronaut 0.1.5 → 0.1.5.2

data/Rakefile

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

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

@@ -100,8 +100,20 @@ describe Micronaut::Formatters::BaseFormatter do
     @formatter.should have_interface_for(:dump_pending).with(0).arguments
   end
 
-  it "should have close  as an interface with zero arguments" do
+  it "should have close as an interface with zero arguments" do
     @formatter.should have_interface_for(:close).with(0).arguments
   end
   
+  describe 'dealing with backtrace' do
+    
+    it "should ensure ':' in the first backtrace" do
+      backtrace = ["/tmp/x.rb:1", "/tmp/x.rb:2", "/tmp/x.rb:3"]
+      @formatter.format_backtrace(backtrace).should == backtrace
+
+      backtrace = ["/tmp/x.rb:1: message", "/tmp/x.rb:2", "/tmp/x.rb:3"]
+      @formatter.format_backtrace(backtrace).first.should == "/tmp/x.rb:1: message"
+    end
+    
+  end
+  
 end

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

@@ -57,12 +57,4 @@ describe Micronaut::Formatters::ProgressFormatter do
      @output.string.should == ""
    end
    
-   it "should ensure ':' in the first backtrace" do
-     backtrace = ["/tmp/x.rb:1", "/tmp/x.rb:2", "/tmp/x.rb:3"]
-     @formatter.format_backtrace(backtrace).should == backtrace
-   
-     backtrace = ["/tmp/x.rb:1: message", "/tmp/x.rb:2", "/tmp/x.rb:3"]
-     @formatter.format_backtrace(backtrace).first.should == "/tmp/x.rb:1: message"
-   end
-   
 end

data/lib/micronaut/behaviour.rb

@@ -67,7 +67,8 @@ module Micronaut
       metadata[:described_type] = args.first.is_a?(String) ? self.superclass.described_type : args.shift
       metadata[:description] = args.shift || ''
       metadata[:name] = "#{metadata[:described_type]} #{metadata[:description]}".strip
-      
+      metadata[:describe_block] = metadata[:options].delete(:describe_block)
+      metadata[:file_path] = eval("caller(0)[0]", metadata[:describe_block].binding)
       Micronaut.configuration.find_modules(self).each do |include_or_extend, mod, opts|
         if include_or_extend == :extend
           send(:extend, mod) unless extended_modules.include?(mod)
@@ -100,6 +101,8 @@ module Micronaut
     def self.describe(*args, &describe_block)
       raise ArgumentError if args.empty? || describe_block.nil?
       subclass('NestedLevel') do
+        args << {} unless args.last.is_a?(Hash)
+        args.last.update(:describe_block => describe_block)
         set_it_up(*args)
         module_eval(&describe_block)
       end

data/lib/micronaut/formatters/base_formatter.rb

@@ -104,9 +104,15 @@ module Micronaut
       def close
       end
       
-      def format_backtrace(backtrace)
+      def format_backtrace(backtrace, example)
         return "" if backtrace.nil?
         cleansed = backtrace.map { |line| backtrace_line(line) }.compact
+        original_file = example.behaviour.metadata[:file_path].split(':').first.strip
+        # cleansed = cleansed.select do |line|
+        #   line.split(':').first.downcase == original_file.downcase
+        # end
+        # we really just want it to remove the last line if there are more than 1 lines, as it is always
+        # junk
         cleansed.empty? ? backtrace : cleansed
       end
       
@@ -119,8 +125,14 @@ module Micronaut
         line
       end
       
-      def read_failed_line(file_path_with_line_number)
-        file_path, line_number = file_path_with_line_number.split(':')
+      def read_failed_line(exception, example)
+        original_file = example.options[:caller].split(':').first.strip
+        matching_line = exception.backtrace.find do |line|
+          line.split(':').first.downcase == original_file.downcase
+        end
+        return "Unable to find matching line from backtrace" if matching_line.nil?
+        
+        file_path, line_number = matching_line.split(':')
         open(file_path, 'r') { |f| f.readlines[line_number.to_i - 1] }
       end
       

data/lib/micronaut/formatters/base_text_formatter.rb

@@ -31,9 +31,11 @@ module Micronaut
           example, exception = examples_with_exception.first, examples_with_exception.last
           padding = '    '
           output.puts "#{index.next}) #{example}"
-          output.puts "#{padding}#{colorise(exception.message, exception).strip}\n\n"
-          output.puts "#{padding}failing statement: #{read_failed_line(exception.backtrace[4]).strip}"
-          format_backtrace(exception.backtrace).each do |backtrace_info|
+          output.puts "#{padding}Failure/Error: #{read_failed_line(exception, example).strip}"
+          exception.message.split("\n").each do |line|
+            output.puts "#{padding}#{colorise(line, exception).strip}"
+          end
+          format_backtrace(exception.backtrace, example).each do |backtrace_info|
             output.puts grey("#{padding}# #{backtrace_info}")
           end
           output.puts 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.5.2
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2008-12-20 00:00:00 -08:00
+date: 2008-12-22 00:00:00 -08:00
 default_executable: micronaut
 dependencies: []