@@ -3,7 +3,7 @@ require 'rake/gempackagetask' require 'rubygems/specification' GEM = "micronaut" -GEM_VERSION = "0.1.4.4" +GEM_VERSION = "0.1.5" AUTHOR = "Chad Humphries" EMAIL = "chad@spicycode.com" HOMEPAGE = "http://spicycode.com" Rakefile @@ -1,4 +1,4 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib') +$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib')) require 'micronaut' Micronaut.configuration.autorun! \ No newline at end of file bin/micronaut @@ -57,12 +57,12 @@ describe Micronaut::Formatters::ProgressFormatter do @output.string.should == "" end - it "should ensure two ':' in the first 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 == "/tmp/x.rb:1" + @formatter.format_backtrace(backtrace).should == backtrace backtrace = ["/tmp/x.rb:1: message", "/tmp/x.rb:2", "/tmp/x.rb:3"] - @formatter.format_backtrace(backtrace).should == "/tmp/x.rb:1: message" + @formatter.format_backtrace(backtrace).first.should == "/tmp/x.rb:1: message" end end \ No newline at end of file examples/lib/micronaut/formatters/progress_formatter_example.rb @@ -2,4 +2,40 @@ require File.expand_path(File.dirname(__FILE__) + "/../../example_helper") describe Micronaut::Runner do + before do + @runner = Micronaut::Runner.new + end + + describe '#configuration' do + + it "should return Micronaut.configuration" do + @runner.configuration.should == Micronaut.configuration + end + + end + + describe '#formatter' do + + it 'should return the configured formatter' do + @runner.formatter.should == Micronaut.configuration.formatter + end + + end + + describe 'Micronaut::Runner.at_exit' do + + it 'should set an at_exit hook if none is already set' do + Micronaut::Runner.stubs(:installed_at_exit?).returns(false) + Micronaut::Runner.expects(:at_exit) + Micronaut::Runner.autorun + end + + it 'should not set the at_exit hook if it is already set' do + Micronaut::Runner.stubs(:installed_at_exit?).returns(true) + Micronaut::Runner.expects(:at_exit).never + Micronaut::Runner.autorun + end + + end + end \ No newline at end of file examples/lib/micronaut/runner_example.rb @@ -23,7 +23,7 @@ module Micronaut def initialize - @backtrace_clean_patterns = [/\/lib\/ruby\//, /bin\/rcov:/, /vendor\/rails/] + @backtrace_clean_patterns = [/\/lib\/ruby\//, /bin\/rcov:/, /vendor\/rails/, /bin\/micronaut/] @profile_examples = false @run_all_when_everything_filtered = true @filter = nil @@ -31,7 +31,7 @@ module Micronaut end def cleaned_from_backtrace?(line) - return true if line.starts_with?(::Micronaut::InstallDirectory) + return true if line =~ /#{::Micronaut::InstallDirectory}/ @backtrace_clean_patterns.any? do |pattern| line =~ pattern lib/micronaut/configuration.rb @@ -107,7 +107,7 @@ module Micronaut def format_backtrace(backtrace) return "" if backtrace.nil? cleansed = backtrace.map { |line| backtrace_line(line) }.compact - cleansed.empty? ? backtrace.join("\n") : cleansed.first + cleansed.empty? ? backtrace : cleansed end protected @@ -121,7 +121,7 @@ module Micronaut 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 } + open(file_path, 'r') { |f| f.readlines[line_number.to_i - 1] } end end lib/micronaut/formatters/base_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}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 "#{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 grey("#{padding}# #{backtrace_info}") + end output.puts output.flush end lib/micronaut/formatters/base_text_formatter.rb @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.name = %q{micronaut} - s.version = "0.1.4.4" + s.version = "0.1.5" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Chad Humphries"] micronaut.gemspec 5db59274e4c2f87adde8cbe2d6c752ee7181bb05 Chad Humphries chad@spicycode.com http://github.com/spicycode/micronaut/commit/61605136b4dc9bc4b69f99ac5fb9ffaedfa7156a 61605136b4dc9bc4b69f99ac5fb9ffaedfa7156a 2008-12-20T14:07:52-08:00 2008-12-20T14:07:52-08:00 Release 0.1.5 - Added display of the failing line into the the error output - Squashed bug in stand-alone runner by expanding the path prior to unshifting it - Excluded bin/micronaut from the backtrace ed6fca44f052d8446c6f02031ad58ed2140d1879 Chad Humphries chad@spicycode.com