summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-04-13 22:04:51 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-04-13 22:04:51 +0000
commitf020dffd377fa889d01cd9aeda5a9d56ad06cc8e (patch)
tree3202b3c321decff5899a1153e3c68a3822c09557 /tool
parentd6387f706834957d48e61716bc8053ec8b6aa6c5 (diff)
merge revision(s) 66737,66738,67413,67445,67446,67447,67448,67450,67451,67454:
add logic to handle Unicode beta period file names In downloader.rb, add logic to handle file names of the form UnicodeData-12.0.0d6.txt. To find the right file, we download the index of the directory. Then we download the files by finding the file names from the index. Files are always checked for changes, because changes might be frequent during the beta period. We also check whether any index.html files are left when we are not in the beta period. This would indicate that we might have stale data from the beta period rather than the actual release data. simplify filename-related code (Thanks to Nobuyoshi Nakada for the hint!) downloader.rb: keep linked file newer than cached file * tool/downloader.rb (Downloader.save_cache): keep linked file newer than cached file, so that GNU make triggers when the content is updated. it uses the timestamp of symlink itself instead of the target. add puts statements to debug Unicode file download (temporary) Unicode file download doesn't work with Visual Studio, see e.g. https://ci.appveyor.com/project/ruby/ruby/builds/23614399/job/f8vya2l7fjdfcye4 We temporarily produce more output for debugging. * remove trailing spaces. output more debug information in downloader.rb (temporary) Unicode file download doesn't work with Visual Studio, we need more debug output. downloader.rb: quote base name downloader.rb: fix typo, extra % revert r67445, (r67446,) r67447 Debugging output is no longer needed because the problem has been fixed with r67449. appveyor.yml: Use pre-generated headers and tables git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rw-r--r--tool/downloader.rb54
1 files changed, 39 insertions, 15 deletions
diff --git a/tool/downloader.rb b/tool/downloader.rb
index 3cf98e9..e884056 100644
--- a/tool/downloader.rb
+++ b/tool/downloader.rb
@@ -70,8 +70,35 @@ class Downloader
Gems = RubyGems
class Unicode < self
- def self.download(name, *rest)
- super("http://www.unicode.org/Public/#{name}", name, *rest)
+ INDEX = {} # cache index file information across files in the same directory
+ UNICODE_PUBLIC = "http://www.unicode.org/Public/"
+
+ def self.download(name, dir = nil, since = true, options = {})
+ options = options.dup
+ unicode_beta = options.delete(:unicode_beta)
+ name_dir_part = name.sub(/[^\/]+$/, '')
+ if unicode_beta == 'YES'
+ if INDEX.size == 0
+ index_options = options.dup
+ index_options[:cache_save] = false # TODO: make sure caching really doesn't work for index file
+ index_file = super(UNICODE_PUBLIC+name_dir_part, "#{name_dir_part}index.html", dir, true, index_options)
+ INDEX[:index] = IO.read index_file
+ end
+ file_base = File.basename(name, '.txt')
+ return if file_base == '.' # Use pre-generated headers and tables
+ beta_name = INDEX[:index][/#{Regexp.quote(file_base)}(-[0-9.]+d\d+)?\.txt/]
+ # make sure we always check for new versions of files,
+ # because they can easily change in the beta period
+ super(UNICODE_PUBLIC+name_dir_part+beta_name, name, dir, true, options)
+ else
+ index_file = Pathname.new(under(dir, name_dir_part+'index.html'))
+ if index_file.exist?
+ raise "Although Unicode is not in beta, file #{index_file} exists. " +
+ "Remove all files in this directory and in .downloaded-cache/ " +
+ "because they may be leftovers from the beta period."
+ end
+ super(UNICODE_PUBLIC+name, name, dir, since, options)
+ end
end
end
@@ -124,10 +151,7 @@ class Downloader
options = options.dup
url = URI(url)
dryrun = options.delete(:dryrun)
-
- # remove from options (future use, see r66448), see L166
- unicode_beta = options.delete(:unicode_beta)
- puts "never" if unicode_beta == 'assigned but unused variable...'
+ options.delete(:unicode_beta) # just to be on the safe side for gems and gcc
if name
file = Pathname.new(under(dir, name))
@@ -262,14 +286,20 @@ class Downloader
end
def self.save_cache(cache, file, name)
- if cache and !cache.eql?(file) and !cache.exist?
+ return unless cache or cache.eql?(file)
+ begin
+ st = cache.stat
+ rescue
begin
file.rename(cache)
rescue
- else
- link_cache(cache, file, name)
+ return
end
+ else
+ return unless st.mtime > file.lstat.mtime
+ file.unlink
end
+ link_cache(cache, file, name)
end
def self.with_retry(max_times, &block)
@@ -318,12 +348,6 @@ if $0 == __FILE__
when '--unicode-beta'
options[:unicode_beta] = ARGV[1]
ARGV.shift
- # TODO: Move this code further down
- if options[:unicode_beta]=='YES'
- raise "Not yet able to deal with Unicode Data beta versions."
- else
- # TODO: deal with the case that we just switched from beta to 'regular'
- end
when /\A--cache-dir=(.*)/m
options[:cache_dir] = $1
when /\A-/