jstdutil 0.3.5 → 0.3.6

data/Changelog

@@ -1,3 +1,8 @@
+== 0.3.6 / 2011-05-07
+* Work around broken utf-8 output from jstestdriver (skip formatting)
+  Thanks to Thomas Pickert
+* jsautotest now finds files like -test.js as well as _test.js
+
 == 0.3.5 / 2010-10-31
 * Bright colors that work on Windows
 * Autotest no longer initially runs all tests

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/jstdutil/formatter.rb

@@ -7,23 +7,27 @@ module Jstdutil
     def self.format(report, type)
       return "" if report.nil?
 
-      type.wrap_report(report.split("\n").collect do |line|
-        if line =~ /Passed: 0; Fails: 0; Errors:? 0/
-          type::Color.yellow(line)
-        elsif line =~ /Passed: \d+; Fails: (\d+); Errors:? (\d+)/
-          type::Color.send($1.to_i + $2.to_i != 0 ? :red : :green, line)
-        elsif line =~ /^[\.EF]+$/
-          line.gsub(/\./, type::Color.green(".")).gsub(/F/, type::Color.red("F")).gsub("E", type::Color.yellow("E"))
-        elsif line =~ /failed/
-          type::Color.red(line)
-        elsif line =~ /passed/
-          type::Color.green(line)
-        elsif line =~ /error/
-          type::Color.yellow(line)
-        else
-          line
-        end
-      end.join("\n"))
+      begin
+        type.wrap_report(report.split("\n").collect do |line|
+          if line =~ /Passed: 0; Fails: 0; Errors:? 0/
+            type::Color.yellow(line)
+          elsif line =~ /Passed: \d+; Fails: (\d+); Errors:? (\d+)/
+            type::Color.send($1.to_i + $2.to_i != 0 ? :red : :green, line)
+          elsif line =~ /^[\.EF]+$/
+            line.gsub(/\./, type::Color.green(".")).gsub(/F/, type::Color.red("F")).gsub("E", type::Color.yellow("E"))
+          elsif line =~ /failed/
+            type::Color.red(line)
+          elsif line =~ /passed/
+            type::Color.green(line)
+          elsif line =~ /error/
+            type::Color.yellow(line)
+          else
+            line
+          end
+        end.join("\n"))
+      rescue
+        report
+      end
     end
   end
 end

data/lib/jstdutil/test_file.rb

@@ -12,11 +12,11 @@ module Jstdutil
     def test_files
       return @test_files if @test_files
 
-      if @file =~ /(_test[^\/]+)|([^\/]+_test)\.js/
+      if @file =~ /([-_]test[^\/]+)|([^\/]+[-_]test)\.js/
         @test_files = [@file]
       else
-        name = File.basename(@file).gsub(/(_test)|(test_)|(\.js)/, "")
-        @test_files = FileList["**/#{name}_test.js", "**/test_#{name}.js"].uniq
+        name = File.basename(@file).gsub(/([-_]test)|(test[-_])|(\.js)/, "")
+        @test_files = FileList["**/#{name}_test.js", "**/test_#{name}.js", "**/#{name}-test.js", "**/test-#{name}.js"].uniq
       end
     end
 

data/test/test_file_test.rb

@@ -14,7 +14,7 @@ class TestFileTest < Test::Unit::TestCase
     should "find files like _test.js" do
       file = "some.js"
       test_file = Jstdutil::TestFile.new(file)
-      FileList.expects(:new).with("**/some_test.js", "**/test_some.js").returns([])
+      FileList.expects(:new).with("**/some_test.js", "**/test_some.js", "**/some-test.js", "**/test-some.js").returns([])
 
       assert test_file.test_files
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jstdutil
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Christian Johansen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 +02:00
+date: 2011-05-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,8 +104,8 @@ homepage: http://github.com/cjohansen/jstdutil
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -134,12 +134,12 @@ signing_key:
 specification_version: 3
 summary: Thin wrapper over Google's JsTestDriver that adds colors and autotest
 test_files: 
-- test/jstestdriver_test.rb
-- test/jstestdriver_config_test.rb
-- test/test_file_test.rb
+- test/cli_test.rb
 - test/colorful_html_test.rb
+- test/formatter_test.rb
 - test/jstdutil_test.rb
-- test/test_helper.rb
-- test/cli_test.rb
+- test/jstestdriver_config_test.rb
+- test/jstestdriver_test.rb
 - test/redgreen_test.rb
-- test/formatter_test.rb
+- test/test_file_test.rb
+- test/test_helper.rb