ext/extmk.rb: colorize notes [Feature #13302]

* common.mk (build-ext): pass variables to colorize.

* ext/extmk.rb: colorize notes with tool/colorize.rb.

* tool/colorize.rb: extract from tool/generic_erb.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

common.mk

@@ -235,7 +235,7 @@ configure-ext: $(EXTS_MK)
 build-ext: $(EXTS_MK)
 	$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
 	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
-	$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) note
+	$(Q)$(MAKE) -f $(EXTS_MK) $(mflags) RUBY="$(MINIRUBY)" top_srcdir="$(srcdir)" note
 
 ext/extinit.c: $(srcdir)/template/extinit.c.tmpl
 	$(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \

ext/extmk.rb

@@ -411,12 +411,15 @@ elsif sep = config_string('BUILD_FILE_SEPARATOR')
 else
   $ruby = '$(topdir)/miniruby' + EXEEXT
 end
-$ruby << " -I'$(topdir)'"
+$ruby = [$ruby]
+$ruby << "-I'$(topdir)'"
 unless CROSS_COMPILING
-  $ruby << " -I'$(top_srcdir)/lib'"
+  $ruby << "-I'$(top_srcdir)/lib'"
-  $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
+  $ruby << "-I'$(extout)/$(arch)'" << "-I'$(extout)/common'" if $extout
   ENV["RUBYLIB"] = "-"
 end
+topruby = $ruby
+$ruby = topruby.join(' ')
 $mflags << "ruby=#$ruby"
 
 MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
@@ -658,6 +661,8 @@ begin
       puts
     end
 
+    mf.macro "ruby", topruby
+    mf.macro "RUBY", ["$(ruby)"]
     mf.macro "extensions", exts
     mf.macro "EXTOBJS", $extlist.empty? ? ["dmyext.#{$OBJEXT}"] : ["ext/extinit.#{$OBJEXT}", *$extobjs]
     mf.macro "EXTLIBS", $extlibs
@@ -679,8 +684,8 @@ begin
     submakeopts << 'UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)"'
     submakeopts << 'SHOWFLAGS='
     mf.macro "SUBMAKEOPTS", submakeopts
-    mf.macro "NOTE_MESG", %w[echo]
+    mf.macro "NOTE_MESG", %w[$(RUBY) $(top_srcdir)/tool/colorize.rb skip]
-    mf.macro "NOTE_NAME", %w[echo]
+    mf.macro "NOTE_NAME", %w[$(RUBY) $(top_srcdir)/tool/colorize.rb fail]
     mf.puts
     targets = %w[all install static install-so install-rb clean distclean realclean]
     targets.each do |tgt|

tool/colorize.rb

@@ -0,0 +1,41 @@
+class Colorize
+  def initialize(color = nil)
+    @colors = @reset = nil
+    if color or (color == nil && STDOUT.tty?)
+      if (/\A\e\[.*m\z/ =~ IO.popen("tput smso", "r", err: IO::NULL, &:read) rescue nil)
+        @beg = "\e["
+        @colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
+        @reset = "#{@beg}m"
+      end
+    end
+    self
+  end
+
+  DEFAULTS = {"pass"=>"32;1", "fail"=>"31;1", "skip"=>"33;1"}
+
+  def decorate(str, name)
+    if @colors and color = (@colors[name] || DEFAULTS[name])
+      "#{@beg}#{color}m#{str}#{@reset}"
+    else
+      str
+    end
+  end
+
+  def pass(str)
+    decorate(str, "pass")
+  end
+
+  def fail(str)
+    decorate(str, "fail")
+  end
+
+  def skip(str)
+    decorate(str, "skip")
+  end
+end
+
+if $0 == __FILE__
+  colorize = Colorize.new
+  col = ARGV.shift
+  ARGV.each {|str| puts colorize.decorate(str, col)}
+end

tool/generic_erb.rb

@@ -8,6 +8,7 @@ require 'optparse'
 require 'fileutils'
 $:.unshift(File.dirname(__FILE__))
 require 'vpath'
+require 'colorize'
 
 vpath = VPath.new
 timestamp = nil
@@ -25,17 +26,10 @@ opt = OptionParser.new do |o|
   vpath.def_options(o)
   o.order!(ARGV)
 end
-unchanged = "unchanged"
+color = Colorize.new(color)
-updated = "updated"
+unchanged = color.pass("unchanged")
-if color or (color == nil && STDOUT.tty?)
+updated = color.fail("updated")
-  if (/\A\e\[.*m\z/ =~ IO.popen("tput smso", "r", err: IO::NULL, &:read) rescue nil)
+
-    beg = "\e["
-    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