backtracer 0.6.5 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.7.1

data/bin/backtracer

@@ -1,15 +1,14 @@
 #!/usr/bin/env ruby
 
-if (ARGV.include? '-h') || (ARGV.include? '--help')
+if (ARGV.include? '-h') || (ARGV.include? '--help') || ARGV.length == 0
  dir = File.dirname(__FILE__) + '/../lib'
  puts 'options: '
  for file in Dir[dir + '/backtracer_*.rb'].sort.reverse
   puts '--' + File.basename(file)[11..-4] # of backtracer_locals.rb, just locals
  end
- puts 'ex: $ backtracer filename.rb arg1 arg2'
+ puts 'ex\'s:', '$ backtracer filename.rb arg1 arg2'
  puts '$ backtracer --simple filename.rb arg1 arg2'
- puts 'or its equivalent: $ ruby -rbacktracer_simple filename.rb arg1 arg2'
- puts '$ ruby -rtracerr'
+ puts 'or its equivalent:', '$ ruby -rbacktracer_simple filename.rb arg1 arg2'
  exit
 end
 

data/lib/backtracer.rb

@@ -6,6 +6,7 @@ DOZE = Config::CONFIG['host_os'] =~ /mswin|mingw/
 require File.dirname(__FILE__) + "/shared"
 
 at_exit {
+  exception_that_killed_us = $!
   if $! && !$!.is_a?(SystemExit) # SystemExit's are normal, not exceptional
     print "\n"
     print "\t" unless defined?($same_line)
@@ -16,7 +17,7 @@ at_exit {
     $!.backtrace.each{|bt_line| max = [bt_line.length, max].max}
 
     backtrace_with_code = $!.backtrace.map{ |bt_line|
-      next if bt_line.include? 'bin/backtracer' # binary lines...
+      next if bt_line.include? 'bin/backtracer' # lines from ourself...
       if DOZE && bt_line[1..1] == ':'
         
         drive, file, line, junk = bt_line.split(":")
@@ -26,15 +27,48 @@ at_exit {
         file, line, junk = bt_line.split(":")
       end
       line = line.to_i
-      actual_line = Tracer.get_line(file, line)
-     
-      "%-#{max + 1}s #{"\n\t" unless defined?($same_line)}%s" % [bt_line, (actual_line.strip if actual_line)]
-    }.compact
+      actual_code = Tracer.get_line(file, line)
+      output_line = '   '
+      output_line += "%-#{max + 1}s " % bt_line unless $no_code_line_numbers
+      if actual_code && actual_code != '-'
+        output_line += "\n\t" unless defined?($same_line)
+        output_line += actual_code.strip
+      end
+      output_line
+    }
+
+    previous_line = nil
+    count = 0
+
+    backtrace_with_code = backtrace_with_code.map{|line|
+        if previous_line == nil
+          # startup
+          previous_line = line
+          line
+        elsif previous_line == line
+          # redundant line
+          count += 1
+        
+          nil
+        else
+          # good line
+          previous_line = line
+          if count > 0
+            # first good line after a string of bad
+            a = ["                 (repeat #{count} times) ", line]
+            count = 0          
+            a
+           else
+            line
+          end
+        end
+    }.flatten.compact
+
+
     puts backtrace_with_code
     puts # blank line
     # for some reason this can be nil...
-    $!.set_backtrace [] if $! # avoid the original backtrace being outputted--though annoyingly it does still output its #to_s...
-    
+    exception_that_killed_us.set_backtrace [] # avoid the original backtrace being outputted--though annoyingly it does still output its #to_s...
   else
     puts "(backtracer: no exception found to backtrace)" if $DEBUG
   end

data/lib/{backtracer_inline.rb → backtracer_code_same_line.rb}

@@ -1,6 +1,4 @@
 # this one display full BT with code, at the end [no performance loss]
-require 'rbconfig'
-WINDOZE = Config::CONFIG['host_os'] =~ /mswin|mingw/
 $same_line = true
 
 require File.dirname(__FILE__) + "/shared"

data/lib/backtracer_just_code_lines.rb

@@ -0,0 +1,5 @@
+# this one display full BT with code, at the end [no performance loss]
+$no_code_line_numbers = true
+$same_line = true
+require File.dirname(__FILE__) + "/shared"
+require File.dirname(__FILE__) + "/backtracer.rb"

data/lib/backtracer_locals.rb

@@ -1,2 +1,2 @@
 # this is the default
-require File.dirname(__FILE__) + '/core_backtracer.rb'
+require File.dirname(__FILE__) + '/core_backtracer_locals.rb'

data/lib/backtracer_tracer.rb

@@ -1,2 +1,2 @@
 $print_trace = true
-require File.dirname(__FILE__) + '/core_backtracer.rb'
+require File.dirname(__FILE__) + '/core_backtracer_locals.rb'

data/lib/backtracer_tracer_args.rb

@@ -1,3 +1,3 @@
 # this is the default
 $VERBOSE = 1 # how we tell it to do args currently
-require File.dirname(__FILE__) + '/core_backtracer.rb'
+require File.dirname(__FILE__) + '/core_backtracer_locals.rb'

data/test/test.rb

@@ -0,0 +1,9 @@
+def go number
+ if number == 4
+   raise 'done'
+ else
+  go number + 1
+ end
+end
+
+go 0

data/test/test2.rb

@@ -0,0 +1,10 @@
+def go1 n
+  raise 'done' if n == 30
+ go2 n
+end
+
+def go2 n
+ go1 n + 1
+end
+
+go2 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backtracer
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.7.1
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -07:00
+date: 2010-01-12 00:00:00 -07:00
 default_executable: backtracer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,17 +43,19 @@ files:
 - examples/run_all_styles_of_backtracer.rb
 - examples/run_large_style_output.rb
 - lib/backtracer.rb
+- lib/backtracer_code_same_line.rb
 - lib/backtracer_ctrl_c_debugger.rb
-- lib/backtracer_inline.rb
+- lib/backtracer_just_code_lines.rb
 - lib/backtracer_locals.rb
 - lib/backtracer_pinger.rb
 - lib/backtracer_simple.rb
 - lib/backtracer_tracer.rb
 - lib/backtracer_tracer_args.rb
-- lib/backtracer_tracer_exception_creation.rb
-- lib/core_backtracer.rb
+- lib/core_backtracer_locals.rb
 - lib/shared.rb
 - lib/tracerr.rb
+- test/test.rb
+- test/test2.rb
 has_rdoc: true
 homepage: 
 licenses: []
@@ -83,6 +85,8 @@ signing_key:
 specification_version: 3
 summary: Quality backtraces for ruby
 test_files: 
+- test/test.rb
+- test/test2.rb
 - examples/crash.rb
 - examples/crash_longer.rb
 - examples/run_all_styles_of_backtracer.rb

data/lib/backtracer_tracer_exception_creation.rb

@@ -1,21 +0,0 @@
-require 'faster_rubygems'
-require 'event_hook'
-
-class Demo < EventHook
-  def self.process(*args)
-
-   # args => [64, #<RuntimeError: hello>, :initialize, Exception]
-   begin
-     if args[1].is_a? Exception
-       puts args.inspect
-     end
-   rescue 
-     # fantastically, this check fails within rails at times
-   end
-  end
-end
-
-Demo.start_hook
-
-# TODO 1.9 compat
-#set_trace_func proc {|*args| puts args.inspect }