From 5a599dde0c43b62ff32c8a0c36a05a758a309818 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 22 Oct 2015 06:25:33 +0000 Subject: generic_erb.rb: highlight * tool/generic_erb.rb: highlight result messages too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/generic_erb.rb | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'tool') diff --git a/tool/generic_erb.rb b/tool/generic_erb.rb index 6641b0e649..6d97d21fb7 100644 --- a/tool/generic_erb.rb +++ b/tool/generic_erb.rb @@ -10,25 +10,38 @@ timestamp = nil output = nil ifchange = nil source = false +color = nil opt = OptionParser.new do |o| o.on('-t', '--timestamp[=PATH]') {|v| timestamp = v || true} o.on('-o', '--output=PATH') {|v| output = v} o.on('-c', '--[no-]if-change') {|v| ifchange = v} o.on('-x', '--source') {source = true} + o.on('--color') {color = true} vpath.def_options(o) o.order!(ARGV) end +unchanged = "unchanged" +updated = "updated" +if color or (color == nil && STDOUT.tty?) + if /\A(\e\[).*m\z/ =~ IO.popen("tput smso", "r", &:read) + beg = $1 + colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {} + reset = "#{beg}m" + unchanged = "#{beg}#{colors["pass"] || "32;1"}m#{unchanged}#{reset}" + updated = "#{beg}#{colors["fail"] || "31;1"}m#{updated}#{reset}" + end +end template = ARGV.shift or abort opt.to_s erb = ERB.new(File.read(template), nil, '%-') erb.filename = template result = source ? erb.src : erb.result if output if ifchange and (vpath.open(output, "rb") {|f| f.read} rescue nil) == result - puts "#{output} unchanged" + puts "#{output} #{unchanged}" else open(output, "wb") {|f| f.print result} - puts "#{output} updated" + puts "#{output} #{updated}" end if timestamp if timestamp == true -- cgit v1.2.3