test-unit 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f581555a5f5e042d125194d870c79a4e8fd4c78e
-  data.tar.gz: a35bda12604b51db52009764c5439e657c3964a7
+  metadata.gz: 93a1e018c9d985f96f57f4a1cb7c166ac584d4d7
+  data.tar.gz: 90fc5bcea7299d0fe43153e2eb6a447e9b3823f2
 SHA512:
-  metadata.gz: 90dd03711e6fe149f451de04c211ec5248a63cb8915a551444920f4b5f0a06f361af028613ac178f05b7f268461d06a3b465b90bf9cd62d51d368aa45deded4c
-  data.tar.gz: bfc59126ae597c329b5819a91556ce55710bba21f2a443838f596fe31d4f6366715a2eb533abcbd8c4e7ca016046d9ac04c12d8b53953241a359da7303ddd3e6
+  metadata.gz: 22541bbd0a7fe30eb6227f6498e1af4316d749f2f766da3f9266562c9d39ac3f7650ea7e1764b05ec43b150019e8e073045f4a876a7f9ac305cffeb197cc5a79
+  data.tar.gz: bd5da3acef525e1c3f3539dd09a5509fa531c3be20c15567e955ce79573f57cbe7467cc143e25e9bcaf5dbe83a6289ad084262ccec99ff7cba18351a2be7553d

data/README.md

@@ -34,7 +34,8 @@ writing tests, checking results and automated testing in Ruby.
 
 ## How To
 
-* [doc/text/how-to.md](doc/text/how-to.md)
+* [How To](doc/text/how-to.md) (link for GitHub)
+* {file:doc/text/how-to.md How To} (link for YARD)
 
 ## Install
 

data/doc/text/news.md

@@ -1,5 +1,29 @@
 # News
 
+## 3.0.8 - 2014-12-12 {#version-3-0-8}
+
+It's a release that support Ruby 2.2.0 preview2.
+
+### Improvements
+
+  * Added a link for YARD in README.
+    [GitHub:test-unit.github.io#2][Reported by sunnyone]
+  * Added description about "/PATTERN/" style value in auto runner usage.
+    [GitHub#86][Suggested by sunnyone]
+  * Supported Ruby 2.2.0 preview2 in `assert_throw` and
+    `assert_nothing_thrown`.
+
+### Fixes
+
+  * Fixed a bug that error report is failed when source encoding and
+    locale encoding are different.
+    [GitHub#87][Reported by scivola]
+
+### Thanks
+
+  * sunnyone
+  * scivola
+
 ## 3.0.7 - 2014-11-14 {#version-3-0-7}
 
 It's a minor update release.

data/lib/test/unit/assertions.rb

@@ -739,11 +739,47 @@ EOT
       end
 
       # @private
-      UncaughtThrow = {
-        NameError => /^uncaught throw `(.+)'$/,
-        ArgumentError => /^uncaught throw (`.+'|.+)$/,
-        ThreadError => /^uncaught throw `(.+)' in thread /,
-      }
+      class ThrowTagExtractor
+        @@have_uncaught_throw_error = const_defined?(:UncaughtThrowError)
+
+        UncaughtThrowPatterns = {
+          NameError => /^uncaught throw `(.+)'$/,
+          ArgumentError => /^uncaught throw (`.+'|.+)$/,
+          ThreadError => /^uncaught throw `(.+)' in thread /,
+        }
+
+        def initialize(error)
+          @error = error
+        end
+
+        def extract_tag
+          tag = nil
+          if @@have_uncaught_throw_error
+            return nil unless @error.is_a?(UncaughtThrowError)
+            tag = @error.tag
+          else
+            pattern = UncaughtThrowPatterns[@error.class]
+            return nil if pattern.nil?
+            return nil unless pattern =~ @error.message
+            tag = $1
+          end
+          normalize_tag(tag)
+        end
+
+        private
+        def normalize_tag(tag)
+          case tag
+          when /\A:/
+            tag[1..-1].intern
+          when /\A`(.+)'\z/
+            $1.intern
+          when String
+            tag.intern
+          else
+            tag
+          end
+        end
+      end
 
       ##
       # Passes if the block throws +expected_object+
@@ -773,9 +809,10 @@ EOT
                                          "<?> should have been thrown.",
                                          expected_object)
             assert_block(full_message) {caught}
-          rescue NameError, ArgumentError, ThreadError => error
-            raise unless UncaughtThrow[error.class] =~ error.message
-            tag = AssertionMessage.normalize_tag($1)
+          rescue => error
+            extractor = ThrowTagExtractor.new(error)
+            tag = extractor.extract_tag
+            raise if tag.nil?
             full_message = build_message(message,
                                          "<?> expected to be thrown but\n" +
                                          "<?> was thrown.",
@@ -802,9 +839,10 @@ EOT
           assert(block_given?, "Should have passed a block to assert_nothing_thrown")
           begin
             proc.call
-          rescue NameError, ArgumentError, ThreadError => error
-            raise unless UncaughtThrow[error.class] =~ error.message
-            tag = AssertionMessage.normalize_tag($1)
+          rescue => error
+            extractor = ThrowTagExtractor.new(error)
+            tag = extractor.extract_tag
+            raise if tag.nil?
             full_message = build_message(message,
                                          "<?> was thrown when nothing was expected",
                                          tag)
@@ -1671,19 +1709,6 @@ EOT
             MaybeContainer.new(value, &formatter)
           end
 
-          def normalize_tag(tag)
-            case tag
-            when /\A:/
-              tag[1..-1].intern
-            when /\A`(.+)'\z/
-              $1.intern
-            when String
-              tag.intern
-            else
-              tag
-            end
-          end
-
           MAX_DIFF_TARGET_STRING_SIZE = 1000
           def max_diff_target_string_size
             return @@max_diff_target_string_size if @@max_diff_target_string_size

data/lib/test/unit/autorunner.rb

@@ -212,7 +212,7 @@ module Test
 
           o.on('-n', '--name=NAME', String,
                "Runs tests matching NAME.",
-               "(patterns may be used).") do |name|
+               "Use '/PATTERN/' for NAME to use regular expression.") do |name|
             name = (%r{\A/(.*)/\Z} =~ name ? Regexp.new($1) : name)
             @filters << lambda do |test|
               return true if name === test.method_name
@@ -226,7 +226,7 @@ module Test
 
           o.on('--ignore-name=NAME', String,
                "Ignores tests matching NAME.",
-               "(patterns may be used).") do |n|
+               "Use '/PATTERN/' for NAME to use regular expression.") do |n|
             n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
             case n
             when Regexp
@@ -238,7 +238,7 @@ module Test
 
           o.on('-t', '--testcase=TESTCASE', String,
                "Runs tests in TestCases matching TESTCASE.",
-               "(patterns may be used).") do |n|
+               "Use '/PATTERN/' for TESTCASE to use regular expression.") do |n|
             n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
             @filters << lambda do |test|
               match_test_case_name(test, n)
@@ -247,7 +247,7 @@ module Test
 
           o.on('--ignore-testcase=TESTCASE', String,
                "Ignores tests in TestCases matching TESTCASE.",
-               "(patterns may be used).") do |n|
+               "Use '/PATTERN/' for TESTCASE to use regular expression.") do |n|
             n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
             @filters << lambda do |test|
               not match_test_case_name(test, n)

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

