mswin-build 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfe42674ee22526c93c3fd0347034be4f0af2f48
-  data.tar.gz: 599a68351770263a39ab8b8accf35d9eaa9a9915
+  metadata.gz: ea4522da05a50075fbbb6e7cfc25d221312a7e37
+  data.tar.gz: 2c95e422c2abeb72b3e50c6fb6fc27b3a2fd1843
 SHA512:
-  metadata.gz: e90cc66dfc5614f26af3d2ecd259a78b4aeb7bd423ce4b50789d205e82dc72b2fb23d8a712344b6288ddec03451fee7d517363dba3e4a797b1c4ebad80178fff
-  data.tar.gz: b76b8068667a7c70447810af98fe555bd5fc8ad305694b86f7cf69f8bf234ba85d1a04b47d9b4b9edc79a018c6d041b415179dbe836ffca4e3c27c428241a4ee
+  metadata.gz: 52f6c484f354119931fb4db8288441175e53ada21d86b7cd5814c2881f2989a111d6dba8137efd708bcc2fc485727e05e5a340965cf155f96821be8f088e332d
+  data.tar.gz: 7ab23c4af24e811a00cd27255fde6f7d0377a989fa5ee2e98a133f0357a9c3d1b4d0e76e0ac979a7e9e5ec04c7fa98e00d3ca5000c0a424e4aa58650fe678229

data/.gitignore

@@ -1,2 +1,3 @@
+Gemfile.lock
 logs
 pkg

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
+  - 2.1.10
 script:
   - bundle exec rake build

