test-unit 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a1e018c9d985f96f57f4a1cb7c166ac584d4d7
-  data.tar.gz: 90fc5bcea7299d0fe43153e2eb6a447e9b3823f2
+  metadata.gz: 1731a62620afe520b8f3817106f6e9c126f5ea73
+  data.tar.gz: e78724adf56e151021ccb346e17db6fdb1e781af
 SHA512:
-  metadata.gz: 22541bbd0a7fe30eb6227f6498e1af4316d749f2f766da3f9266562c9d39ac3f7650ea7e1764b05ec43b150019e8e073045f4a876a7f9ac305cffeb197cc5a79
-  data.tar.gz: bd5da3acef525e1c3f3539dd09a5509fa531c3be20c15567e955ce79573f57cbe7467cc143e25e9bcaf5dbe83a6289ad084262ccec99ff7cba18351a2be7553d
+  metadata.gz: 8cc3e2a66dd5fa1366f1442a94b90c0ff7ee98da7732faed76ab536b67afc2e1f7753e5fc8a17bf8301f6927880168cf9248672e93c502d3cd3382eef395e2e6
+  data.tar.gz: 16d07b7d4b54a3826399d0eb9b97457a47cdf6ba945c4deaee1982b4f27809685f32beb8c5dbbb61e416efbc8cfb77922008d39ced1864e47110c749a617cf96

data/doc/text/news.md

@@ -1,8 +1,28 @@
 # News
 
