pretty_debug 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51103fc126497b1d9c41ee408db9dff752a4ec2b
-  data.tar.gz: edf7ffac17899f563307fe54383d50954bb6d7b3
+  metadata.gz: 04efe0cf9dba9901b76596d083e6e2d7bcaedefe
+  data.tar.gz: 161511fa41ee80e11bbcf24d2b04449a972ad0c2
 SHA512:
-  metadata.gz: 835c7e7c4209ee1851eac0a18ef04c11a2375051353bab015d3995536d3747402e7f292e438c970588cd8f842b540999b5841f44511dc8206a5c449b41ad73ca
-  data.tar.gz: d20a4b0fdf35811c190c3ecbe44448f9031b8de226add2f203e4d95c33ffb3033b4893193e9616d146d94c652fbebee8267a6e4c0fd33495b6f19cd1712fb25c
+  metadata.gz: 49766af15d06ede86a35499730605b8dd5c618c62a2f44cf3657950a96c6a6eaf44bda77f52bd2fe3dbdd20b66a2a141d301c3a6adbe69cc0d2bc779be2dfedf
+  data.tar.gz: a2e8df34f7e48cb2bafe0ac02c6d1f9e1c73c4823a37a4cd4a5f0d131e58a7e63b5c1425c0442a3a01b46baf5d47da7f75773ed571c27362a54b2a54a4067c47

data/lib/pretty_debug.rb

@@ -1,6 +1,5 @@
 #!ruby
 require "string"
-require "ruby-prof"
 require "utility"
 
 module Kernel
@@ -16,132 +15,42 @@ module Kernel
 	end
 end
 
-class ValidationError < Exception; end
-
-class Object
-	def expect s; raise ArgumentError.new("Expecting `#{s.inspect}`: #{inspect}") end
-	def case? *kases; kases.any?{|kase| kase === self} end
-end
-
-class Module
-	def basename; to_s.split("::").last end
-end
-
-class Array
-	def compatible? other
-		other.case?(Array) and
-		other.length == length
-	end
-end
-
-class Hash
-	def compatible? other
-		other.case?(Hash) and
-		other.size == size and
-		other.keys.all?{|k| key?(k)}
-	end
-	def ltsv *args
-		if args.empty? then
-			map{|k, v| "#{k}:#{v.to_s.tr("\t", " ")}"} else
-			args.map{|k| "#{k}:#{self[k].to_s.tr("\t", " ")}"}
-		end.join("\t")
-	end
-end
-class String
-	def parse_ltsv; Hash[chomp.split("\t").map{|f| f.split(":", 2)}] end
-end
-
 class PrettyDebug
 	attr_accessor :backtrace, :message
 	def self.new_internal
 		new.tap do |error|
-			called_location = clean(caller)[2]
+			called_location = clean(caller_locations)[2]
 			error.backtrace = clean($@).take_while{|a| a != called_location}
 			error.message = $!.message
 		end
 	end
