diff options
| author | Nobuyoshi Nakada <[email protected]> | 2021-01-24 16:20:34 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <[email protected]> | 2021-01-25 18:33:33 +0900 |
| commit | 19e6d271266eca5925e66fc8ec39b251a2fa6bcd (patch) | |
| tree | 0692fd88ad949a9fe51842e86887fcb5332afa45 | |
| parent | 7fe22152fc28084f4395fece84ff6e5eb2d6b288 (diff) | |
[ruby/rdoc] Support iso-strict format in git-log
https://github.com/ruby/rdoc/commit/2a6c22da63
| -rw-r--r-- | lib/rdoc/parser/changelog.rb | 6 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_parser_changelog.rb | 11 |
2 files changed, 14 insertions, 3 deletions
diff --git a/lib/rdoc/parser/changelog.rb b/lib/rdoc/parser/changelog.rb index 25123492cc..9245d49376 100644 --- a/lib/rdoc/parser/changelog.rb +++ b/lib/rdoc/parser/changelog.rb @@ -118,11 +118,11 @@ class RDoc::Parser::ChangeLog < RDoc::Parser def parse_date(date) case date - when /\A\s*(\d+)-(\d+)-(\d+)(?: (\d+):(\d+):(\d+) *([-+]\d\d)(\d\d))?\b/ + when /\A\s*(\d+)-(\d+)-(\d+)(?:[ T](\d+):(\d+):(\d+) *([-+]\d\d):?(\d\d))?\b/ Time.new($1, $2, $3, $4, $5, $6, ("#{$7}:#{$8}" if $7)) - when /\A\s*\w{3}, +(\d+) (\w{3}) (\d+) (\d+):(\d+):(\d+) *(?:([-+]\d\d)(\d\d))\b/ + when /\A\s*\w{3}, +(\d+) (\w{3}) (\d+) (\d+):(\d+):(\d+) *(?:([-+]\d\d):?(\d\d))\b/ Time.new($3, $2, $1, $4, $5, $6, ("#{$7}:#{$8}" if $7)) - when /\A\s*\w{3} (\w{3}) +(\d+) (\d+) (\d+):(\d+):(\d+) *(?:([-+]\d\d)(\d\d))\b/ + when /\A\s*\w{3} (\w{3}) +(\d+) (\d+) (\d+):(\d+):(\d+) *(?:([-+]\d\d):?(\d\d))\b/ Time.new($3, $1, $2, $4, $5, $6, ("#{$7}:#{$8}" if $7)) when /\A\s*\w{3} (\w{3}) +(\d+) (\d+):(\d+):(\d+) (\d+)\b/ Time.new($6, $1, $2, $3, $4, $5) diff --git a/test/rdoc/test_rdoc_parser_changelog.rb b/test/rdoc/test_rdoc_parser_changelog.rb index 1476cf5dde..6584840572 100644 --- a/test/rdoc/test_rdoc_parser_changelog.rb +++ b/test/rdoc/test_rdoc_parser_changelog.rb @@ -343,6 +343,12 @@ Date: Sat, 23 Jan 2021 06:01:39 +0900 * 2021-01-23 [ci skip] +commit\ a3efbda7128ef20b55505b32d1608ea48f80af4a +Author: git <[email protected]> +Date: 2021-01-22T02:49:39+09:00 + + * 2021-01-22 [ci skip] + commit\ 709bed2afaee50e2ce803f87bf1ee8291bea41e3 Author: git <[email protected]> Date: 2021-01-21 01:03:52 +0900 @@ -394,6 +400,11 @@ ChangeLog log_entry(nil, 'db7d0b89f6eca66cc7eb', 'git', '[email protected]', 'Sat, 23 Jan 2021 06:01:39 +0900', [list(:BULLET, item(nil, para('2021-01-23 [ci skip]')))]), + head(2, '2021-01-22'), + blank_line, + log_entry(nil, 'a3efbda7128ef20b5550', + 'git', '[email protected]', '2021-01-22T02:49:39+09:00', + [list(:BULLET, item(nil, para('2021-01-22 [ci skip]')))]), head(2, '2021-01-21'), blank_line, log_entry(nil, '709bed2afaee50e2ce80', |