data/README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://img.shields.io/travis/unak/mswin-build.svg)](https://travis-ci.org/unak/mswin-build)
+[![Version     ](https://img.shields.io/gem/v/mswin-build.svg)](https://rubygems.org/gems/mswin-build)
+
 mswin-build
 ===========
 
@@ -13,7 +16,7 @@ A low quality clone of https://github.com/akr/chkbuild for mswin.
 Requirements
 ------------
 
-* ruby 1.9.3 or 2.0.0 or newer, with fiddle
+* ruby 2.1 or later
 * sed
 * bison
 * svn

data/bin/build.rb

@@ -1,4 +1,4 @@
-#! ruby
+#!ruby
 # expected ruby 1.9.x or later.
 libdir = File.expand_path("../lib", File.dirname(__FILE__))
 $LOAD_PATH.unshift(libdir) if File.directory?(libdir)
@@ -6,14 +6,14 @@ require "optparse"
 require "rbconfig"
 require "mswin-build/builder"
 
-$debug = $DEBUG
 opt = OptionParser.new
 opt.banner = "Usage: ruby #$0 [options] <target name>"
 opt.separator ""
 opt.separator "  This script automatically loads config/<target name>.yaml."
 opt.separator ""
 opt.separator "Options:"
-opt.on('-v', '--verbose', 'Be verbose.') { $debug = true }
+opt.on('-v', '--verbose', 'Be verbose.') { $DEBUG = true }
+opt.on('-a KEY', '--azure-key=KEY', 'Upload results by KEY') {|v| $azure_key = v }
 
 begin
   opt.parse!(ARGV)
@@ -29,5 +29,12 @@ end
 # use this running ruby as BASERUBY
 baseruby = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
 
-builder = MswinBuild::Builder.new(target: target, baseruby: baseruby, settings: File.expand_path("../config/#{target}.yaml", File.dirname(__FILE__)))
+options = {
+  target: target,
+  baseruby: baseruby,
+  settings: File.expand_path("../config/#{target}.yaml",
+  File.dirname(__FILE__))
+}
+options[:azure_key] = $azure_key if $azure_key
+builder = MswinBuild::Builder.new(options)
 exit builder.run

data/bin/kicker.rb

@@ -9,6 +9,7 @@ require "mswin-build/builder"
 baseruby = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
 interval = 60
 force_build = 24 * 60 * 60  # force build at least once in every day
+cmd_dir = ENV['TEMP']
 
 opt = OptionParser.new
 opt.banner = "Usage: ruby #$0 [options] <target name>"
@@ -19,7 +20,8 @@ opt.separator "Options:"
 opt.on('-v', '--verbose', "Be verbose. default = #{!$debug.nil? && $debug}") { $debug = true }
 opt.on('-b <baseruby>', '--baseruby=<baserbuby>', "specify baseruby. default: #{baseruby}") { |v| baseruby = v }
 opt.on('-i <seconds>', '--interval=<seconds>', "interval between each build. default: #{interval}") { |v| interval = Integer(v) }
-opt.on('-f <seconds>', '--force-build=<seconds>', "force build after specified seconds from last bulid. default: #{force_build}") { |v| fource_build = Integer(v) }
+opt.on('-f <seconds>', '--force-build=<seconds>', "force build after specified seconds from last bulid. default: #{force_build}") { |v| force_build = Integer(v) }
+opt.on('-t <directory>', '--command-dir=<directory>', "specify force-build command directory. default: ENV['TEMP'] (#{ENV['TEMP']})") { |v| cmd_dir = v }
 
 begin
   opt.parse!(ARGV)
@@ -34,7 +36,13 @@ end
 loop do
   ARGV.each do |target|
     builder = MswinBuild::Builder.new(target: target, baseruby: baseruby, settings: File.expand_path("../config/#{target}.yaml", File.dirname(__FILE__)))
-    if !builder.get_last_build_time || builder.get_last_build_time + force_build < Time.now || builder.get_last_revision != builder.get_current_revision
+    if File.exist?(File.join(cmd_dir, target))
+      force = true
+      File.unlink(File.join(cmd_dir, target)) rescue nil
+    else
+      force = false
+    end
+    if force || !builder.get_last_build_time || builder.get_last_build_time + force_build < Time.now || builder.get_last_revision != builder.get_current_revision
       cmd = [baseruby, File.expand_path("build.rb", File.dirname(__FILE__)), target]
       cmd << "-v" if $debug
       puts "+++ #{Time.now}  Start #{target} +++" if $debug

data/lib/mswin-build/azure-patch.rb

@@ -0,0 +1,79 @@
+# lib/azure/core/service.rb
+module Azure
+  module Core
+    class Service
+      def call(method, uri, body=nil, headers=nil)
+        request = Core::Http::HttpRequest.new(method, uri, body)
+        request.headers.merge!(headers) if headers
+
+        request.headers['connection'] = 'keep-alive' if request.respond_to? :headers
+
+        yield request if block_given?
+
+        response = request.call
+
+        response
+      end
+    end
+
+
+    module Http
+      class HttpRequest
+        def default_headers(current_time)
+          headers["User-Agent"] = "Azure-SDK-For-Ruby/" + Azure::Version.to_s
+          headers["x-ms-date"] = current_time
+          headers["x-ms-version"] = "2012-02-12"
+          headers["DataServiceVersion"] = "1.0;NetFx"
+          headers["MaxDataServiceVersion"] = "2.0;NetFx"
+
+          if body
+            headers["Content-Type"]   = "application/atom+xml; charset=utf-8"
+            if IO === body
+              headers["Content-Length"] = body.size.to_s
+              headers["Content-MD5"]    = Digest::MD5.file(body.path).base64digest
+            else
+              headers["Content-Length"] = body.bytesize.to_s
+              headers["Content-MD5"]    = Base64.strict_encode64(Digest::MD5.digest(body))
+            end
+          else
+            headers["Content-Length"] = "0"
+            headers["Content-Type"] = ""
+          end
+        end
+
+        def call
+          request = http_request_class.new(uri.request_uri, headers)
+          if IO === body
+            request.body_stream = body
+          elsif body
+            request.body = body
+          end
+
+          http = nil
+          if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
+            if ENV['HTTP_PROXY']
+              proxy_uri = URI::parse(ENV['HTTP_PROXY'])
+            else
+              proxy_uri = URI::parse(ENV['HTTPS_PROXY'])
+            end
+
+            http = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port).new(uri.host, uri.port)
+          else
+            http = Net::HTTP.new(uri.host, uri.port)
+          end
+
+          if uri.scheme.downcase == 'https'
+            # require 'net/https'
+            http.use_ssl = true
+            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+          end
+
+          response = HttpResponse.new(http.request(request))
+          response.uri = uri
+          raise response.error unless response.success?
+          response
+        end
+      end
+    end
+  end
+end

data/lib/mswin-build/builder.rb

@@ -6,6 +6,7 @@ require "timeout"
 require "tmpdir"
 require "yaml"
 require "mswin-build/process_tree"
+require "mswin-build/upload"
 
 module MswinBuild
   class Builder
@@ -13,6 +14,7 @@ module MswinBuild
       @target = h.delete(:target) || raise("target not specified")
       baseruby = h.delete(:baseruby)
       yaml = h.delete(:settings) || raise("settings not specified")
+      azure_key = h.delete(:azure_key)
       unless h.empty?
         raise "unknown option(s): #{h}"
       end
@@ -26,9 +28,18 @@ module MswinBuild
       raise "repository not specified" unless @config["repository"]
       raise "logdir not specfied" unless @config["logdir"]
 
+      @config["azure_key"] = azure_key if azure_key
+      if@config["azure_key"]
+        ENV['AZURE_STORAGE_ACCESS_KEY'] = @config["azure_key"]
+        MswinBuild.register_azure_upload(@config["logdir"])
+      end
+
+      @data = {}
       @title = []
       @links = {}
 
+      @diff = nil
+
       @config["timeout"] ||= {}
       @config["timeout"]["default"] ||= 10 * 60      # default 10 min
       @config["timeout"]["default_short"] ||= 60     # default 1 min
@@ -76,13 +87,16 @@ module MswinBuild
           files << checkout(tmpdir)
           if @last_status && @last_status.success?
             files << configure(tmpdir)
+            files << update_unicode(tmpdir)
+            files << update_gems(tmpdir)
+            files << extract_extlibs(tmpdir)
             files << cc_version(tmpdir)
             files << miniruby(tmpdir)
             files << miniversion(tmpdir)
             files << btest(tmpdir)
             files << testrb(tmpdir)
             #files << method_list(tmpdir)
-            files << showflags(tmpdir) if ruby_version >= "1.9.3"
+            files << showflags(tmpdir)
             files << main(tmpdir)
             files << docs(tmpdir)
             files << version(tmpdir)
@@ -97,9 +111,13 @@ module MswinBuild
           logfile = gather_log(files, tmpdir)
           difffile = diff(tmpdir, logfile)
           logfile = gzip(logfile)
-          gzip(difffile)
+          @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)
+
+          MswinBuild.run_upload_hooks
         end
         true
       rescue
