mswin-build 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef8ffb17f2b65277994eb03de262f14ac5055bd6
-  data.tar.gz: 42b4bff8a9a4a37d7aa1345921e19ea499829f14
+  metadata.gz: 04dd66454d1375114da0bdc7c13e8caade4177d5
+  data.tar.gz: d042c5b0f15c2e0434d5542c7387eedb87b313ba
 SHA512:
-  metadata.gz: 801e3996986c90fc01854d61eaa675ba28fdbf8d99bf095a500515e9589fce4c6d68aec0c3192ab63e316fde0dd8c1d883a2818026dd106c1a6a9e28e89aa243
-  data.tar.gz: 5daafc2900cca3ce36c98fe167865ac00b09e1aab10f4dcc6044356c86ff1ad5bcb6ea081b374d6462dd274c4ccf95bf7c8efe20b5af41b0269c75d6160d690d
+  metadata.gz: 3afae83b34dba29b69425e3452f2eda1da721ab91ebae7d635a76013436bac846bfb7846378c3980a930e47f1a0cb0b7cf89cc3c249a75c34ff59f43d8cf03ec
+  data.tar.gz: 1333f4d3a83d48fe9c7a6c497852193455e867600c24b31eb694c0def0a6c65784b060a89dd9e3084b794b8280511a125955cc8f648d6e609cd83d632ff5fa08

data/lib/mswin-build/builder.rb

@@ -62,6 +62,7 @@ module MswinBuild
       @config["timeout"]["install-doc"] ||= @config["timeout"]["default"]
       @config["timeout"]["test-knownbug"] ||= @config["timeout"]["default"]
       @config["timeout"]["test-all"] ||= @config["timeout"]["default_long"]
+      @config["timeout"]["rubyspec"] ||= @config["timeout"]["default_long"]
 
       @last_status = nil
     end
@@ -167,7 +168,7 @@ module MswinBuild
       return nil unless file
 
       cmd = "#{@config['gzip']} -d -c #{File.join(@config['logdir'], file)}"
-      `#{cmd}`.scan(/^(?:SVN )?Last Changed Rev: (\d+)$/) do |line|
+      `#{cmd}`.b.scan(/^(?:SVN )?Last Changed Rev: (\d+)$/) do |line|
         return $1
       end
       nil
@@ -298,7 +299,7 @@ module MswinBuild
     def self.define_buildmethod(method, &blk)
       define_method("bare_#{method.to_s}", blk)
       define_method(method) do |tmpdir|
-        io = open(File.join(tmpdir, method.to_s), "w+")
+        io = open(File.join(tmpdir, method.to_s), "w+", encoding: "ascii-8bit")
         begin
           __send__("bare_#{method.to_s}", io, tmpdir)
         ensure
@@ -487,9 +488,28 @@ module MswinBuild
     end
 
     define_buildmethod(:rubyspec) do |io, tmpdir|
-      heading(io, "rubyspec")
-      io.puts "skipped."
-      @links["rubyspec"] << "skipped"
+      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?
+          io.rewind
+          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
+              @data["failure_rubyspec"] = "#{$1}F#{$2}E"
+              @data[:result] = "failure" 
+            end
+          else
+            @title << "failed(rubyspec)"
+            @data["failure_rubyspec"] = "failed"
+            @data[:result] = "failure"
+          end
+        end
+      else
+        heading(io, "rubyspec")
+        io.puts "skipped."
+        @data["failure_rubyspec"] = "skipped"
+        @links["rubyspec"] << "skipped"
+      end
     end
 
     define_buildmethod(:end_) do |io, tmpdir|
@@ -557,7 +577,7 @@ module MswinBuild
       open(File.join(tmpdir, "gathered"), "w") do |out|
         files.each_with_index do |io, i|
           next unless io
-          io.reopen(io.path, "r")
+          io.reopen(io.path, "r", encoding: "ascii-8bit")
           begin
             io.each_line do |line|
               line = h(line) unless /^<a / =~ line
@@ -589,7 +609,17 @@ module MswinBuild
       end
       @data.each_pair do |k, v|
         if k.is_a?(String) && /^failure_/ =~ k
-          v = "#{$'}:#{v}" if $' == "rubyspec"
+          if v == "failed"
+            v = "failed(#{$'})"
+          else
+            if $' == "rubyspec"
+              if v == "skipped"
+                next
+              else
+                v = "rubyspec:#{v}" 
+              end
+            end
+          end
           title << v
         end
       end

data/lib/mswin-build/version.rb

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

data/test/unit/test_builder.rb

@@ -105,6 +105,7 @@ env:
         /^nmake -l install-doc\s*$/,
         /^nmake -l "OPTS=-v -q" test-knownbug\s*$/,
         /^nmake -l TESTS=-v RUBYOPT=-w test-all\s*$/,
+        /^nmake -l MSPECOPT="-V -f s" test-rubyspec\s*$/,
       ]
 
       ProcessMock.set_callback(commands, &blk)
@@ -167,6 +168,7 @@ env:
     assert_match(/\bsuccess\b/, recent)
     assert_match(/^<a href="[^"]+" name="[^"]+">[^<]+<\/a> r12345 /, recent)
     assert_not_match(/\bfailed\b/, recent)
+    assert_not_match(/\bskipped\b/, recent)
 
     recent = File.read(File.join(@tmpdir, "recent.ltsv"))
     assert_match(/\bresult:success\b/, recent)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mswin-build
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A low quality clone of https://github.com/akr/chkbuild for mswin.