mswin-build 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea4522da05a50075fbbb6e7cfc25d221312a7e37
-  data.tar.gz: 2c95e422c2abeb72b3e50c6fb6fc27b3a2fd1843
+  metadata.gz: ef8ffb17f2b65277994eb03de262f14ac5055bd6
+  data.tar.gz: 42b4bff8a9a4a37d7aa1345921e19ea499829f14
 SHA512:
-  metadata.gz: 52f6c484f354119931fb4db8288441175e53ada21d86b7cd5814c2881f2989a111d6dba8137efd708bcc2fc485727e05e5a340965cf155f96821be8f088e332d
-  data.tar.gz: 7ab23c4af24e811a00cd27255fde6f7d0377a989fa5ee2e98a133f0357a9c3d1b4d0e76e0ac979a7e9e5ec04c7fa98e00d3ca5000c0a424e4aa58650fe678229
+  metadata.gz: 801e3996986c90fc01854d61eaa675ba28fdbf8d99bf095a500515e9589fce4c6d68aec0c3192ab63e316fde0dd8c1d883a2818026dd106c1a6a9e28e89aa243
+  data.tar.gz: 5daafc2900cca3ce36c98fe167865ac00b09e1aab10f4dcc6044356c86ff1ad5bcb6ea081b374d6462dd274c4ccf95bf7c8efe20b5af41b0269c75d6160d690d

data/bin/tinyhttpd.rb

@@ -1,4 +1,4 @@
-#! ruby
+#!ruby
 # expected ruby 1.9.x or later.
 
 require "webrick"
@@ -7,9 +7,12 @@ class WEBrick::HTTPServer
   alias :__rewrite_old_service :service
   def service(req, res)
     ret = __rewrite_old_service(req, res)
-    if /\.html\.gz\z/ =~ req.path
+    case req.path
+    when /\.html\.gz\z/
       res.header["content-encoding"] = "gzip"
       res.header["content-type"] = "text/html"
+    when /\.ltsv\z/
+      res.header["content-type"] = "text/plain"
     end
   end
 end

data/lib/mswin-build/builder.rb

@@ -256,6 +256,7 @@ module MswinBuild
           io.puts "exit #{status.to_i}" unless status.nil?
           io.puts "failed(#{name})"
           @title << "failed(#{name})" if check_retval || status.nil?
+          @data["failure_#{name}"] = "failed(#{name})"
           @data[:result] = "failure"
           @links[name] << "failed"
           if $DEBUG
@@ -269,6 +270,7 @@ module MswinBuild
         io.puts $!.backtrace.join("\n| ")
         io.puts "failed(#{name} CommandTimeout)"
         @title << "failed(#{name} CommandTimeout)"
+        @data["failure_#{name}"] = "failed(#{name} CommandTimeout)"
         @data[:result] = "failure"
         @links[name] << "failed"
         if $DEBUG
@@ -399,8 +401,10 @@ module MswinBuild
         io.rewind
         if %r'^FAIL (\d+)/\d+' =~ io.read
           @title << "#{$1}BFail"
+          @data["failure_btest"] = "#{$1}BFail"
         else
           @title << "failed(btest)"
+          @data["failure_btest"] = "failed"
         end
         @data[:result] = "failure"
       end
@@ -412,8 +416,10 @@ module MswinBuild
         io.rewind
         if %r'^not ok/test: \d+ failed (\d+)' =~ io.read
           @title << "#{$1}NotOK"
+          @data["failure_test.rb"] = "#{$1}NotOK"
         else
           @title << "failed(test.rb)"
+          @data["failure_test.rb"] = "failed"
         end
         @data[:result] = "failure"
       end
@@ -468,9 +474,13 @@ module MswinBuild
         io.rewind
         if %r'^\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors, (\d+) skips' =~ io.read
           @title << "#{$1}F#{$2}E"
-          @data[:result] = "failure" if $1.to_i + $2.to_i > 0
+          if $1.to_i + $2.to_i > 0
+            @data["failure_test-all"] = "#{$1}F#{$2}E"
+            @data[:result] = "failure" 
+          end
         else
           @title << "failed(test-all)"
