diff options
| -rw-r--r-- | .github/workflows/bundled_gems.yml | 30 | ||||
| -rw-r--r-- | .github/workflows/check_misc.yml | 25 | ||||
| -rwxr-xr-x | tool/update-NEWS-gemlist.rb | 34 |
3 files changed, 36 insertions, 53 deletions
diff --git a/.github/workflows/bundled_gems.yml b/.github/workflows/bundled_gems.yml index 3f800c6a56..66a51b1a50 100644 --- a/.github/workflows/bundled_gems.yml +++ b/.github/workflows/bundled_gems.yml @@ -56,35 +56,7 @@ jobs: - name: Maintain updated gems list in NEWS run: | - #!ruby - require 'json' - news = File.read("NEWS.md") - prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1] - prevs = [prev, prev.sub(/\.\d+\z/, '')] - %W[bundled].each do |type| - last = JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g| - v = g['versions'].values_at(*prevs).compact.first - g = g['gem'] - g = 'RubyGems' if g == 'rubygems' - [g, v] if v - end.to_h - changed = File.foreach("gems/#{type}_gems").filter_map do |l| - next if l.start_with?("#") - g, v = l.split(" ", 3) - [g, v] unless last[g] == v - end - changed, added = changed.partition {|g, _| last[g]} - news.sub!(/^\*( +)The following #{type} gems? are updated\.\n+\K(?: \1\*( +).*\n)*/) do - mark = "#{$1} *#{$2}" - changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("") - end or next - news.sub!(/^\*( +)The following default gems are now bundled gems\.\n+\K(?: \1\*( +).*\n)*/) do - mark = "#{$1} *#{$2}" - added.map {|g, v|"#{mark}#{g} #{v}\n"}.join("") - end or next unless added.empty? - File.write("NEWS.md", news) - end - shell: ruby {0} + ruby tool/update-NEWS-gemlist.rb bundled - name: Check diffs id: diff diff --git a/.github/workflows/check_misc.yml b/.github/workflows/check_misc.yml index f6b09ae2a9..b41b58795f 100644 --- a/.github/workflows/check_misc.yml +++ b/.github/workflows/check_misc.yml @@ -66,30 +66,7 @@ jobs: - name: Maintain updated gems list in NEWS run: | - #!ruby - require 'json' - news = File.read("NEWS.md") - prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1] - prevs = [prev, prev.sub(/\.\d+\z/, '')] - %W[default].each do |type| - last = JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g| - v = g['versions'].values_at(*prevs).compact.first - g = g['gem'] - g = 'RubyGems' if g == 'rubygems' - [g, v] if v - end.to_h - changed = File.foreach("gems/#{type}_gems").filter_map do |l| - next if l.start_with?("#") - g, v = l.split(" ", 3) - [g, v] unless last[g] == v - end - news.sub!(/^\*( +)The following #{type} gems? are updated\.\n+\K(?: \1\* .*\n)*/) do - mark = "#{$1} * " - changed.map {|g, v|"#{mark}#{g} #{v}\n"}.join("") - end or next - File.write("NEWS.md", news) - end - shell: ruby {0} + ruby tool/update-NEWS-gemlist.rb default - name: Check diffs id: diff diff --git a/tool/update-NEWS-gemlist.rb b/tool/update-NEWS-gemlist.rb new file mode 100755 index 0000000000..ef2cc4fe36 --- /dev/null +++ b/tool/update-NEWS-gemlist.rb @@ -0,0 +1,34 @@ +#!/usr/bin/ruby +require 'json' +news = File.read("NEWS.md") +prev = news[/since the \*+(\d+\.\d+\.\d+)\*+/, 1] +prevs = [prev, prev.sub(/\.\d+\z/, '')] + +update = ->(list, type, desc = "updated") do + news.sub!(/^\*( +)The following #{type} gems? (?:are|is) #{desc}\.\n(\n*)\K(?: \1\*( +).*\n)*\n*/) do + mark = "#{$1&.<< " "}*#{$3 || ' '}" + list.map {|g, v|"#{mark}#{g} #{v}\n"}.join("") + $2 + end +end +ARGV.each do |type| + last = JSON.parse(File.read("#{type}_gems.json"))['gems'].filter_map do |g| + v = g['versions'].values_at(*prevs).compact.first + g = g['gem'] + g = 'RubyGems' if g == 'rubygems' + [g, v] if v + end.to_h + changed = File.foreach("gems/#{type}_gems").filter_map do |l| + next if l.start_with?("#") + g, v = l.split(" ", 3) + next unless v + [g, v] unless last[g] == v + end + if type == 'bundled' + changed, added = changed.partition {|g, _| last[g]} + end + update[changed, type] or next + if added and !added.empty? + update[added, 'default', 'now bundled gems'] or next + end + File.write("NEWS.md", news) +end |