@@ -124,7 +142,7 @@ module MswinBuild
       orig_lang = ENV["LANG"]
       ENV["LANG"] = "C"
       begin
-        if /^(?:SVN )?Last Changed Rev: (\d+)$/ =~ `#{@config['svn']} info #{@config['repository']}`
+        if /^(?:SVN )?Last Changed Rev: (\d+)$/ =~ `#{@config['svn']} info #{@config['repository']} 2> NUL`
           $1
         else
           nil
@@ -191,7 +209,7 @@ module MswinBuild
       pid = nil
       begin
         ret = nil
-        timeout(@config["timeout"][name] || @config["timeout"]["default"]) do
+        Timeout.timeout(@config["timeout"][name] || @config["timeout"]["default"]) do
           begin
             pid = Process.spawn(command, out: io, err: io)
             _, ret = Process.waitpid2(pid)
@@ -206,7 +224,7 @@ module MswinBuild
       end
     end
 
-    def do_command(io, name, command, in_builddir = false, check_retval = true, lang = "C")
+    def do_command(io, name, command, in_builddir = false, check_retval = true, lang = "C", &blk)
       heading(io, name)
       status = nil
       if lang
@@ -214,7 +232,7 @@ module MswinBuild
         ENV["LANG"] = lang
       end
       begin
-        if $debug
+        if $DEBUG
           puts "+ #{command}"
           $stdout.flush
         end
@@ -224,20 +242,23 @@ module MswinBuild
           if File.exist?(@builddir)
             Dir.chdir(@builddir) do
               status = spawn_with_timeout(name, command, io)
+              blk.call(status) if blk
             end
           else
             status = nil
           end
         else
           status = spawn_with_timeout(name, command, io)
+          blk.call(status) if blk
         end
 
         if status.nil? || !status.success?
           io.puts "exit #{status.to_i}" unless status.nil?
           io.puts "failed(#{name})"
           @title << "failed(#{name})" if check_retval || status.nil?
+          @data[:result] = "failure"
           @links[name] << "failed"
-          if $debug
+          if $DEBUG
             puts %'failed(#{name}) #{status.nil? ? "because maybe command not found" : "with status #{status.to_i}"}'
             $stdout.flush
           end
@@ -248,8 +269,9 @@ module MswinBuild
         io.puts $!.backtrace.join("\n| ")
         io.puts "failed(#{name} CommandTimeout)"
         @title << "failed(#{name} CommandTimeout)"
+        @data[:result] = "failure"
         @links[name] << "failed"
-        if $debug
+        if $DEBUG
           puts "failed(#{name} CommandTimeout)"
           $stdout.flush
         end
@@ -261,7 +283,7 @@ module MswinBuild
     end
 
     def heading(io, name)
-      if $debug
+      if $DEBUG
         puts "== #{name}"
         $stdout.flush
       end
@@ -286,10 +308,12 @@ module MswinBuild
 
     define_buildmethod(:baseinfo) do |io, tmpdir|
       @start_time = Time.now
+      @data[:start_time] = @start_time.dup.utc.strftime('%Y%m%dT%H%M%SZ')
       # target
       heading(io, @target)
       host = Socket.gethostname.split(/\./).first
       @title << "(#{host})"
+      @data[:host] = host
       io.puts "Nickname: #{host}"
       io.puts "#{`ver`.gsub(/\r?\n/, '')} #{ENV['OS']} #{ENV['ProgramW6432'] ? 'x64' : 'i386'}"
 
@@ -311,14 +335,52 @@ module MswinBuild
 
       # svn-info/ruby
       @builddir = File.join(tmpdir, "ruby")
