pretty_debug 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04efe0cf9dba9901b76596d083e6e2d7bcaedefe
-  data.tar.gz: 161511fa41ee80e11bbcf24d2b04449a972ad0c2
+  metadata.gz: 3372f676070f6a1209686705bac0b4ae7a107781
+  data.tar.gz: 3d9249542e962fb8272bc97f77025b05a5f35360
 SHA512:
-  metadata.gz: 49766af15d06ede86a35499730605b8dd5c618c62a2f44cf3657950a96c6a6eaf44bda77f52bd2fe3dbdd20b66a2a141d301c3a6adbe69cc0d2bc779be2dfedf
-  data.tar.gz: a2e8df34f7e48cb2bafe0ac02c6d1f9e1c73c4823a37a4cd4a5f0d131e58a7e63b5c1425c0442a3a01b46baf5d47da7f75773ed571c27362a54b2a54a4067c47
+  metadata.gz: 20f1867e724f838a20b0b52951cb79260617742129bb1e94742f9e0a4d7c698749ac8a678a7cd7d329400bf5a62bb0082cde83ef7ad8b6905d32136449e0f40a
+  data.tar.gz: 124d332e151d164cb3f5188758084d74993f0c8d2c0ac40d3e86b1b5bb933dcfd47928f86676d83b6dae544bb344f8ae7c8cdcb6a5a70388b0227ca5092724a0

data/lib/pretty_debug.rb

@@ -2,13 +2,41 @@
 require "string"
 require "utility"
 
+class Exception
+	attr_accessor :backtrace_locations
+	def complement_backtrace_locations
+		@backtrace_locations ||=
+		backtrace.map{|l| Thread::Backtrace::PseudoLocation.new(l)}
+	end
+end
+
+class Thread::Backtrace::PseudoLocation
+	Pattern = /\A(?'f'.+?):(?'li'\d+)(?::in `(?'lb'.*)'|(?'lb'.*))?\z/m
+	attr_accessor :to_s, :absolute_path, :lineno, :label, :path, :base_label
+	def initialize to_s
+		@to_s = to_s
+		@absolute_path, @lineno, @label =
+		@to_s.match(Pattern).chain{|m| [m[:f], m[:li].to_i, m[:lb]]}
+		@path = File.basename(@absolute_path)
+		@base_label = @label.gsub(/\Ablock in /, "")
+	end
+end
+
 module Kernel
+	alias old_raise :raise
+	def raise *args
+		old_raise *args
+	rescue => e
+		e.backrace_locations = caller_locations
+		old_raise(e)
+	end
 	at_exit do
 		case $!
 		when nil, SystemExit, Interrupt
 		else
-			puts PrettyDebug.message
-			puts PrettyDebug.clean($@).align.map{|row| row.join(":")}
+			puts \
+			PrettyDebug.message($!),
+			PrettyDebug.backtrace_locations($!).align.map{|row| row.join(":")}
 		end
 		$stderr.reopen(IO::NULL)
 		$stdout.reopen(IO::NULL)
@@ -16,27 +44,22 @@ module Kernel
 end
 
 class PrettyDebug
-	attr_accessor :backtrace, :message
-	def self.new_internal
-		new.tap do |error|
-			called_location = clean(caller_locations)[2]
-			error.backtrace = clean($@).take_while{|a| a != called_location}
-			error.message = $!.message
-		end
+	def self.message e
+		e.complement_backtrace_locations
+		e.message.dup.tap{|s| s[0] = s[0].upcase}.sub(/(?<=[^.])\z/, ".")
+	end
+	def self.backtrace_locations e
+		e.complement_backtrace_locations
+		caller_locations(e.backtrace_locations)
 	end
-	def self.message; $!.message.dup.tap{|s| s[0] = s[0].upcase}.sub(/(?<=[^.])\z/, ".") end
-	def self.clean stack
-		return [] if stack.to_a.empty?
-		caller_file_i = $LOADED_FEATURES.index(caller_location(0).path).to_i
-		stack
+	def self.caller_locations a
+		a
 		.map{|l| [l.path.ellipsis(55), l.lineno, l.base_label]}
 		.transpose.tap do |_, _, m|
 			m.rotate!(-1)
 			m[0] = ""
 			while i = m.index{|m| m == "method_missing"}; m[i] = m[i - 1] end
 		end.transpose
-#		.reject{|f, _, _| $LOADED_FEATURES.include?(f)}
-#		.reject{|f, _, _| $LOADED_FEATURES.index(f).to_i > caller_file_i}
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pretty_debug
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - sawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: []