mswin-build 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04dd66454d1375114da0bdc7c13e8caade4177d5
-  data.tar.gz: d042c5b0f15c2e0434d5542c7387eedb87b313ba
+  metadata.gz: 3e3caa55131f9d640fb35fadfc93c7b53562d1b6
+  data.tar.gz: fc4f25f04c6fc563025922ae88155294221d229e
 SHA512:
-  metadata.gz: 3afae83b34dba29b69425e3452f2eda1da721ab91ebae7d635a76013436bac846bfb7846378c3980a930e47f1a0cb0b7cf89cc3c249a75c34ff59f43d8cf03ec
-  data.tar.gz: 1333f4d3a83d48fe9c7a6c497852193455e867600c24b31eb694c0def0a6c65784b060a89dd9e3084b794b8280511a125955cc8f648d6e609cd83d632ff5fa08
+  metadata.gz: 19093b7cd32b3583125ffbd81c7feceaac6d1e7b5a79105a7e6089615da62e045d2c40102544db76c09471059599c4e6f1ebf16cc59141116630b1b4822ad2f4
+  data.tar.gz: 301321b2a7e5fa1cb32749610ac4d9805db209a0ebc47164d0e7013e17fb832a39b241807f2b7ede812dc4037ad7ebb977cc40af7c40ec5432ab7cae648c9862

data/bin/kicker.rb

@@ -32,6 +32,7 @@ rescue RuntimeError => ex
   puts opt.help
   exit 1
 end
+STDOUT.sync = true if $debug
 
 loop do
   ARGV.each do |target|

data/lib/mswin-build/builder.rb

@@ -83,6 +83,7 @@ module MswinBuild
           ENV[name] = value
         end
         files = []
+        @fails = []
         Dir.mktmpdir("mswin-build", @config["tmpdir"]) do |tmpdir|
           files << baseinfo(tmpdir)
           files << checkout(tmpdir)
@@ -109,14 +110,23 @@ module MswinBuild
             files << rubyspec(tmpdir)
           end
           files << end_(tmpdir)
-          logfile = gather_log(files, tmpdir)
+          logfile, failfile = gather_log(files, tmpdir)
+          files.each do |io|
+            if io
+              io.close
+              File.unlink(io.path)
+            end
+          end
           difffile = diff(tmpdir, logfile)
           logfile = gzip(logfile)
           @data[:compressed_loghtml_relpath] = File.join("log", File.basename(logfile))
           difffile = gzip(difffile)
           @data[:compressed_diffhtml_relpath] = File.join("log", File.basename(difffile))
-          add_recent(logfile)
-          add_summary(logfile)
+          failfile = gzip(failfile)
+          @data[:compressed_failhtml_relpath] = File.join("log", File.basename(failfile))
+
+          add_recent(logfile, difffile, failfile)
+          add_summary(logfile, difffile, failfile)
 
           MswinBuild.run_upload_hooks
         end
@@ -254,6 +264,7 @@ module MswinBuild
         end
 
         if status.nil? || !status.success?
+          @fails << io
           io.puts "exit #{status.to_i}" unless status.nil?
           io.puts "failed(#{name})"
           @title << "failed(#{name})" if check_retval || status.nil?
@@ -266,6 +277,7 @@ module MswinBuild
           end
         end
       rescue Timeout::Error
+        @fails << io
         io.puts
         io.printf "|output interval exceeds %.1f seconds. (CommandTimeout)", @config["timeout"][name] || @config["timeout"]["default"]
         io.puts $!.backtrace.join("\n| ")
@@ -292,7 +304,7 @@ module MswinBuild
       end
       anchor = u name.to_s.tr('_', '-')
       text = h name.to_s.tr('_', '-')
-      io.puts %'<a name="#{anchor}">== #{text}</a> \# #{h Time.now.iso8601}'
+      io.puts %'<a name="#{anchor}">== #{text} \# #{h Time.now.iso8601}</a>'
       @links[name] = [anchor, text]
     end
 
@@ -309,6 +321,10 @@ module MswinBuild
       end
     end
 
