minitest-colorize 0.0.3 → 0.0.4

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - jruby
+  - rbx

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.0.4 [Mon Jul 18 2011]
+
+* Colorize output only if output is a tty
+
 0.0.3 [Mon Jun 27 2011]
 
 * Show failing tests instantly

data/lib/minitest/colorize.rb

@@ -14,8 +14,13 @@ module MiniTest
     def print(string = nil)
       return stream.print if string.nil?
 
-      if color = colors[string]
-        stream.print tint(color, string)
+      case string
+      when 'E', 'F'
+        stream.print red(string)
+      when 'S'
+        stream.print yellow(string)
+      when '.'
+        stream.print green(string)
       else
         stream.print string
       end
@@ -32,17 +37,13 @@ module MiniTest
       return stream.puts if string.nil?
 
       if string =~ /(\d+) tests, (\d+) assertions, (\d+) failures, (\d+) errors, (\d+) skips/
-        color = if $3 != '0'
-                  colors['F']
-                elsif $4 != '0'
-                  colors['E']
-                elsif $5 != '0'
-                  colors['S']
-                else
-                  colors['.']
-                end
-
-        stream.puts tint(color, string)
+        if $3 != '0' || $4 != '0'
+          stream.puts red(string)
+        elsif $5 != '0'
+          stream.puts yellow(string)
+        else
+          stream.puts green(string)
+        end
       else
         stream.puts string
       end
@@ -54,12 +55,28 @@ module MiniTest
 
     protected
 
+    def color_enabled?
+      stream.tty?
+    end
+
     def tint(color, string)
-      "\e[#{color}m#{string}\e[0m"
+      if color_enabled?
+        "\e[#{color}m#{string}\e[0m"
+      else
+        string
+      end
+    end
+
+    def red(string)
+      tint(31, string)
+    end
+
+    def green(string)
+      tint(32, string)
     end
 
-    def colors
-      { "F" => 31, "E" => 31, "S" => 33, "." => 32 }
+    def yellow(string)
+      tint(33, string)
     end
 
     def report

data/lib/minitest/colorize/version.rb

@@ -1,5 +1,5 @@
 module MiniTest
   class Colorize
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/minitest-colorize.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'minitest', '~> 2.0'
   s.add_development_dependency 'rake', '>= 0.8.7'
+  s.add_development_dependency 'mocha', '>= 0.9.12'
 end

data/test/minitest_colorize_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
 class MiniTest::ColorizeTest < MiniTest::Unit::TestCase
+  def setup
+    MiniTest::Colorize.any_instance.stubs(:color_enabled?).returns(true)
+  end
+
   def test_print_fail
     assert_output "\e[31mF\e[0m" do
       colorize = MiniTest::Colorize.new
@@ -37,7 +41,10 @@ class MiniTest::ColorizeTest < MiniTest::Unit::TestCase
   end
 
   def test_print_without_arguments
-    assert_output "" do
+    # ruby 1.9 prints nothing and ruby 1.8 prints 'nil'
+    output = RUBY_VERSION >= '1.9' ? '' : 'nil'
+
+    assert_output output do
       colorize = MiniTest::Colorize.new
       colorize.print
     end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'mocha'
 require 'minitest/autorun'
-require 'minitest-colorize'
+require 'minitest/colorize'

metadata

@@ -2,7 +2,7 @@
 name: minitest-colorize
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Gabriel Sobrinho
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 -03:00
+date: 2011-07-18 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,17 @@ dependencies:
         version: 0.8.7
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.12
+  type: :development
+  version_requirements: *id003
 description: Colorize MiniTest output and show failing tests instantly
 email: 
 - gabriel.sobrinho@gmail.com
@@ -46,6 +57,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - README.markdown