backtracer 0.2.0 → 0.2.1

data/Rakefile

@@ -7,7 +7,7 @@ begin
 #    gemspec.homepage = "http://github.com/technicalpickles/the-perfect-gem"
 #    gemspec.description = "TODO"
 #    gemspec.authors = ["Josh Nichols"]
-#    gemspec.dependency
+    gemspec.dependency 'sane'
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/backtracer.rb

@@ -1,20 +1,30 @@
 # this one display full BT with code, at the end [no performance loss]
-SCRIPT_LINES__ = {}
+
+require File.dirname(__FILE__) + "/shared"
+require 'sane'
+
 at_exit {
- puts "==== "
- if $!
-  backtrace_with_code = $!.backtrace.map{|bt| 
-   file, line, junk = bt.split(":")
-   line = line.to_i - 1 
-   actual_file = SCRIPT_LINES__[file]
-   actual_line = actual_file[line] if actual_file
-   "#{bt}\n\t#{actual_line.strip if actual_line}"
-  } 
-  puts backtrace_with_code
-  puts "===="
- else
-  puts "(no exception to backtrace)"
- end
-   
 
+  if $!
+    puts "==== "
+    bt2 = $!.backtrace
+    backtrace_with_code = $!.backtrace.map{ |bt_line|
+      if OS.windows? && bt_line[1..1] == ':'
+        #["C", "/dev/ruby/allgems/lib/allgems/GemWorker.rb", "91", "in `unpack'"]      
+        drive, file, line, junk = bt_line.split(":")
+        file = drive + ":" + file
+      else
+        file, line, junk = bt_line.split(":")
+      end
+      line = line.to_i
+#      line -= 1 unless line == 0 # not sure if needed
+      actual_line = Tracer.get_line(file, line)
+      "#{bt_line}\n\t#{actual_line.strip if actual_line}"
+    }
+    puts backtrace_with_code
+    puts "===="
+  else
+    puts "(no exception found to backtrace)"
+  end
+  exit!
 }

data/lib/core_backtracer.rb

@@ -12,6 +12,7 @@ Debugger.start # we use this to track args.
 #
 # tracer main class
 #
+require File.dirname(__FILE__) + "/shared"
 class Tracer
   @RCS_ID='-$Id: tracer.rb,v 1.8 1998/05/19 03:42:49 keiju Exp keiju $-'
 
@@ -82,33 +83,6 @@ class Tracer
    self.class.get_line(file, line)
   end
 
-  def self.get_line(file, line)
-    @get_line_procs ||= {}
-    if p = @get_line_procs[file]
-      return p.call(line)
-    end
-
-    unless list = SCRIPT_LINES__[file]
-      begin
-          raise 'might be a .so file' if file =~ /\.so$/
-	  f = open(file)
-	  begin
-	    SCRIPT_LINES__[file] = list = f.readlines
-	  ensure
-	    f.close
-	  end
-      
-      rescue
-	SCRIPT_LINES__[file] = list = []
-      end
-    end
-
-    if l = list[line - 1]
-      l
-    else
-      "-\n"
-    end
-  end
   
   def get_thread_no
     if no = @threads[Thread.current.object_id]

data/lib/shared.rb

@@ -0,0 +1,35 @@
+# tracer shared for the get_line aspect
+#
+class Tracer
+
+  def self.get_line(file, line)
+    @get_line_procs ||= {}
+    if p = @get_line_procs[file]
+      return p.call(line)
+    end
+
+    unless list = SCRIPT_LINES__[file]
+      begin
+          raise 'might be a .so file' if file =~ /\.so$/
+	  f = open(file)
+	  begin
+	    SCRIPT_LINES__[file] = list = f.readlines
+	  ensure
+	    f.close
+	  end
+      
+      rescue
+	SCRIPT_LINES__[file] = list = []
+      end
+    end
+
+    if l = list[line - 1]
+      l
+    else
+      "-\n"
+    end
+  end
+
+end
+
+SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__

data/lib/tracerr.rb

@@ -119,8 +119,8 @@ class Tracer
       return unless p.call event, file, line, id, binding, klass
     end
     
-    saved_crit = Thread.critical
-    Thread.critical = true
+    (saved_crit = Thread.critical) rescue nil
+    (Thread.critical = true) rescue nil
     stdout.printf("#%d:%s:%d:%s:%s: %s",
       get_thread_no,
       file,
@@ -128,7 +128,7 @@ class Tracer
       klass || '',
       EVENT_SYMBOL[event],
       get_line(file, line))
-    Thread.critical = saved_crit
+    (Thread.critical = saved_crit) rescue nil
   end
 
   Single = new
@@ -155,7 +155,7 @@ class Tracer
 end
 
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
-
+puts caller(0).size
 if $0 == __FILE__
   # direct call
     
@@ -163,6 +163,6 @@ if $0 == __FILE__
   ARGV.shift
   Tracer.on
   require $0
-elsif caller(0).size == 1
+elsif caller(0).size <= 2
   Tracer.on
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: backtracer
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: []
 
@@ -37,6 +37,7 @@ files:
 - lib/backtracer_tracer.rb
 - lib/backtracer_tracer_args.rb
 - lib/core_backtracer.rb
+- lib/shared.rb
 - lib/tracerr.rb
 has_rdoc: true
 homepage: 
@@ -62,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Quality backtraces for ruby