-      do_command(io, "svn-info/ruby", "#{@config['svn']} info", true)
+      do_command(io, "svn-info/ruby", "#{@config['svn']} info", true) do |s|
+        if /^URL: (.*)$/ =~ `#{@config['svn']} info 2> NUL`
+          @data[:svn_url] = $1
+        end
+      end
     end
 
     define_buildmethod(:configure) do |io, tmpdir|
       options = " --with-baseruby=#{@config['baseruby'].gsub(%r(/), '\\')}" if ruby_version >= "1.9.0"
+      options << " #{@config['configure_args']}"
       do_command(io, "configure", "win32/configure.bat --prefix=#{destdir(tmpdir)}#{options}", true)
     end
 
+    define_buildmethod(:update_unicode) do |io, tmpdir|
+      begin
+        open(File.join(@builddir, 'common.mk')) do |f|
+          if /^update-unicode:/ =~ f.read
+            do_command(io, "update-unicode", "nmake -l update-unicode", true)
+          end
+        end
+      rescue Errno::ENOENT
+      end
+    end
+
+    define_buildmethod(:update_gems) do |io, tmpdir|
+      begin
+        open(File.join(@builddir, 'common.mk')) do |f|
+          if /^update-gems:/ =~ f.read
+            do_command(io, "update-gems", "nmake -l update-gems", true)
+          end
+        end
+      rescue Errno::ENOENT
+      end
+    end
+
+    define_buildmethod(:extract_extlibs) do |io, tmpdir|
+      begin
+        open(File.join(@builddir, 'common.mk')) do |f|
+          if /^extract-extlibs:/ =~ f.read
+            do_command(io, "extract-extlibs", "nmake -l extract-extlibs", true)
+          end
+        end
+      rescue Errno::ENOENT
+      end
+    end
+
     define_buildmethod(:cc_version) do |io, tmpdir|
       do_command(io, "cc-version", "cl")
     end
@@ -340,6 +402,7 @@ module MswinBuild
         else
           @title << "failed(btest)"
         end
+        @data[:result] = "failure"
       end
     end
 
@@ -352,11 +415,19 @@ module MswinBuild
         else
           @title << "failed(test.rb)"
         end
+        @data[:result] = "failure"
       end
     end
 
     define_buildmethod(:showflags) do |io, tmpdir|
-      do_command(io, "showflags", "nmake -l showflags", true)
+      begin
+        open(File.join(@builddir, 'common.mk')) do |f|
+          if /^showflags:/ =~ f.read
+            do_command(io, "showflags", "nmake -l showflags", true)
+          end
+        end
+      rescue Errno::ENOENT
+      end
     end
 
     define_buildmethod(:main) do |io, tmpdir|
@@ -374,6 +445,7 @@ module MswinBuild
       else
         @title.unshift(@target)
       end
+      @data[:version] = @title.first
     end
 
     define_buildmethod(:install_nodoc) do |io, tmpdir|
@@ -396,8 +468,10 @@ 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
         else
           @title << "failed(test-all)"
+          @data[:result] = "failure"
         end
       end
     end
@@ -412,6 +486,7 @@ module MswinBuild
       unless /failed|BFail|NotOK|\d+F\d+E/ =~ @title.join
         heading(io, "success")
         @title << "success"
+        @data[:result] = "success"
       end
 
       heading(io, "end")
@@ -466,7 +541,7 @@ module MswinBuild
     def gather_log(files, tmpdir)
       logdir = File.join(@config["logdir"], "log")
       FileUtils.mkdir_p(logdir)
-      logfile = File.join(logdir, @start_time.dup.utc.strftime('%Y%m%dT%H%M%SZ.log.html'))
+      logfile = File.join(logdir, @data[:start_time] + '.log.html')
       warns = 0
       revision = nil
       open(File.join(tmpdir, "gathered"), "w") do |out|
@@ -484,12 +559,19 @@ module MswinBuild
             end
           ensure
             io.close
-            io.unlink rescue nil
+            File.unlink(io.path) rescue nil
           end
         end
       end
       @title.insert(2, "#{warns}W") if warns > 0
-      @title.unshift("r#{revision}") if revision
+      @data[:warn] = "#{warns}W"
+      url = @data.delete(:svn_url)
+      if revision
+        @title.unshift("r#{revision}")
+        @data[:ruby_rev] = "r#{revision}"
+        @data[:version] = "#{@data[:ruby_rev]} #{@data[:version]}"
+        @data[url] = revision
+      end
       open(logfile, "w") do |out|
         header(out)
         out.puts "    <ul>"
@@ -544,13 +626,14 @@ module MswinBuild
       end
 
       title = @title.join(' ')
-      time = File.basename(logfile, ".log.html.gz")
-      line = %'<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>'
+      @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
         old = old[0..99]
-        old.unshift(line)
+        old.unshift(latest)
       else
-        old.push(line)
+        old.push(latest)
       end
       open(filename, "w") do |f|
         f.print <<-EOH
@@ -584,6 +667,33 @@ module MswinBuild
 </html>
         EOH
       end
+
+      if mode == :recent
+        old = []
+        filename = File.join(@config["logdir"], "recent.ltsv")
+        if File.exist?(filename)
+          open(filename, "r") do |f|
+            f.each_line do |line|
+              old << line.chomp
+            end
+          end
+        end
+
+        latest = @data.map{|k, v|
+          k = k.to_s
+          k = k.gsub(/:/, '\\x3A')
+          v = v.gsub(/\t/, ' ')
+          k = %'"#{k}"' if /\W/ =~ k
+          "#{k}:#{v}"
+        }.join("\t")
+        old.unshift(latest)
+
+        open(filename, "w") do |f|
+          old.take(100).each do |line|
+            f.puts line
+          end
+        end
+      end
     end
   end
 end

data/lib/mswin-build/upload.rb

@@ -0,0 +1,139 @@
+# derived from chkbuild/upload.rb, but changed for mswin-build.
+# original copyright is below:
+
+# chkbuild/upload.rb - upload method definition
+#
+# Copyright (C) 2006-2011 Tanaka Akira <akr@fsij.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior
+# written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+module MswinBuild
+  @upload_hooks = []
+  def self.add_upload_hook(&block)
+    @upload_hooks << block
+  end
+
+  def self.run_upload_hooks
+    @upload_hooks.reverse_each do |block|
+      begin
+        block.call
+      rescue Exception
+        p $!
+      end
+    end
+  end
+
+  def self.register_azure_upload(logdir)
+    ENV['AZURE_STORAGE_ACCOUNT'] ||= 'rubyci'
+    raise 'no AZURE_STORAGE_ACCESS_KEY env' unless ENV['AZURE_STORAGE_ACCESS_KEY']
+
+    require 'azure'
+    require_relative 'azure-patch'
+    service = Azure::BlobService.new
+    service.with_filter do |req, _next|
+      i = 0
+      begin
+        next _next.call
+      rescue
+        case $!
+        when Errno::ETIMEOUT
+          if i < 3
+            i += 1
+            retry
+          end
+        end
+        raise $!
+      end
+    end
+
+    add_upload_hook do
+      azure_upload(service, logdir)
+    end
+  end
+
+  def self.azure_upload(service, logdir)
+    logdir = File.dirname(File.join(logdir, 'dummy'))
+    branch = File.basename(logdir)
+    container = File.basename(File.dirname(logdir))
+    begin
+      _res, body = service.get_blob(container, "#{branch}/recent.html")
+      server_start_time = body[/^<a href=.*+ name="(\w+)">/, 1]
+    rescue Azure::Core::Http::HTTPError => e
+      server_start_time = '00000000T000000Z'
+      if e.type == 'ContainerNotFound'
+        service.create_container(container, :public_access_level => 'container')
+      end
+    end
+    puts "Azure: #{branch} start_time: #{server_start_time}" if $DEBUG
+
+    IO.foreach("#{logdir}/recent.html") do |line|
+      break line[/^<a href=.*+ name="(\w+)">/, 1]
+    end
+
+    Dir.foreach(File.join(logdir, "log")).each do |file|
+      next unless file.end_with?('.gz')
+      blobname = File.join(branch, "log", file)
+      filepath = File.join(logdir, "log", file)
+      if (service.get_blob_metadata(container, blobname) rescue false)
+        File.unlink filepath
+        next
+      end
+      if azure_upload_file(service, container, blobname, filepath)
+        File.unlink filepath
+      end
+    end
+
+    %w"summary.html recent.html".each do |file|
+      blobname = File.join(branch, file)
+      filepath = File.join(logdir, file)
+      azure_upload_file(service, container, blobname, filepath)
+    end
+  end
+
+  def self.azure_upload_file(service, container, blobname, filepath)
+    unless File.exist?(filepath)
+      puts "File '#{filepath}' is not found"
+      return false
+    end
+
+    options = {}
+    case filepath
+    when /\.html\.gz\z/
+      options[:content_type] = "text/html"
+      options[:content_encoding] = "gzip"
+    when /\.html\z/
+      options[:content_type] = "text/html"
+    end
+
+    open(filepath, 'rb') do |f|
+      puts "uploading '#{filepath}' as '#{blobname}'..." if $DEBUG
+      service.create_block_blob(container, blobname, f, options)
+    end
+    true
+  end
+end

data/lib/mswin-build/version.rb

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

data/test/unit/test_builder.rb

@@ -37,6 +37,24 @@ class StatusMock
 end
 
 class TestBuilder < Test::Unit::TestCase