+    def define_failure_start_pattern(io, *patterns)
+      io.instance_variable_set(:@failure_start_patterns, patterns)
+    end
+
     define_buildmethod(:baseinfo) do |io, tmpdir|
       @start_time = Time.now
       @data[:start_time] = @start_time.dup.utc.strftime('%Y%m%dT%H%M%SZ')
@@ -397,8 +413,10 @@ module MswinBuild
     end
 
     define_buildmethod(:btest) do |io, tmpdir|
+      define_failure_start_pattern(io, /: $/, /:\d+:in `/)
       ret = do_command(io, "btest", 'nmake -l "OPTS=-v -q" btest', true, false)
       if !ret && !ret.nil?
+        @fails << io unless @fails.include?(io)
         io.rewind
         if %r'^FAIL (\d+)/\d+' =~ io.read
           @title << "#{$1}BFail"
@@ -414,6 +432,7 @@ module MswinBuild
     define_buildmethod(:testrb) do |io, tmpdir|
       ret = do_command(io, "test.rb", "./miniruby sample/test.rb", true, false)
       if !ret && !ret.nil?
+        @fails << io unless @fails.include?(io)
         io.rewind
         if %r'^not ok/test: \d+ failed (\d+)' =~ io.read
           @title << "#{$1}NotOK"
@@ -470,16 +489,19 @@ module MswinBuild
     end
 
     define_buildmethod(:test_all) do |io, tmpdir|
+      define_failure_start_pattern(io, /\A *\d+\) (Failure|Error)/, /\A\d+ tests, \d+ assertions, [1-9]\d* failures, \d+ errors/, /\A\d+ tests, \d+ assertions, \d+ failures, [1-9]\d* errors/, /:\d+:in `/)
       ret = do_command(io, "test-all", "nmake -l TESTS=-v RUBYOPT=-w test-all", true, false, nil)
       if !ret && !ret.nil?
         io.rewind
         if %r'^\d+ tests, \d+ assertions, (\d+) failures, (\d+) errors, (\d+) skips' =~ io.read
           @title << "#{$1}F#{$2}E"
           if $1.to_i + $2.to_i > 0
+            @fails << io unless @fails.include?(io)
             @data["failure_test-all"] = "#{$1}F#{$2}E"
             @data[:result] = "failure" 
           end
         else
+          @fails << io unless @fails.include?(io)
           @title << "failed(test-all)"
           @data["failure_test-all"] = "failed"
           @data[:result] = "failure"
@@ -488,6 +510,7 @@ module MswinBuild
     end
 
     define_buildmethod(:rubyspec) do |io, tmpdir|