@@ -5,9 +5,9 @@ module Test
         @sources = {}
       end
 
-      def fetch(file, line, options={})
+      def fetch(path, line, options={})
         n_context_line = options[:n_context_line] || 3
-        lines = source(file)
+        lines = source(path)
         return [] if lines.nil?
         min_line = [line - n_context_line, 1].max
         max_line = [line + n_context_line, lines.length].min
@@ -18,14 +18,39 @@ module Test
         end
       end
 
-      def source(file)
-        @sources[file] ||= read_source(file)
+      def source(path)
+        @sources[path] ||= read_source(path)
       end
 
       private
-      def read_source(file)
-        return nil unless File.exist?(file)
-        File.readlines(file)
+      def read_source(path)
+        return nil unless File.exist?(path)
+        lines = []
+        File.open(path) do |file|
+          first_line = file.gets
+          break if first_line.nil?
+          encoding = detect_encoding(first_line)
+          if encoding
+            first_line.force_encoding(encoding)
+            file.set_encoding(encoding)
+          end
+          lines << first_line
+          lines.concat(file.readlines)
+        end
+        lines
+      end
+
+      def detect_encoding(first_line)
+        return nil unless first_line.ascii_only?
+        if /\b(?:en)?coding[:=]\s*([a-z\d_-]+)/i =~ first_line
+          begin
+            Encoding.find($1)
+          rescue ArgumentError
+            nil
+          end
+        else
+          nil
+        end
       end
     end
   end

data/lib/test/unit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert
@@ -234,44 +234,44 @@ signing_key:
 specification_version: 4
 summary: An xUnit family unit testing framework for Ruby.
 test_files:
-- test/test-test-case.rb
 - test/test-assertions.rb
+- test/test-color.rb
 - test/test-code-snippet.rb
 - test/test-test-suite-creator.rb
-- test/test-fault-location-detector.rb
-- test/test-omission.rb
 - test/test-test-result.rb
-- test/collector/test-descendant.rb
-- test/collector/test_dir.rb
-- test/collector/test-load.rb
-- test/collector/test_objectspace.rb
-- test/test-color.rb
-- test/test-attribute-matcher.rb
 - test/test-error.rb
-- test/test-diff.rb
+- test/test-failure.rb
+- test/run-test.rb
 - test/test-pending.rb
-- test/test-emacs-runner.rb
-- test/util/test_backtracefilter.rb
-- test/util/test_procwrapper.rb
+- test/test-color-scheme.rb
+- test/test-attribute-matcher.rb
+- test/testunit-test-util.rb
+- test/test-data.rb
+- test/ui/test_testrunmediator.rb
+- test/util/test-method-owner-finder.rb
 - test/util/test-output.rb
 - test/util/test_observable.rb
-- test/util/test-method-owner-finder.rb
-- test/test-data.rb
-- test/fixtures/no-header.tsv
-- test/fixtures/header-label.csv
+- test/util/test_backtracefilter.rb
+- test/util/test_procwrapper.rb
+- test/test-omission.rb
+- test/test-test-case.rb
+- test/test-fixture.rb
 - test/fixtures/no-header.csv
 - test/fixtures/header-label.tsv
 - test/fixtures/plus.csv
+- test/fixtures/no-header.tsv
+- test/fixtures/header-label.csv
 - test/fixtures/header.csv
 - test/fixtures/header.tsv
-- test/test-test-suite.rb
-- test/test-color-scheme.rb
+- test/collector/test-descendant.rb
+- test/collector/test_objectspace.rb
+- test/collector/test-load.rb
+- test/collector/test_dir.rb
 - test/test-priority.rb
+- test/test-test-suite.rb
+- test/test-diff.rb
+- test/test-emacs-runner.rb
 - test/test-attribute.rb
-- test/run-test.rb
-- test/test-fixture.rb
+- test/test-fault-location-detector.rb
 - test/test-notification.rb
-- test/test-failure.rb
-- test/testunit-test-util.rb
-- test/ui/test_testrunmediator.rb
 has_rdoc: