mswin-build 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fa9c0789a580d68abf67f28ba90ca123e4d3a70ed12adbe03aabe8acec81e10
-  data.tar.gz: 589affa876a69a9dfd0585c0a251d56bd6e197551ec0f3a668bc67dc8a4bd2b2
+  metadata.gz: 2fed59177b86648df08cfaed325f177df4788bfe563e30e7b9765703ee191b7a
+  data.tar.gz: 9454943763808038cfd0e84ccb149cee9de8a4b3adaaa3cdab176a6ca7402939
 SHA512:
-  metadata.gz: 274bb7f67dbecd4a94e8bf261e17d2c99a1025604aee2f2ef2caa81bf44cd19d140690569eb44c5e7d9df470ed96bf3a316d19b21d29c5898c76b3314fff5643
-  data.tar.gz: ed43023e96d1897d64fac50d27da6c8898ce21aa6f85e7eb5d671625e91fb7c9f4081d24344497250c5822f1ce021a6e526b7414b509df0b1cc2533e99ccaf77
+  metadata.gz: c3ddaa5bbb882dc87f5696aa2a5051eb824f28eeb5a2ec9babcd684dd2688cb1ecf1b6c2a59408b8c1df00bfbd983ed427a72afab1279aa937fc3576ee9ef63c
+  data.tar.gz: 45343b1e3d50fedb564a5dbc48a10587a21aabad0ffd8e3032893c7e8431890fe82d53b5ee986940d9947b96b239a9013e96d66cf00448422dc4cf8bc55994b7

data/lib/mswin-build/builder.rb

@@ -52,6 +52,7 @@ module MswinBuild
       @config["timeout"]["svn/ruby"] ||= @config["timeout"]["default"]
       @config["timeout"]["svn/info"] ||= @config["timeout"]["default_short"]
       @config["timeout"]["git/ruby"] ||= @config["timeout"]["default"]
+      @config["timeout"]["git/info"] ||= @config["timeout"]["default_short"]
       @config["timeout"]["configure"] ||= @config["timeout"]["default"]
       @config["timeout"]["cc-version"] ||= @config["timeout"]["default_short"]
       @config["timeout"]["miniruby"] ||= @config["timeout"]["default"]
@@ -365,6 +366,16 @@ module MswinBuild
         Dir.chdir(tmpdir) do
           do_command(io, "git/ruby", "#{@config['git']} clone -q --branch #{@config['branch']} --depth 1 --single-branch #{@config['repository']} ruby")
         end
+        @data[:svn_url] = "https://github.com/ruby/ruby"
+
+        # git-info/ruby
+        Dir.chdir(File.join(tmpdir, "ruby")) do
+          do_command(io, "git-info/ruby", "#{@config['git']} log -1 2> NUL", true) do |s|
+            if /^commit ([\da-f]+)$/ =~ s
+              @data[:commit_hash] = $1
+            end
+          end
+        end
       else
         # svn/ruby
         Dir.chdir(tmpdir) do
@@ -623,7 +634,7 @@ module MswinBuild
             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
+            if !@is_git && File.basename(io.path) == "checkout" && /^(?:SVN )?Last Changed Rev: (\d+)$/ =~ line
               revision = $1
             end
           end
@@ -665,12 +676,21 @@ module MswinBuild
         title << @data[:warn]
       end
       url = @data.delete(:svn_url)
-      if revision
-        @data[:ruby_rev] = "r#{revision}"
+      commit_hash = @data.delete(:commit_hash)
+      if revision || commit_hash
+        if @is_git
+          @data[:ruby_rev] = commit_hash[0, 11]
+        else
+          @data[:ruby_rev] = "r#{revision}"
+        end
         @title.unshift(@data[:ruby_rev])
         title.unshift(@data[:ruby_rev])
         @data[:version] = "#{@data[:ruby_rev]} #{@data[:version]}"
-        @data[url] = revision
+        if @is_git
+          @data[url] = commit_hash
+        else
+          @data[url] = revision
+        end
       end
       @data.each_pair do |k, v|
         if k.is_a?(String) && /^failure_/ =~ k

data/lib/mswin-build/version.rb

@@ -1,3 +1,3 @@
 module MswinBuild
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mswin-build
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - U.Nakamura