+  def self.startup
+    Kernel.module_eval do
+      alias orig_backquote ` #`
+      def `(cmd) #`
+        "Revision: 54321\n" +
+        "URL: http://example.com/svn/ruby\n" +
+        "Last Changed Rev: 12345\n"
+      end
+    end
+  end
+
+  def self.shutdown
+    Kernel.module_eval do
+      undef ` #`
+      alias ` orig_backquote #`
+    end
+  end
+
   def setup
     @tmpdir = Dir.mktmpdir('TestBuilder')
     @yaml = Tempfile.open('TestBuilder', @tmpdir)
@@ -56,11 +74,11 @@ env:
     FileUtils.rm_r(@tmpdir)
   end
 
-  def run_builder(hash = {}, &blk)
+  def run_builder(**opt, &blk)
     builder = MswinBuild::Builder.new(target: "dummy", settings: @yaml.path)
-    if !hash.empty?
+    if !opt.empty?
       config = builder.instance_variable_get(:@config)
-      config["timeout"]["test-all"] = hash[:timeout] if hash[:timeout]
+      config["timeout"]["test-all"] = opt[:timeout] if opt[:timeout]
       builder.instance_variable_set(:@config, config)
     end
     begin
@@ -71,31 +89,30 @@ env:
       end
 
       commands = [
-        /^bison --version$/,
-        /^svn checkout dummy_repository ruby$/,
-        /^svn info$/,
-        /^win32\/configure\.bat --prefix=[^ ]+ --with-baseruby=ruby$/,
-        /^cl$/,
-        /^nmake -l miniruby$/,
-        /^\.\/miniruby -v$/,
-        /^nmake -l "OPTS=-v -q" btest$/,
-        /^\.\/miniruby sample\/test\.rb/,
-        /^nmake -l showflags$/,
-        /^nmake -l main$/,
-        /^nmake -l docs$/,
-        /^\.\/ruby -v$/,
-        /^nmake -l install-nodoc$/,
-        /^nmake -l install-doc$/,
-        /^nmake -l "OPTS=-v -q" test-knownbug$/,
-        /^nmake -l TESTS=-v RUBYOPT=-w test-all$/,
+        /^bison --version\s*$/,
+        /^svn checkout dummy_repository ruby\s*$/,
+        /^svn info\s*$/,
+        /^win32\/configure\.bat --prefix=[^ ]+ --with-baseruby=ruby\s*$/,
+        /^cl\s*$/,
+        /^nmake -l miniruby\s*$/,
+        /^\.\/miniruby -v\s*$/,
+        /^nmake -l "OPTS=-v -q" btest\s*$/,
+        /^\.\/miniruby sample\/test\.rb\b/,
+        /^nmake -l main\s*$/,
+        /^nmake -l docs\s*$/,
+        /^\.\/ruby -v\s*$/,
+        /^nmake -l install-nodoc\s*$/,
+        /^nmake -l install-doc\s*$/,
+        /^nmake -l "OPTS=-v -q" test-knownbug\s*$/,
+        /^nmake -l TESTS=-v RUBYOPT=-w test-all\s*$/,
       ]
 
       ProcessMock.set_callback(commands, &blk)
 
-      builder.run
+      assert builder.run, "returned error status"
 
       assert_empty commands
-      assert_equal hash[:revision].to_s, builder.get_last_revision if hash[:revision]
+      assert_equal opt[:revision].to_s, builder.get_last_revision if opt[:revision]
     ensure
       Object.class_eval do
         remove_const :Process
@@ -104,6 +121,7 @@ env:
     end
 
     assert File.exist?(File.join(@tmpdir, "recent.html"))
+    assert File.exist?(File.join(@tmpdir, "recent.ltsv"))
     assert File.exist?(File.join(@tmpdir, "summary.html"))
     assert File.directory?(File.join(@tmpdir, "log"))
     files = Dir.glob(File.join(@tmpdir, "log", "*"))
@@ -138,8 +156,36 @@ env:
         Dir.mkdir("ruby")
       when /^svn info\b/
         if args[1].is_a?(Hash) && args[1][:out]
-          args[1][:out].puts "Revision: 54321"
-          args[1][:out].puts "Last Changed Rev: 12345"
+          args[1][:out].puts `svn info`
+        end
+      end
+
+      StatusMock.new(0)
+    end
+
+    recent = File.read(File.join(@tmpdir, "recent.html"))
+    assert_match(/\bsuccess\b/, recent)
+    assert_match(/^<a href="[^"]+" name="[^"]+">[^<]+<\/a> r12345 /, recent)
+    assert_not_match(/\bfailed\b/, recent)
+
+    recent = File.read(File.join(@tmpdir, "recent.ltsv"))
+    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)
+
+    sleep 2
+
+    run_builder(revision: 12345) do |args, commands|
+      assert_not_empty commands, "for ``#{args[0]}''"
+      assert_match commands.shift, args[0]
+
+      case args[0]
+      when /^svn checkout\b/
+        Dir.mkdir("ruby")
+      when /^svn info\b/
+        if args[1].is_a?(Hash) && args[1][:out]
+          args[1][:out].puts `svn info`
         end
       end
 