+      define_failure_start_pattern(io, /\A1\)\n\z/, /:\d+:in `/)
       if ruby_version >= "2.5.0"
         ret = do_command(io, "rubyspec", 'nmake -l MSPECOPT="-V -f s" test-rubyspec', true, false, nil)
         if !ret && !ret.nil?
@@ -495,10 +518,12 @@ module MswinBuild
           if /^\d+ files?, \d+ examples?, \d+ expectations?, (\d+) failures?, (\d+) errors?, \d+ tagged/ =~ io.read
             @title << "rubyspec:#{$1}F#{$2}E"
             if $1.to_i + $2.to_i > 0
+              @fails << io unless @fails.include?(io)
               @data["failure_rubyspec"] = "#{$1}F#{$2}E"
               @data[:result] = "failure" 
             end
           else
+            @fails << io unless @fails.include?(io)
             @title << "failed(rubyspec)"
             @data["failure_rubyspec"] = "failed"
             @data[:result] = "failure"
@@ -569,30 +594,51 @@ module MswinBuild
     end
 
     def gather_log(files, tmpdir)
-      logdir = File.join(@config["logdir"], "log")
-      FileUtils.mkdir_p(logdir)
-      logfile = File.join(logdir, @data[:start_time] + '.log.html')
       warns = 0
       revision = nil
-      open(File.join(tmpdir, "gathered"), "w") do |out|
-        files.each_with_index do |io, i|
+      open(File.join(tmpdir, "gathered"), "wb") do |out|
+        files.each do |io|
           next unless io
           io.reopen(io.path, "r", encoding: "ascii-8bit")
-          begin
-            io.each_line do |line|
-              line = h(line) unless /^<a / =~ line
-              out.write line
-              warns += line.scan(/warn/i).length
-              if File.basename(io.path) == "checkout" && /^(?:SVN )?Last Changed Rev: (\d+)$/ =~ line
-                revision = $1
-              end
+          io.each_line do |line|
+            line = h(line) unless /^<a / =~ line
+            out.write line
+            warns += line.scan(/warn/i).length
+            if File.basename(io.path) == "checkout" && /^(?:SVN )?Last Changed Rev: (\d+)$/ =~ line
+              revision = $1
             end
-          ensure
-            io.close
-            File.unlink(io.path) rescue nil
           end
         end
       end
+
+      open(File.join(tmpdir, "failed"), "wb") do |out|
+        if @fails.empty?
+          out.puts "No failures"
+          break
+        end
+
+        @fails.each do |io|
+          io.rewind
+          lines = io.read.lines
+          out.puts lines.shift
+          total = lines.size
+          patterns = io.instance_variable_defined?(:@failure_start_patterns) ? io.instance_variable_get(:@failure_start_patterns) : []
+          patterns << /\[BUG\]/
+          start = [0, total - 10].max
+          lines.each_with_index do |line, i|
+            if patterns.find{|pat| pat =~ line}
+              start = i
+              break
+            end
+          end
+          start = [0, start - 10].max # show 10 lines before the start point
+          out.puts "...(snip #{start} lines)..." if start > 0
+          lines.last(total - start).each do |line|
+            out.write h(line)
+          end
+        end
+      end
+
       title = @title[0, 2]
       @data[:warn] = "#{warns}W"
       if warns > 0
@@ -623,25 +669,46 @@ module MswinBuild
           title << v
         end
       end
+
       @data[:title] = title.join(' ')
-      open(logfile, "w") do |out|
+
+      logdir = File.join(@config["logdir"], "log")
+      FileUtils.mkdir_p(logdir)
+      logfile = File.join(logdir, @data[:start_time] + '.log.html')
+      failfile = File.join(logdir, @data[:start_time] + '.fail.html')
+      open(logfile, "wb") do |out|
         header(out)
+        out.puts "    <p><a href=\"#{File.basename(logfile) + '.gz'}\">#{@data[:start_time]}</a>(<a href=\"#{File.basename(failfile) + '.gz'}\">failure</a>)</p>"
         out.puts "    <ul>"
         @links.each_value do |anchor, text, result = nil|
           out.puts %'      <li><a href="\##{anchor}">#{text}</a>#{" #{result}" if result}</li>'
         end
         out.puts "    </ul>"
         out.puts "    <pre>"
-        out.write IO.read(File.join(tmpdir, "gathered"))
+        out.write insert_href(IO.read(File.join(tmpdir, "gathered"), encoding: 'ascii-8bit'), File.basename(logfile) + ".gz")
         out.puts "    </pre>"
         footer(out)
       end
-      logfile
+
+      open(failfile, "wb") do |out|
+        header(out)
+        out.puts "    <ul>"
+        @links.each_value do |anchor, text, result = nil|
+          out.puts %'      <li><a href="\##{anchor}">#{text}</a> #{result}</li>' if result
+        end
+        out.puts "    </ul>"
+        out.puts "    <pre>"
+        out.write insert_href(IO.read(File.join(tmpdir, "failed"), encoding: 'ascii-8bit'), File.basename(failfile) + ".gz", File.basename(logfile) + ".gz")
+        out.puts "    </pre>"
+        footer(out)
+      end
+
+      return logfile, failfile
     end
 
     def diff(tmpdir, logfile)
       filename = logfile.sub(/\.log/, ".diff")
-      open(filename, "w") do |out|
+      open(filename, "wb") do |out|
         header(out)
         out.puts %'<p>Skipped. See the <a href="#{u File.basename(logfile)}.gz">full build log</a>.</p>'
         footer(out)
@@ -654,15 +721,19 @@ module MswinBuild
       file + ".gz"
     end
 
-    def add_recent(logfile)
-      add_recent_summary(logfile, :recent)
+    def insert_href(html, file, orig = nil)
+      html.gsub(/^<a name="(.+?)">(== .*)$/, "<a name=\"\\1\" href=\"#{file}\#\\1\">\\2#{%' (<a href=\"#{orig}\#\\1\">full</a>)' if orig}")
+    end
+
+    def add_recent(logfile, difffile, failfile)
+      add_recent_summary(logfile, difffile, failfile, :recent)
     end
 
-    def add_summary(logfile)
-      add_recent_summary(logfile, :summary)
+    def add_summary(logfile, difffile, failfile)
+      add_recent_summary(logfile, difffile, failfile, :summary)
     end
 
-    def add_recent_summary(logfile, mode)
+    def add_recent_summary(logfile, difffile, failfile, mode)
       if mode == :recent
         filename = File.join(@config["logdir"], "recent.html")
       else
@@ -679,14 +750,14 @@ module MswinBuild
 
       title = @title.join(' ')
       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>'
+      latest = %'<a href="log/#{File.basename(logfile)}" name="#{u time}">#{h time}</a>(<a href="log/#{File.basename(failfile)}">failure</a>) #{h title} (<a href="log/#{File.basename(difffile)}">#{@diff ? h(@diff) : "no diff"}</a>)<br>'
       if mode == :recent
         old = old[0..99]
         old.unshift(latest)
       else
         old.push(latest)
       end
-      open(filename, "w") do |f|
+      open(filename, "wb") do |f|
         f.print <<-EOH
 <html>
   <head>
@@ -739,7 +810,7 @@ module MswinBuild
         }.join("\t")
         old.unshift(latest)
 
-        open(filename, "w") do |f|
+        open(filename, "wb") do |f|
           old.take(100).each do |line|
             f.puts line
           end

data/lib/mswin-build/version.rb

@@ -1,3 +1,3 @@
 module MswinBuild
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/test/unit/test_builder.rb

@@ -2,6 +2,7 @@ require "fileutils"
 require "tmpdir"
 require "tempfile"
 require "test/unit"
+require "zlib"
 require "mswin-build/builder.rb"
 
 module ProcessMock
@@ -71,7 +72,7 @@ env:
 
   def teardown
     @yaml.close!
-    FileUtils.rm_r(@tmpdir)
+    FileUtils.rm_rf(@tmpdir)
   end
 
   def run_builder(**opt, &blk)
@@ -128,6 +129,7 @@ env:
     files = Dir.glob(File.join(@tmpdir, "log", "*"))
     assert files.reject! {|e| /\.log\.html\.gz\z/ =~ e}
     assert files.reject! {|e| /\.diff\.html\.gz\z/ =~ e}
+    assert files.reject! {|e| /\.fail\.html\.gz\z/ =~ e}
     assert_empty files
   end
 
@@ -166,7 +168,7 @@ env:
 
     recent = File.read(File.join(@tmpdir, "recent.html"))
     assert_match(/\bsuccess\b/, recent)
-    assert_match(/^<a href="[^"]+" name="[^"]+">[^<]+<\/a> r12345 /, recent)
+    assert_match(/^<a href="[^"]+" name="[^"]+">[^<]+<\/a>\(<a href="[^"]+">failure<\/a>\) r12345 /, recent) #"
     assert_not_match(/\bfailed\b/, recent)
     assert_not_match(/\bskipped\b/, recent)
 
@@ -196,7 +198,7 @@ env:
 
     recent = File.read(File.join(@tmpdir, "recent.html"))
     assert_match(/\bsuccess\b/, recent)
-    assert_match(/^<a href="[^"]+" name="[^"]+">[^<]+<\/a> r12345 /, recent)
+    assert_match(/^<a href="[^"]+" name="[^"]+">[^<]+<\/a>\(<a href="[^"]+">failure<\/a>\) r12345 /, recent) #"
     assert_not_match(/\bfailed\b/, recent)
 
     recent = File.read(File.join(@tmpdir, "recent.ltsv"))
@@ -204,6 +206,26 @@ env:
     assert_match(/\bruby_rev:r12345\b/, recent)
     assert_match(/"http\\x3A\/\/[^:]+":12345\b/, recent)
     assert_not_match(/\btitle:[^\t]*\b(failed|success|\dE\dF)\b/, recent)
+
+    logs = Dir.glob(File.join(@tmpdir, "log", "*.log.html.gz"))
+    assert logs.count > 0, "some logs must be written"
+    logs.each do |log|
+      fn = Regexp.escape(File.basename(log))
+      fn2 = fn.sub(/log/, "fail")
+      Zlib::GzipReader.open(log) do |gz|
+        html = gz.read
+        assert_match(/<p><a href="#{fn}">[^<]+<\/a>\(<a href="#{fn2}">failure<\/a>\)<\/p>/, html)
+        assert_match(/^<a name="(.+?)" href="#{fn}\#\1">== /, html)
+      end
+    end
+
+    fails = Dir.glob(File.join(@tmpdir, "log", "*.fail.html.gz"))
+    assert fails.count > 0, "some fail htmls must be written"
+    fails.each do |log|
+      Zlib::GzipReader.open(log) do |gz|
+        assert_match(/^No failures$/, gz.read)
+      end
+    end
   end
 
   def test_run_btest_failure
@@ -233,6 +255,16 @@ env:
     assert_match(/\bfailure_btest:3BFail\b/, recent)
     assert_match(/\btitle:[^\t]*\b3BFail\b/, recent)
     assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
+
+    fails = Dir.glob(File.join(@tmpdir, "log", "*.fail.html.gz"))
+    assert fails.count > 0, "some fail htmls must be written"
+    fails.each do |log|
+      fn = Regexp.escape(File.basename(log))
+      fn2 = fn.sub(/fail/, "log")
+      Zlib::GzipReader.open(log) do |gz|
+        assert_match(/^<a name="(btest)" href="#{fn}\#\1">== .*\(<a href="#{fn2}\#\1">full<\/a>\)$/, gz.read)
+      end
+    end
   end
 
   def test_run_testrb_failure
@@ -262,6 +294,16 @@ env:
     assert_match(/\bfailure_test.rb:4NotOK\b/, recent)
     assert_match(/\btitle:[^\t]*\b4NotOK\b/, recent)
     assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
+
+    fails = Dir.glob(File.join(@tmpdir, "log", "*.fail.html.gz"))
+    assert fails.count > 0, "some fail htmls must be written"
+    fails.each do |log|
+      fn = Regexp.escape(File.basename(log))
+      fn2 = fn.sub(/fail/, "log")
+      Zlib::GzipReader.open(log) do |gz|
+        assert_match(/^<a name="(test\.rb)" href="#{fn}\#\1">== .*\(<a href="#{fn2}\#\1">full<\/a>\)$/, gz.read)
+      end
+    end
   end
 
   def test_run_test_all_failure
@@ -291,6 +333,16 @@ env:
     assert_match(/\bfailure_test-all:2F1E\b/, recent)
     assert_match(/\btitle:[^\t]*\b2F1E\b/, recent)
     assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
+
+    fails = Dir.glob(File.join(@tmpdir, "log", "*.fail.html.gz"))
+    assert fails.count > 0, "some fail htmls must be written"
+    fails.each do |log|
+      fn = Regexp.escape(File.basename(log))
+      fn2 = fn.sub(/fail/, "log")
+      Zlib::GzipReader.open(log) do |gz|
+        assert_match(/^<a name="(test-all)" href="#{fn}\#\1">== .*\(<a href="#{fn2}\#\1">full<\/a>\)$/, gz.read)
+      end
+    end
   end
 
   def test_run_timeout
@@ -316,6 +368,16 @@ env:
     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)
+
+    fails = Dir.glob(File.join(@tmpdir, "log", "*.fail.html.gz"))
+    assert fails.count > 0, "some fail htmls must be written"
+    fails.each do |log|
+      fn = Regexp.escape(File.basename(log))
+      fn2 = fn.sub(/fail/, "log")
+      Zlib::GzipReader.open(log) do |gz|
+        assert_match(/^<a name="(.+?)" href="#{fn}\#\1">== .*\(<a href="#{fn2}\#\1">full<\/a>\)$/, gz.read)
+      end
+    end
   end
 
   def test_get_current_revision

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mswin-build
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-20 00:00:00.000000000 Z
+date: 2017-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler