Add script to alphabetise submodule list (#4054)

This commit is contained in:
John Gardner
2018-03-02 20:33:09 +11:00
committed by GitHub
parent 50d46eed38
commit 1b3cdda4f7
4 changed files with 785 additions and 729 deletions

1458
.gitmodules vendored

File diff suppressed because it is too large Load Diff

View File

@@ -112,4 +112,5 @@ end
log "Updating grammar documentation in vendor/README.md"
command('bundle', 'exec', 'rake', 'samples')
command('script/sort-submodules')
command('script/list-grammars')

50
script/sort-submodules Executable file
View File

@@ -0,0 +1,50 @@
#!/usr/bin/env ruby
require "optparse"
ROOT = File.expand_path "../../", __FILE__
# Extract and sort a list of submodules
def sort_entries(file_data)
submodules = []
file_data.scan(/(^\[submodule[^\n]+\n)((?:\t[^\n]+\n)+)/).each do |head, body|
path = body.match(/^\tpath\s*=\s*\K(.+)$/)[0]
submodules << [path, head + body]
end
submodules.sort! { |a,b| a[0] <=> b[0] }
submodules.collect { |i| i[1] }
end
usage = <<-EOH
Usage:
#{$0} [-t|--test] [-h|--help]
Examples:
#{$0} # Update .gitmodules file in-place
#{$0} --help # Display this help message
#{$0} --test # Exit with an error code if .gitmodules needs sorting
EOH
$testing = false
OptionParser.new do |opts|
opts.banner = usage
opts.on("-h", "--help") do
puts usage
exit
end
opts.on("-t", "--test", "Don't update file; only test if it's unsorted") do
$testing = true
end
end.parse!
unsorted = File.read("#{ROOT}/.gitmodules")
sorted = sort_entries(unsorted).join
if $testing
exit unsorted == sorted
else
File.write "#{ROOT}/.gitmodules", sorted
end

View File

@@ -44,6 +44,11 @@ class TestPedantic < Minitest::Test
assert_sorted tests
end
def test_submodules_are_sorted
system(File.expand_path("../../script/sort-submodules", __FILE__) + " -t")
assert $?.success?
end
def assert_sorted(list)
list.each_cons(2) do |previous, item|
flunk "#{previous} should come after #{item}" if previous > item