spicycode-micronaut 0.1.6.9 → 0.1.6.9.1

data/Rakefile

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

data/examples/lib/micronaut/behaviour_example.rb

@@ -59,6 +59,33 @@ describe Micronaut::Behaviour do
         Micronaut::Behaviour.describe(Object, nil, 'foo' => 'bar') { }.metadata.should include({ "foo" => 'bar' })
       end
       
+      it "should add the file_path_with_line_number of the current behaviour to metadata" do
+        Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:file_path_with_line_number].should == "#{__FILE__}:#{__LINE__}"
+      end
+      
+      it "should add the the file_path of the current behaviour to metadata" do
+        Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:file_path].should == "#{__FILE__}"
+      end
+      
+      it "should add a reader for file_path to the behaviour for easy access" do
+        Micronaut::Behaviour.describe(Object) { }.file_path.should == "#{__FILE__}"
+      end
+      
+      it "should add the line_number of the current behavior to metadata" do
+        Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:line_number].should == __LINE__
+      end
+      
+      it "should add file path and line number metadata for arbitrarily nested describes" do
+        Micronaut::Behaviour.describe(Object) do
+          Micronaut::Behaviour.describe("foo") do
+
+            Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:file_path_with_line_number].should == "#{__FILE__}:#{__LINE__}"
+            Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:line_number].should == __LINE__
+            
+          end
+        end
+      end
+      
     end
 
     describe "adding before and after hooks" do

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

@@ -106,6 +106,12 @@ describe Micronaut::Formatters::BaseFormatter do
   
   describe 'dealing with backtrace' do
     
+    it "should allow displaying the full backtrace with an option", :pending => true do
+      backtrace = ["/tmp/x.rb:1", "foo/vendor/rails/x.rb:1"]
+      result = @formatter.format_backtrace(backtrace, running_example)
+      result.should == backtrace
+    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, running_example).should == backtrace

data/lib/micronaut.rb

@@ -8,6 +8,10 @@ require 'micronaut/example'
 require 'micronaut/behaviour'
 require 'micronaut/kernel_extensions'
 require 'micronaut/formatters'
+begin 
+  require 'log_buddy'
+  LogBuddy.init
+rescue nil; end
 
 module Micronaut
   file = if RUBY_VERSION =~ /^1\.9/ then  # bt's expanded, but __FILE__ isn't :(

data/lib/micronaut/behaviour.rb

@@ -85,7 +85,10 @@ module Micronaut
       @metadata[:behaviour][:description] = args.shift || ''
       @metadata[:behaviour][:name] = "#{describes} #{description}".strip
       @metadata[:behaviour][:block] = extra_metadata.delete(:behaviour_block)
-      @metadata[:behaviour][:file_path] = eval("caller(0)[0]", @metadata[:behaviour][:block].binding)
+      file_path_with_line_num = eval("caller(0)[0]", @metadata[:behaviour][:block].binding)
+      @metadata[:behaviour][:file_path_with_line_number] = file_path_with_line_num
+      @metadata[:behaviour][:file_path] = file_path_with_line_num.split(":")[0].strip
+      @metadata[:behaviour][:line_number] = file_path_with_line_num.split(":")[1].to_i
       
       extra_metadata.delete(:behaviour) # Remove it if it is present
       @metadata.update(extra_metadata)
@@ -117,6 +120,10 @@ module Micronaut
     def self.description
       @metadata[:behaviour][:description]
     end
+    
+    def self.file_path
+      @metadata[:behaviour][:file_path]
+    end
    
     def self.describe(*args, &behaviour_block)
       raise(ArgumentError, "No arguments given.  You must a least supply a type or description") if args.empty? 

data/lib/micronaut/formatters/base_formatter.rb

@@ -107,10 +107,9 @@ module Micronaut
       def format_backtrace(backtrace, example)
         return "" if backtrace.nil?
         cleansed = backtrace.map { |line| backtrace_line(line) }.compact
-        original_file = example.behaviour.metadata[:behaviour][:file_path].split(':').first.strip
         
         cleansed = cleansed.select do |line|
-          line.split(':').first.downcase == original_file.downcase
+          line.split(':').first.downcase == example.behaviour.file_path.downcase
         end
 
         cleansed.empty? ? backtrace : cleansed
@@ -126,7 +125,7 @@ module Micronaut
       end
       
       def read_failed_line(exception, example)
-        original_file = example.metadata[:caller].split(':').first.strip
+        original_file = example.behaviour.file_path.downcase
         matching_line = exception.backtrace.find do |line|
           line.split(':').first.downcase == original_file.downcase
         end

metadata

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