YkLib 0.1.7.1 → 0.1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efa8e1fc11d663d3d634f85be96581123933ee699832dc0572e8609882b103b1
-  data.tar.gz: 14a75a126e9f3450d226cbda1c3fe0e7aaeb25ff51455330bb893474d29792bc
+  metadata.gz: 1f58a18cabcdc0e9e61d7fab5d99d78bd8a50ac8a1bf75b4ffd1931a40ffcb0f
+  data.tar.gz: 5764dc7ccbff12f2349ba0289479a4eddff8f1912af0f59193cfcdffd5ac5b16
 SHA512:
-  metadata.gz: 6227929d7e2ffddde5db4f41d86adff14ee2150bd10795dbbe7c113beb6923dc2972ef9d88201117fd308c2b3a109708d225cf238e986843e172ce9422f355ce
-  data.tar.gz: d01a0e6dc1d2b31d91563050fe7de9c43321e61ce06b8d18ec5dbbcf870e51cf8d3e97cd3d581380921828196ea230fc16fbf421ad62a16c6135d9213145e71d
+  metadata.gz: f819eb839628398a448d433168ac33eb7d002c29af9f1047dab77c0f287350ccc5773dcf161939391fb511174c09dd6b2e3528920e007d6eceb4f9103c7b5bdd
+  data.tar.gz: ac186a00f8145ee3dc8402f8fd0dbb5d6710a2762f447ed32dd87f7bcbe3dd7f287013ab5427c9aa2787d49c3cfa9dd766dd0bfe84a0df782ec9c41cce79d2f4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    YkLib (0.1.7.1)
+    YkLib (0.1.8.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/Yk/debug2.rb

@@ -64,21 +64,21 @@ DEBUG_FILES = {}
 			class_eval %{
 				#{capCol} = "\\x1b[#{i + 30}m"
 				Bg#{capCol} = "\\x1b[#{i + 40}m"
-				def #{col} *args
+				def #{col} *args, &bl
 					STDERR.write #{capCol}
 					begin
-						TZDebug.p *args
+						TZDebug.p *args, &bl
 					ensure
 						STDERR.write Default
 						STDERR.write BgDefault
 						STDERR.write "\r\n"
 					end
 				end
-				def bg#{capCol} *args
+				def bg#{capCol} *args, &bl
 					STDERR.write Bg#{capCol}
 					STDERR.write Black
 					begin
-						TZDebug.p *args
+						TZDebug.p *args, &bl
 					ensure
 						STDERR.write Default
 						STDERR.write BgDefault
@@ -87,7 +87,26 @@ DEBUG_FILES = {}
 				end
 			}
 		end
-		def self.p *exprs
+		@@onStack = []
+		def self.on
+			@@onStack.empty? ? @@onStack.push(true) : (@@onStack[-1] ||= true)
+		end
+		def self.off
+			@@onStack.empty? ? @@onStack.push(false) : (@@onStack[-1] &&= false)
+		end
+		def self.p *exprs, &bl
+			if bl
+				@@onStack.push exprs[0]
+				begin
+					ret = bl.call
+				ensure
+					@@onStack.pop
+				end
+				return ret
+			end
+			if !@@onStack.empty? && !@@onStack[-1]
+				return TZDebug.new
+			end
 			noLn = noTitle = false
 			if Escseq::Colors.index exprs[0] 
 				col = exprs.shift
@@ -122,8 +141,10 @@ DEBUG_FILES = {}
 					when /^\.([\w]+)\b/
 #						noTiltle = true
 #						noLn = true
+						func = $1
 						if exprs.size == 0
-							if $'.strip_comment == ""
+							case $'.strip_comment
+							when ""
 								if caller_locations(1)[0].path == "(eval)"
 									out = "***"
 									noTitle = true
@@ -132,8 +153,13 @@ DEBUG_FILES = {}
 									out = nil
 									noLn = true
 								end
+							elsif /\bdo$/
+								col = func
+								noTitle = true
+								out = nil
+								noLn = true
 							else
-								col = $1
+								col = func
 								out = nil
 								noLn = true
 							end
@@ -422,8 +448,8 @@ DEBUG_FILES = {}
 	end
 
 
-	def p *exprs
-		TZDebug.p *exprs
+	def p *exprs, &bl
+		TZDebug.p *exprs, &bl
 	end
 
 

data/lib/Yk/misc_tz.rb

@@ -6,8 +6,8 @@ require 'binding_of_caller'
 YK_MODULE_HOOK = Hash.new{|h, k| h[k] = []}
 
 def if_class mname, &bl
-	if Kernel.const_defined?(smod)
-		Kernel.const_get(smod).module_eval &bl
+	if Kernel.const_defined?(mname)
+		Kernel.const_get(mname).module_eval &bl
 	else
 		YK_MODULE_HOOK[mname].push bl
 	end

data/lib/YkLib/version.rb

@@ -1,3 +1,3 @@
 module YkLib
-  VERSION = "0.1.7.1"
+  VERSION = "0.1.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: YkLib
 version: !ruby/object:Gem::Version
-  version: 0.1.7.1
+  version: 0.1.8.1
 platform: ruby
 authors:
 - yougain