@@ -147,8 +193,15 @@ env:
     end
 
     recent = File.read(File.join(@tmpdir, "recent.html"))
-    assert_match /\bsuccess\b/, recent
-    assert_match /^<a href="[^"]+" name="[^"]+">[^<]+<\/a> r12345 /, recent
+    assert_match(/\bsuccess\b/, recent)
+    assert_match(/^<a href="[^"]+" name="[^"]+">[^<]+<\/a> r12345 /, recent)
+    assert_not_match(/\bfailed\b/, recent)
+
+    recent = File.read(File.join(@tmpdir, "recent.ltsv"))
+    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)
   end
 
   def test_run_btest_failure
@@ -170,8 +223,13 @@ env:
     end
 
     recent = File.read(File.join(@tmpdir, "recent.html"))
-    assert_match /\b3BFail\b/, recent
-    assert_not_match /\bfailed\b/, recent
+    assert_match(/\b3BFail\b/, recent)
+    assert_not_match(/\bfailed\b/, recent)
+
+    recent = File.read(File.join(@tmpdir, "recent.ltsv"))
+    assert_match(/\bresult:failure\b/, recent)
+    assert_match(/\btitle:[^\t]*\b3BFail\b/, recent)
+    assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
   end
 
   def test_run_testrb_failure
@@ -193,8 +251,13 @@ env:
     end
 
     recent = File.read(File.join(@tmpdir, "recent.html"))
-    assert_match /\b4NotOK\b/, recent
-    assert_not_match /\bfailed\b/, recent
+    assert_match(/\b4NotOK\b/, recent)
+    assert_not_match(/\bfailed\b/, recent)
+
+    recent = File.read(File.join(@tmpdir, "recent.ltsv"))
+    assert_match(/\bresult:failure\b/, recent)
+    assert_match(/\btitle:[^\t]*\b4NotOK\b/, recent)
+    assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
   end
 
   def test_run_test_all_failure
@@ -216,8 +279,13 @@ env:
     end
 
     recent = File.read(File.join(@tmpdir, "recent.html"))
-    assert_match /\b2F1E\b/, recent
-    assert_not_match /\bfailed\b/, recent
+    assert_match(/\b2F1E\b/, recent)
+    assert_not_match(/\bfailed\b/, recent)
+
+    recent = File.read(File.join(@tmpdir, "recent.ltsv"))
+    assert_match(/\bresult:failure\b/, recent)
+    assert_match(/\btitle:[^\t]*\b2F1E\b/, recent)
+    assert_not_match(/\btitle:[^\t]*\bfailed\b/, recent)
   end
 
   def test_run_timeout
@@ -237,24 +305,15 @@ env:
     end
 
     recent = File.read(File.join(@tmpdir, "recent.html"))
-    assert_match /\bfailed\(test-all CommandTimeout\)/, recent
+    assert_match(/\bfailed\(test-all CommandTimeout\)/, recent)
+
+    recent = File.read(File.join(@tmpdir, "recent.ltsv"))
+    assert_match(/\bresult:failure\b/, recent)
+    assert_match(/\btitle:[^\t]*\bfailed\(test-all CommandTimeout\)/, recent)
   end
 
   def test_get_current_revision
-    TOPLEVEL_BINDING.eval <<-EOS
-      alias orig_backquote ` #`
-      def `(cmd) #`
-        "Revision: 54321\nLast Changed Rev: 12345\n"
-      end
-    EOS
-
-    begin
-      builder = MswinBuild::Builder.new(target: "dummy", settings: @yaml.path)
-      assert_equal "12345", builder.get_current_revision
-    ensure
-      TOPLEVEL_BINDING.eval <<-EOS
-        alias ` orig_backquote #`
-      EOS
-    end
+    builder = MswinBuild::Builder.new(target: "dummy", settings: @yaml.path)
+    assert_equal "12345", builder.get_current_revision
   end
 end

data/test/unit/test_upload.rb

@@ -0,0 +1,142 @@
+require "fileutils"
+require "test/unit"
+require "tmpdir"
+require "mswin-build/upload"
+
+alias mock_orig_require require
+def require(feature)
+  mock_orig_require(feature) unless feature == "azure"
+end
+
+# Azure mock
+module Azure
+  class BlobService
+    def initialize
+      @blobs = {}
+    end
+
+    def with_filter(&blk)
+      blk.call(nil, lambda{})
+    end
+
+    def get_blob(container, blobname)
+      raise Azure::Core::Http::HTTPError unless @blobs.has_key?(blobname)
+      return @blobs[blobname][:data]
+    end
+
+    def get_blob_metadata(container, blobname)
+      raise Azure::Core::Http::HTTPError unless @blobs.has_key?(blobname)
+      return @blobs[blobname]
+    end
+
+    def create_block_blob(container, blobname, io, options)
+      @blobs[blobname] = options.merge(data: io.read)
+    end
+  end
+
+  module Core
+    module Http
+      class HTTPError < RuntimeError
+        def type
+          ""
+        end
+      end
+    end
+  end
+end
+
+class TestUpload < Test::Unit::TestCase
+  def setup
+    @tmpdir = Dir.mktmpdir
+    Dir.mkdir(File.join(@tmpdir, "log"))
+  end
+
+  def teardown
+    ENV.delete "AZURE_STORAGE_ACCESS_KEY"
+    MswinBuild.instance_variable_set(:@upload_hooks, [])
+
+    FileUtils.rm_r @tmpdir if File.directory?(@tmpdir)
+  end
+
+  def test_add_upload_hook
+    assert_equal 0, MswinBuild.instance_variable_get(:@upload_hooks).size
+    MswinBuild.add_upload_hook do
+    end
+    assert_equal 1, MswinBuild.instance_variable_get(:@upload_hooks).size
+  end
+
+  def test_run_upload_hooks
+    foo = false
+    MswinBuild.add_upload_hook do
+      foo = true
+    end
+    refute foo
+    MswinBuild.run_upload_hooks
+    assert foo
+  end
+
+  def test_register_azure_upload
+    assert_raise(RuntimeError) do
+      MswinBuild.register_azure_upload(@tmpdir)
+    end
+
+    assert_equal 0, MswinBuild.instance_variable_get(:@upload_hooks).size
+
+    ENV["AZURE_STORAGE_ACCESS_KEY"] = "dummy"
+    assert_nothing_raised do
+      MswinBuild.register_azure_upload(@tmpdir)
+    end
+    assert_equal 1, MswinBuild.instance_variable_get(:@upload_hooks).size
+  end
+
+  def test_azure_upload
+    open(File.join(@tmpdir, "log", "test1.html.gz"), "w") do |f|
+      f.print "test1"
+    end
+    open(File.join(@tmpdir, "recent.html"), "w") do |f|
+      f.print "recent"
+    end
+    open(File.join(@tmpdir, "summary.html"), "w") do |f|
+      f.print "summary"
+    end
+    service = Azure::BlobService.new
+    assert_nothing_raised do
+      MswinBuild.azure_upload(service, @tmpdir)
+    end
+    branch = File.basename(@tmpdir)
+    refute File.exist?(File.join(@tmpdir, "log", "test1.html.gz"))
+    assert_equal "test1", service.get_blob(nil, File.join(branch, "log", "test1.html.gz"))
+    assert File.exist?(File.join(@tmpdir, "recent.html"))
+    assert_equal "recent", service.get_blob(nil, File.join(branch, "recent.html"))
+    assert File.exist?(File.join(@tmpdir, "summary.html"))
+    assert_equal "summary", service.get_blob(nil, File.join(branch, "summary.html"))
+  end
+
+  def test_azure_upload_file
+    service = Azure::BlobService.new
+
+    file = "test1.html.gz"
+    path = File.join(@tmpdir, file)
+    open(path, "wb") do |f|
+      f.puts "test1"
+    end
+    assert_nothing_raised do
+      assert MswinBuild.azure_upload_file(service, "foo", file, path)
+    end
+    assert_equal "test1\n", service.get_blob(service, file)
+    assert_equal "text/html", service.get_blob_metadata(service, file)[:content_type]
+    assert_equal "gzip", service.get_blob_metadata(service, file)[:content_encoding]
+
+    file = "test2.html"
+    path = File.join(@tmpdir, file)
+    open(path, "wb") do |f|
+      f.puts "test2"
+    end
+    assert_nothing_raised do
+      assert MswinBuild.azure_upload_file(service, "foo", file, path)
+    end
+    assert_equal "test2\n", service.get_blob(service, file)
+    assert_equal "text/html", service.get_blob_metadata(service, file)[:content_type]
+    assert_nil service.get_blob_metadata(service, file)[:content_encoding]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mswin-build
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,12 +73,15 @@ files:
 - config/vc10-x86-1_9_3.yaml
 - config/vc10-x86-2_0_0.yaml
 - config/vc10-x86-trunk.yaml
+- lib/mswin-build/azure-patch.rb
 - lib/mswin-build/builder.rb
 - lib/mswin-build/process_tree.rb
+- lib/mswin-build/upload.rb
 - lib/mswin-build/version.rb
 - mswin-build.gemspec
 - test/unit/test_builder.rb
 - test/unit/test_process_tree.rb
+- test/unit/test_upload.rb
 homepage: https://github.com/unak/mswin-build
 licenses:
 - BSD-2-Clause
@@ -99,10 +102,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A low quality clone of https://github.com/akr/chkbuild for mswin.
 test_files:
 - test/unit/test_builder.rb
 - test/unit/test_process_tree.rb
+- test/unit/test_upload.rb