+          @data["failure_test-all"] = "failed"
           @data[:result] = "failure"
         end
       end
@@ -563,15 +573,27 @@ module MswinBuild
           end
         end
       end
-      @title.insert(2, "#{warns}W") if warns > 0
+      title = @title[0, 2]
       @data[:warn] = "#{warns}W"
+      if warns > 0
+        @title.insert(2, @data[:warn])
+        title << @data[:warn]
+      end
       url = @data.delete(:svn_url)
       if revision
-        @title.unshift("r#{revision}")
         @data[:ruby_rev] = "r#{revision}"
+        @title.unshift(@data[:ruby_rev])
+        title.unshift(@data[:ruby_rev])
         @data[:version] = "#{@data[:ruby_rev]} #{@data[:version]}"
         @data[url] = revision
       end
+      @data.each_pair do |k, v|
+        if k.is_a?(String) && /^failure_/ =~ k
+          v = "#{$'}:#{v}" if $' == "rubyspec"
+          title << v
+        end
+      end
+      @data[:title] = title.join(' ')
       open(logfile, "w") do |out|
         header(out)
         out.puts "    <ul>"
@@ -626,7 +648,6 @@ module MswinBuild
       end
 
       title = @title.join(' ')
-      @data[:title] = title
       time = @data[:start_time]
       latest = %'<a href="log/#{u time}.log.html.gz" name="#{u time}">#{h time}</a> #{h title} (<a href="log/#{u time}.diff.html.gz">#{@diff ? h(@diff) : "no diff"}</a>)<br>'
       if mode == :recent
@@ -683,7 +704,7 @@ module MswinBuild
           k = k.to_s
           k = k.gsub(/:/, '\\x3A')
           v = v.gsub(/\t/, ' ')
-          k = %'"#{k}"' if /\W/ =~ k
+          k = %'"#{k}"' if /\\/ =~ k
           "#{k}:#{v}"
         }.join("\t")
         old.unshift(latest)

data/lib/mswin-build/version.rb

@@ -1,3 +1,3 @@
 module MswinBuild
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/unit/test_builder.rb

@@ -201,7 +201,7 @@ env:
     assert_match(/\bresult:success\b/, recent)
     assert_match(/\bruby_rev:r12345\b/, recent)
     assert_match(/"http\\x3A\/\/[^:]+":12345\b/, recent)
-    assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
+    assert_not_match(/\btitle:[^\t]*\b(failed|success|\dE\dF)\b/, recent)
   end
 
   def test_run_btest_failure
@@ -228,6 +228,7 @@ env:
 
     recent = File.read(File.join(@tmpdir, "recent.ltsv"))
     assert_match(/\bresult:failure\b/, recent)
+    assert_match(/\bfailure_btest:3BFail\b/, recent)
     assert_match(/\btitle:[^\t]*\b3BFail\b/, recent)
     assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
   end
@@ -256,6 +257,7 @@ env:
 
     recent = File.read(File.join(@tmpdir, "recent.ltsv"))
     assert_match(/\bresult:failure\b/, recent)
+    assert_match(/\bfailure_test.rb:4NotOK\b/, recent)
     assert_match(/\btitle:[^\t]*\b4NotOK\b/, recent)
     assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
   end
@@ -284,6 +286,7 @@ env:
 
     recent = File.read(File.join(@tmpdir, "recent.ltsv"))
     assert_match(/\bresult:failure\b/, recent)
+    assert_match(/\bfailure_test-all:2F1E\b/, recent)
     assert_match(/\btitle:[^\t]*\b2F1E\b/, recent)
     assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
   end
@@ -309,6 +312,7 @@ env:
 
     recent = File.read(File.join(@tmpdir, "recent.ltsv"))
     assert_match(/\bresult:failure\b/, recent)
+    assert_match(/\bfailure_test-all:failed\(test-all CommandTimeout\)/, recent)
     assert_match(/\btitle:[^\t]*\bfailed\(test-all CommandTimeout\)/, recent)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mswin-build
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler