Permalink
Browse files

color option

* bootstraptest/runner.rb, sample/test.rb: add --color option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent a8f87d6 commit 2f76e6d34c899d81f5c42e3b1e481c9e506a937a @nobu nobu committed May 30, 2012
Showing with 26 additions and 3 deletions.
  1. +12 −1 bootstraptest/runner.rb
  2. +14 −2 sample/test.rb
View
13 bootstraptest/runner.rb
@@ -61,6 +61,7 @@ def main
@ruby = File.expand_path('miniruby')
@verbose = false
$stress = false
+ @color = nil
dir = nil
quiet = false
tests = nil
@@ -81,6 +82,9 @@ def main
true
when /\A(--stress|-s)/
$stress = true
+ when /\A--color(?:=(?:always|(auto)|(never)))?\z/
+ @color = (!$2 unless $1)
+ true
when /\A(-q|--q(uiet))\z/
quiet = true
true
@@ -113,7 +117,14 @@ def main
@progress = %w[- \\ | /]
@progress_bs = "\b" * @progress[0].size
@tty = !@verbose && $stderr.tty?
- if @tty and /mswin|mingw/ !~ RUBY_PLATFORM and /dumb/ !~ ENV["TERM"]
+ case @color
+ when nil
+ @color = @tty && /dumb/ !~ ENV["TERM"]
+ @color &= /mswin|mingw/ !~ RUBY_PLATFORM
+ when true
+ @tty = true
+ end
+ if @color
@passed = "\e[#{ENV['PASSED_COLOR']||'32'}m"
@failed = "\e[#{ENV['FAILED_COLOR']||'31'}m"
@reset = "\e[m"
View
16 sample/test.rb
@@ -6,11 +6,23 @@
$failed = 0
PROGRESS = Object.new
PROGRESS.instance_eval do
+ @color = nil
+ case ARGV[0]
+ when /\A--color(?:=(?:always|(auto)|(never)))?\z/
+ @color = (!$2 unless $1)
+ end
@count = 0
@rotator = %w[- \\ | /]
@bs = "\b" * @rotator[0].size
- @tty = STDERR.tty?
- if @tty and /mswin|mingw/ !~ RUBY_PLATFORM and /dumb/ !~ ENV["TERM"]
+ @tty = STDERR.tty? && /dumb/ !~ ENV["TERM"]
+ @tty &&= /mswin|mingw/ !~ RUBY_PLATFORM
+ case @color
+ when nil
+ @color = @tty
+ when true
+ @tty = true
+ end
+ if @color
@passed = "\e[#{ENV['PASSED_COLOR']||'32'}m"
@failed = "\e[#{ENV['FAILED_COLOR']||'31'}m"
@reset = "\e[m"

0 comments on commit 2f76e6d

Please sign in to comment.