-	Stackline = /\A(?'f'.+?):(?'l'\d+)(?::in `(?'m'.*)'|(?'m'.*))?\z/m
-	NoncallLine = /\Ablock(?: \(\d+ levels\))? in |\A\</
 	def self.message; $!.message.dup.tap{|s| s[0] = s[0].upcase}.sub(/(?<=[^.])\z/, ".") end
 	def self.clean stack
-		raise "Cannot parse. No backtrace given" unless stack
-		return [] if stack.empty?
-		caller_file_i = $LOADED_FEATURES.index(caller.first.match(Stackline)[:f]).to_i
+		return [] if stack.to_a.empty?
+		caller_file_i = $LOADED_FEATURES.index(caller_location(0).path).to_i
 		stack
-		.map{|l| m = l.match(Stackline); [m[:f].ellipsis(55), m[:l].to_i, m[:m]]}
+		.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{|_, _, m| m =~ NoncallLine}
 #		.reject{|f, _, _| $LOADED_FEATURES.include?(f)}
 #		.reject{|f, _, _| $LOADED_FEATURES.index(f).to_i > caller_file_i}
 	end
 end
 
-#############################################
-# Terminal formatting
-#############################################
-
-class String
-	def terminal_escape; "\"#{self}\"" end
-	def color sym; "#{vt100(30+
-		{black: 0, red: 1, green: 2, yellow: 3, blue: 4, magenta: 5, cyan: 6, white: 7}[sym]
-		)}#{self}#{vt100}" end
-	def bg sym; "#{vt100(40+
-		{black: 0, red: 1, green: 2, yellow: 3, blue: 4, magenta: 5, cyan: 6, white: 7}[sym]
-		)}#{self}#{vt100}" end
-	def bf; "#{vt100("01")}#{self}#{vt100}" end
-
-	private
-	def vt100 s = ""; "\e[#{s}m" end
-end
-
-class Object
-	def intercept &pr
-		tap{|x| puts "[Debug] #{caller[2][/.*?:\d+/]}:".color(:yellow); pr ? pr.call(x) : p(x)}
-	end
-	def forwardtrace sym
-		tap{puts "#{inspect}##{sym} defined at:", method(sym).source_location.join(":")}
-	end
-	def follow m; tap{puts "Next step: #{method(m).source_location
-		.chain{|a| a ? a.join(":") : "Unknown #{self}.#{m}"}
-	}"} end
-	def _?; tap{Test.testee.push(self)} end
-end
-
-=begin
-class Module
-	def inspect
-		ans = ancestors.map{|m| "#{m.class.send(:to_s).downcase} #{m}"}.join(" < ")
-		var = (class_variables + instance_variables).join(", ")
-		var.empty? ? ans : "#{ans}#$/#{var}"
-	end
-end
-=end
-
 class Proc
-	def source_location
-		to_s.match(/\A\#\<#{self.class}:.+?@(.+)\:(\d+)(?: \(lambda\))?\>\z/).values_at(1, 2)
+	def inspect; f, l = source_location; "Proc@#{File.basename(f)}:#{l}"
+	rescue; "Proc@source_unknown"
 	end
-	def inspect
-		f, l = source_location
-		"Proc@#{File.basename(f)}:#{l}"
-	rescue
-		"Proc@source_unknown"
-	end
-end
-
-class Method
-	def inspect; to_s end
-	def to_s; "#{receiver}.#{name}" end
 end
+class Method; def inspect; "#{receiver}.#{name}" end end
+class UnboundMethod; def inspect; "#{owner}##{name}" end end
 
-class UnboundMethod
-	def inspect; to_s end
-	def to_s; "#{owner}##{name}" end
-end
+#############################################
+# Terminal
+#############################################
 
 class Array
 	def inspect
@@ -149,25 +58,12 @@ class Array
 		.chain{|s| length < 2 ? "[#{s.join}]" : "[#$/#{s.join(",#$/").indent}#$/]"}
 	end
 	def align ellipsis_limit = nil
-		transpose
-		.map do |col|
+		transpose.map do |col|
 			just = case col.first; when Numeric then :rjust; else :ljust end
 			width = col.map{|cell| cell.to_s.length}.max
 			max = ellipsis_limit || width
 			col.map{|cell| cell.to_s.ellipsis(max).send(just, width.at_most(max))}
-		end
-		.transpose
-=begin
-		col_widths = transpose.map{|col| col.map{|cell| cell.to_s.length}.max}
-		map{|row| [row, col_widths].transpose.map{|cell, l|
-			max = ellipsis_limit || l
-			l = l.at_most(max)
-			case cell
-			when Numeric then cell.to_s.ellipsis(max).rjust(l)
-			else cell.to_s.ellipsis(max).ljust(l)
-			end
-		}.join(sep)}
-=end
+		end.transpose
 	end
 end
 
@@ -182,79 +78,42 @@ class Hash
 	end
 end
 
-module Test
-	def self.testee; @@testee end
-	def self.raise? exception = Exception, &pr
-		pr.call; false
-		rescue Exception => e
-      e.kind_of?(exception)
-	end
-	def self.testee_clear; @@testee = [] end
-	def self.testee_refer; @@testee end
-	def self.test title = "Test", &pr
-		testee_clear
-		t = Time.now
-		if pr.call == true
-			puts "#{title}. Succeeded (#{"%.2e" % t.till_now} secs)".color(:green)
-		else
-			puts "#{title}. Failed".color(:red),
-			*(testee_refer.map{|o| o.inspect.color(:red)} unless testee_refer.empty?)
+class Object
+	def intercept &pr
+		tap do |x| puts \
+			"[Debug] #{caller_location(2).chain{|l| "#{l.basename}:#{l.lineno}"}}"
+				.color(:yellow),
+			x.inspect
 		end
-	rescue Exception
-			puts "#{title} ... Test Error".color(:red),
-			[$!.message, *PrettyDebug.clean($@).align.map{|row| row.join(":")}].map{|l| l.color(:red)}
 	end
 end
 
-module Kernel
-	def test *args, &pr; Test.test(*args, &pr) end
-	def raise? *args, &pr; Test.raise?(*args, &pr) end
-	def timer
-		t = Time.now
-		yield
-		puts "(#{"%.2e" % t.till_now} secs)".color(:green)
-	end
-end
+class String
+	def terminal_escape; "\"#{self}\"" end
+	def color sym; "#{vt100(30+
+		{black: 0, red: 1, green: 2, yellow: 3, blue: 4, magenta: 5, cyan: 6, white: 7}[sym]
+		)}#{self}#{vt100}" end
+	def bg sym; "#{vt100(40+
+		{black: 0, red: 1, green: 2, yellow: 3, blue: 4, magenta: 5, cyan: 6, white: 7}[sym]
+		)}#{self}#{vt100}" end
+	def bf; "#{vt100("01")}#{self}#{vt100}" end
 
-=begin
-module Kernel
-	def benchmark i, &pr
-		Benchmark.prs = []
-		pr.call()
-		Benchmark.bm(i){|br| Benchmark.prs.each{|pr| br.report(""){pr.call()}}}
-	end
-	def alternative &pr; Benchmark.prs.push(pr) end
+	private
+	def vt100 s = ""; "\e[#{s}m" end
 end
 
-require "benchmark"
-Benchmark.singleton_class.class_eval{attr_accessor :prs}
-=end
-
-
-=begin
-require "ruby-prof"
-$prof_begin = false
-def profile_on; $prof_begin = true; end
-def profile switch = nil
-	yield if switch && $prof_begin.!
-	RubyProf.resume{$prof_result = yield}
-	open("/tmp/profile", "w"){|io| 
-		# RubyProf::CallStackPrinter.  # for kcachegring
-		 RubyProf::GraphHtmlPrinter.
-		# RubyProf::GraphPrinter.
-		# RubyProf::AbstractPrinter.
-	new(RubyProf.stop).print(io)}
-	# IO.popen("kcachegrind /tmp/profile > #{File::NULL} 2>&1")
-	# IO.popen("firefox >#{File::NULL} /tmp/profile ")
-	IO.popen("google-chrome >#{File::NULL} /tmp/profile ")
-	$prof_result
-end
+#############################################
+# LTSV
+#############################################
 
-module Profiling
-	def self.start; RubyProf.start end
-	def self.stop
-		result = RubyProf.stop
-		RubyProf::FlatPrinter.new(result).print
+class Hash
+	def ltsv *args
+		if args.empty? then
+			map{|k, v| "#{k}:#{v.to_s.tr("\t", " ")}"} else
+			args.map{|k| "#{k}:#{self[k].to_s.tr("\t", " ")}"}
+		end.join("\t")
 	end
 end
-=end
+class String
+	def parse_ltsv; Hash[chomp.split("\t").map{|f| f.split(":", 2)}] end
+end

metadata

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