diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-12 14:35:13 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-11-12 14:35:13 +0000 |
commit | f4d766499fcae954970c7d17406a0bd42af6b14d (patch) | |
tree | 74ffc15269e245eb18c921247cbd3b2f139fdd65 /tool/rbinstall.rb | |
parent | 68eb3d86a1ee9b7ca6b26bb30f930ab74b1b4ce1 (diff) |
merge revision(s) 43609,43617: [Backport #8878] [Backport #9085]
vcs.rb: split
* tool/vcs.rb: split from file2lastrev.rb.
* tool/rbinstall.rb (Gem::Specification.load): obtain spec date from
VCS for the case using git, RUBY_RELEASE_DATE is the last resort.
probably fixes [Bug #9085].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/rbinstall.rb')
-rwxr-xr-x | tool/rbinstall.rb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 9d10f59a5d..5162498ecd 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -18,10 +18,17 @@ require 'shellwords' require 'optparse' require 'optparse/shellwords' require 'ostruct' +require_relative 'vcs' STDOUT.sync = true File.umask(0) +begin + $vcs = VCS.detect(File.expand_path('../..', __FILE__)) +rescue VCS::NotFoundError + $vcs = nil +end + def parse_args(argv = ARGV) $mantype = 'doc' $destdir = nil @@ -555,13 +562,20 @@ module Gem super yield(self) if defined?(yield) self.executables ||= [] - self.date ||= RUBY_RELEASE_DATE end def self.load(path) src = File.open(path, "rb") {|f| f.read} src.sub!(/\A#.*/, '') - eval(src, nil, path) + spec = eval(src, nil, path) + spec.date ||= last_date(path) || RUBY_RELEASE_DATE + spec + end + + def self.last_date(path) + return unless $vcs + return unless time = $vcs.get_revisions(path)[2] + time.strftime("%Y-%m-%d") end def to_ruby |