+## 3.0.9 - 2014-12-31 {#version-3-0-9}
+
+It's a release that improves colors.
+
+### Improvements
+
+  * Added a work around for Ruby 1.8. (Note: Ruby 1.8 isn't
+    supported.) [GitHub#89][Patch by Aaron Stone]
+  * Supported colorized output on Windows.
+    [GitHub#90][Patch by usa]
+  * Improved colorized output.
+    http://www.a-k-r.org/d/2014-12.html#a2014_12_27_1
+    [Suggested by Tanaka Akira]
+
+### Thanks
+
+  * Aaron Stone
+  * usa
+  * Tanaka Akira
+
 ## 3.0.8 - 2014-12-12 {#version-3-0-8}
 
-It's a release that support Ruby 2.2.0 preview2.
+It's a release that supports Ruby 2.2.0 preview2.
 
 ### Improvements
 

data/lib/test/unit/code-snippet-fetcher.rb

@@ -41,6 +41,7 @@ module Test
       end
 
       def detect_encoding(first_line)
+        return nil unless first_line.respond_to?(:ascii_only?)
         return nil unless first_line.ascii_only?
         if /\b(?:en)?coding[:=]\s*([a-z\d_-]+)/i =~ first_line
           begin

data/lib/test/unit/color-scheme.rb

@@ -19,16 +19,22 @@ module Test
           @@default_for_8_colors ||=
             new("pass" => Color.new("green", :background => true) +
                           Color.new("white", :bold => true),
+                "pass-marker" => Color.new("green", :bold => true),
                 "failure" => Color.new("red", :background => true) +
                              Color.new("white", :bold => true),
+                "failure-marker" => Color.new("red"),
                 "pending" => Color.new("magenta", :background => true) +
                              Color.new("white", :bold => true),
+                "pending-marker" => Color.new("magenta"),
                 "omission" => Color.new("blue", :background => true) +
                              Color.new("white", :bold => true),
+                "omission-marker" => Color.new("blue"),
                 "notification" => Color.new("cyan", :background => true) +
                                   Color.new("white", :bold => true),
+                "notification-marker" => Color.new("cyan"),
                 "error" => Color.new("black", :background => true) +
                            Color.new("yellow", :bold => true),
+                "error-marker" => Color.new("yellow"),
                 "case" => Color.new("blue", :background => true) +
                           Color.new("white", :bold => true),
                 "suite" => Color.new("green", :background => true) +
@@ -50,16 +56,22 @@ module Test
           @@default_for_256_colors ||=
             new("pass" => Color.new("030", :background => true) +
                           Color.new("555", :bold => true),
+                "pass-marker" => Color.new("050", :bold => true),
                 "failure" => Color.new("300", :background => true) +
                              Color.new("555", :bold => true),
+                "failure-marker" => Color.new("500"),
                 "pending" => Color.new("303", :background => true) +
                               Color.new("555", :bold => true),
+                "pending-marker" => Color.new("303"),
                 "omission" => Color.new("001", :background => true) +
                               Color.new("555", :bold => true),
+                "omission-marker" => Color.new("001"),
                 "notification" => Color.new("011", :background => true) +
                                   Color.new("555", :bold => true),
+                "notification-marker" => Color.new("011"),
                 "error" => Color.new("000", :background => true) +
                            Color.new("550", :bold => true),
+                "error-marker" => Color.new("550"),
                 "case" => Color.new("220", :background => true) +
                           Color.new("555", :bold => true),
                 "suite" => Color.new("110", :background => true) +
@@ -95,16 +107,43 @@ module Test
         end
 
         def available_colors
+          guess_available_colors_from_vte_version_env ||
+            guess_available_colors_from_colorterm_env ||
+            guess_available_colors_from_term_env ||
+            8
+        end
+
+        private
+        def guess_available_colors_from_vte_version_env
+          vte_version = ENV["VTE_VERSION"]
+          return nil if vte_version.nil?
+
+          major = 0
+          minor = 13
+          micro = 0
+          packed_version = major * 10000 + minor * 100 + micro
+          if vte_version.to_i >= packed_version
+            256
+          else
+            8
+          end
+        end
+
+        def guess_available_colors_from_colorterm_env
           case ENV["COLORTERM"]
-          when "gnome-terminal"
+          when "gnome-terminal", "xfce4-terminal"
             256
           else
-            case ENV["TERM"]
-            when /-256color\z/
-              256
-            else
-              8
-            end
+            nil
+          end
+        end
+
+        def guess_available_colors_from_term_env
+          case ENV["TERM"]
+          when /-256color\z/
+            256
+          else
+            nil
           end
         end
       end

data/lib/test/unit/ui/console/testrunner.rb

@@ -6,6 +6,11 @@
 #   * Copyright (c) 2008-2013 Kouhei Sutou <kou@clear-code.com>
 # License:: Ruby license.
 
+begin
+  require 'io/console'
+rescue LoadError
+end
+
 require 'test/unit/color-scheme'
 require 'test/unit/code-snippet-fetcher'
 require 'test/unit/fault-location-detector'
@@ -89,7 +94,8 @@ module Test
 
           def add_fault(fault)
             @faults << fault
-            output_progress(fault.single_character_display, fault_color(fault))
+            output_progress(fault.single_character_display,
+                            fault_marker_color(fault))
             output_progress_in_detail(fault) if @show_detail_immediately
             @already_outputted = true if fault.critical?
           end
@@ -173,17 +179,17 @@ module Test
           def output_fault_in_detail(fault)
             if fault.is_a?(Failure) and
                 fault.inspected_expected and fault.inspected_actual
-              output_single(fault.label, fault_color(fault))
-              output(":")
-              output(fault.test_name)
+              output_single("#{fault.label}: ")
+              output(fault.test_name, fault_color(fault))
               output_fault_backtrace(fault)
               output_failure_message(fault)
             else
-              output_single(fault.label, fault_color(fault))
               if fault.is_a?(Error)
-                output(": #{fault.test_name}")
+                output_single("#{fault.label}: ")
+                output(fault.test_name, fault_color(fault))
                 output_fault_message(fault)
               else
+                output_single(fault.label, fault_color(fault))
                 output_fault_message(fault)
                 output(fault.test_name)
               end
@@ -308,11 +314,11 @@ module Test
 
           def output_statistics(elapsed_time)
             output("Finished in #{elapsed_time} seconds.")
-            nl
-            output(@result, result_color)
-            output("%g%% passed" % @result.pass_percentage, result_color)
+            output_summary_marker
+            output(@result)
+            output("%g%% passed" % @result.pass_percentage)
             unless elapsed_time.zero?
-              nl
+              output_summary_marker
               test_throughput = @result.run_count / elapsed_time
               assertion_throughput = @result.assertion_count / elapsed_time
               throughput = [
@@ -323,6 +329,16 @@ module Test
             end
           end
 
+          def output_summary_marker
+            term_width = guess_term_width
+            if term_width.zero?
+              marker_width = 6
+            else
+              marker_width = term_width
+            end
+            output("-" * marker_width, summary_marker_color)
+          end
+
           def test_started(test)
             return unless output?(VERBOSE)
 
@@ -337,7 +353,7 @@ module Test
 
           def test_finished(test)
             unless @already_outputted
-              output_progress(".", color("pass"))
+              output_progress(".", color("pass-marker"))
             end
             @already_outputted = false
 
@@ -423,7 +439,7 @@ module Test
 
           def output_progress_in_detail_marker(fault)
             if @progress_row_max > 0
-              output("=" * @progress_row_max, fault_color(fault))
+              output("=" * @progress_row_max)
             else
               nl
             end
@@ -453,20 +469,25 @@ module Test
             _color
           end
 
+          def fault_class_color_name(fault_class)
+            fault_class.name.split(/::/).last.downcase
+          end
+
           def fault_color(fault)
-            fault_class_color(fault.class)
+            color(fault_class_color_name(fault.class))
           end
 
-          def fault_class_color(fault_class)
-            color(fault_class.name.split(/::/).last.downcase)
+          def fault_marker_color(fault)
+            color("#{fault_class_color_name(fault.class)}-marker")
           end
 
-          def result_color
-            color(@result.status)
+          def summary_marker_color
+            color("#{@result.status}-marker")
           end
 
           def guess_color_availability
             return false unless @output.tty?
+            return true if windows? and ruby_2_0_or_later?
             case ENV["TERM"]
             when /(?:term|screen)(?:-(?:256)?color)?\z/
               true
@@ -476,6 +497,14 @@ module Test
             end
           end
 
+          def windows?
+            /mswin|mingw/ === RUBY_PLATFORM
+          end
+
+          def ruby_2_0_or_later?
+            RUBY_VERSION >= "2.0.0"
+          end
+
           def guess_progress_row_max
             term_width = guess_term_width
             if term_width.zero?
@@ -490,9 +519,30 @@ module Test
           end
 
           def guess_term_width
-            Integer(ENV["COLUMNS"] || ENV["TERM_WIDTH"] || 0)
-          rescue ArgumentError
-            0
+            guess_term_width_from_io || guess_term_width_from_env || 0
+          end
+
+          def guess_term_width_from_io
+            if @output.respond_to?(:winsize)
+              begin
+                @output.winsize[1]
+              rescue SystemCallError
+                nil
+              end
+            else
+              nil
+            end
+          end
+
+          def guess_term_width_from_env
+            env = ENV["COLUMNS"] || ENV["TERM_WIDTH"]
+            return nil if env.nil?
+
+            begin
+              Integer(env)
+            rescue ArgumentError
+              nil
+            end
           end
         end
 
@@ -503,6 +553,7 @@ module Test
           end
 
           def need_diff?(options={})
+            return false if one_line_all_change?
             operations.each do |tag,|
               return true if [:replace, :equal].include?(tag)
             end
@@ -510,6 +561,18 @@ module Test
           end
 
           private
+          def one_line_all_change?
+            return false if operations.size != 1
+
+            tag, from_start, from_end, to_start, to_end = operations.first
+            return false if tag != :replace
+            return false if [from_start, from_end] != [0, 1]
+            return false if [from_start, from_end] != [to_start, to_end]
+
+            _, _, _line_operations = line_operations(@from.first, @to.first)
+            _line_operations.size == 1
+          end
+
           def output_single(something, color=nil)
             @runner.__send__(:output_single, something, color)
           end

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '3.0.8'
+    VERSION = '3.0.9'
   end
 end

data/test/test-color-scheme.rb

@@ -54,36 +54,29 @@ class TestUnitColorScheme < Test::Unit::TestCase
     end
 
     def test_default
-      expected_schema = {
-        "pass"                => color("green",   :background => true) +
-                                 color("white",   :bold       => true),
-        "failure"             => color("red",     :background => true) +
-                                 color("white",   :bold       => true),
-        "pending"             => color("magenta", :background => true) +
-                                 color("white",   :bold       => true),
-        "omission"            => color("blue",    :background => true) +
-                                 color("white",   :bold       => true),
-        "notification"        => color("cyan",    :background => true) +
-                                 color("white",   :bold       => true),
-        "error"               => color("black",   :background => true) +
-                                 color("yellow",  :bold       => true),
-        "case"                => color("blue",    :background => true) +
-                                 color("white",   :bold       => true),
-        "suite"               => color("green",   :background => true) +
-                                 color("white",   :bold       => true),
-        "diff-inserted-tag"   => color("red",     :background => true) +
-                                 color("black",   :bold       => true),
-        "diff-deleted-tag"    => color("green",   :background => true) +
-                                 color("black",   :bold       => true),
-        "diff-difference-tag" => color("cyan",    :background => true) +
-                                 color("white",   :bold       => true),
-        "diff-inserted"       => color("red",     :background => true) +
-                                 color("white",   :bold       => true),
-        "diff-deleted"        => color("green",   :background => true) +
-                                 color("white",   :bold       => true),
-      }
-      assert_equal(expected_schema,
-                   Test::Unit::ColorScheme.default.to_hash)
+      expected_schema_keys = [
+        "pass",
+        "pass-marker",
+        "failure",
+        "failure-marker",
+        "pending",
+        "pending-marker",
+        "omission",
+        "omission-marker",
+        "notification",
+        "notification-marker",
+        "error",
+        "error-marker",
+        "case",
+        "suite",
+        "diff-inserted-tag",
+        "diff-deleted-tag",
+        "diff-difference-tag",
+        "diff-inserted",
+        "diff-deleted",
+      ]
+      assert_equal(expected_schema_keys.sort,
+                   Test::Unit::ColorScheme.default.to_hash.keys.sort)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert