X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/3b8d3bdaa9d44177777ac34741bd9fd62bd7954e..637494ac7ab11f737c47bf95a2c3a27ef1117984:/Porting/checkAUTHORS.pl diff --git a/Porting/checkAUTHORS.pl b/Porting/checkAUTHORS.pl index ffc3c28..13791ca 100755 --- a/Porting/checkAUTHORS.pl +++ b/Porting/checkAUTHORS.pl @@ -1,8 +1,9 @@ #!/usr/bin/perl -w use strict; -my ($committer, $patch, $author, $date); +my ($committer, $patch, $author); use utf8; use Getopt::Long; +use Unicode::Collate; use Text::Wrap; $Text::Wrap::columns = 80; @@ -12,16 +13,17 @@ my (%authors, %untraced, %patchers, %committers, %real_names); my $result = GetOptions ( # modes - "who" => \$who, - "rank" => \$rank, + "who" => \$who, + "rank" => \$rank, "thanks-applied" => \$ta, - "missing" => \$ack , - "tap" => \$tap, + "missing" => \$ack , + "tap" => \$tap, + # modifiers - "authors" => \$author_file, - "percentage" => \$percentage, # show as %age - "cumulative" => \$cumulative, - "reverse" => \$reverse, + "authors=s" => \$author_file, + "percentage" => \$percentage, # show as %age + "cumulative" => \$cumulative, + "reverse" => \$reverse, ); if (!$result or ( $rank + $ta + $who + $ack + $tap != 1 ) or !@ARGV) { @@ -29,7 +31,7 @@ if (!$result or ( $rank + $ta + $who + $ack + $tap != 1 ) or !@ARGV) { } $author_file ||= './AUTHORS'; -die "Can't locate '$author_file'. Specify it with '--author '." +die "Can't locate '$author_file'. Specify it with '--authors '." unless -f $author_file; my $map = generate_known_author_map(); @@ -84,9 +86,9 @@ EOS sub list_authors { my ($patchers, $authors) = @_; binmode(STDOUT, ":utf8"); - print wrap '', '', join(', ', sort { lc $a cmp lc $b } + print wrap '', '', join(', ', Unicode::Collate->new(level => 1)->sort( map { $authors->{$_} } - keys %$patchers) . ".\n"; + keys %$patchers)) . ".\n"; } sub parse_commits_from_stdin { @@ -94,10 +96,10 @@ sub parse_commits_from_stdin { for (@lines) { next if m/^$/; next if m/^(\S*?)^Merge:/ism; # skip merge commits - if (m/^(.*?)^Author:\s*(.*?)^AuthorDate:\s*(.*?)^Commit:\s*(.*?)^(.*)$/gism) { + if (m/^(.*?)^Author:\s*(.*?)^AuthorDate:\s*.*?^Commit:\s*(.*?)^(.*)$/gism) { # new patch - ( $patch, $author, $date, $committer ) = ( $1, $2, $3, $4 ); + ( $patch, $author, $committer ) = ( $1, $2, $3 ); chomp($author); unless ($author) { die $_ } chomp($committer); @@ -159,6 +161,7 @@ sub generate_known_author_map { "arbor\100al37al08.telecel.pt" , # reported perlbug ticket 5196 - no actual code contribution. no real name - jrv 20091006 "oracle\100pcr8.pcr.com", # Reported perlbug ticket 1015 - no patch - Probably Ed Eddington ed@pcr.com + "snaury\100gmail.com", # Reported cpan ticket 35943, with patch for fix ; # @@ -255,6 +258,7 @@ sub display_test_output { print "ok $count - ".$real_names->{$_} ." $_\n"; } else { print "not ok $count - Contributor not found in AUTHORS: $_ ".($real_names->{$_} || '???' )."\n"; + print STDERR ($real_names->{$_} || '???' )." <$_> not found in AUTHORS\n"; } } @@ -329,7 +333,27 @@ sub process { sub _raw_address { my $addr = shift; my $real_name; - if ( $addr =~ /<.*>/ ) { + if ($addr =~ /(?:\\?")?\s*\(via RT\) $/p) { + my $name = ${^PREMATCH}; + $addr = 'perlbug-followup@perl.org'; + # + # Try to find the author + # + if (exists $map->{$name}) { + $addr = $map->{$name}; + $real_name = $authors{$addr}; + } + else { + while (my ($email, $author_name) = each %authors) { + if ($name eq $author_name) { + $addr = $email; + $real_name = $name; + last; + } + } + } + } + elsif ( $addr =~ /<.*>/ ) { $addr =~ s/^\s*(.*)\s*<\s*(.*?)\s*>.*$/$2/; $real_name = $1; } @@ -350,7 +374,7 @@ __DATA__ # List of mappings. First entry the "correct" email address, as appears # in the AUTHORS file. Second is any "alias" mapped to it. # -# If the "correct" email address is a '+', the entry above is reused; +# If the "correct" email address is a '+', the entry above it is reused; # this for addresses with more than one alias. # # Note that all entries are in lowercase. Further, no '@' signs should @@ -387,6 +411,7 @@ davem davem\100fdgroup.com demerphq demerphq\100gmail.com + yves.orton\100de.mci.com + yves.orton\100mciworldcom.de ++ yves.orton\100booking.com + demerphq\100dromedary.booking.com + demerphq\100gemini.(none) + demerphq\100camel.booking.com @@ -420,6 +445,7 @@ jhi jhi\100iki.fi + jhi\100hut.fi + jarkko.hietaniemi\100nokia.com + jarkko.hietaniemi\100cc.hut.fi ++ jarkko.hietaniemi\100booking.com jesse jesse\100bestpractical.com + jesse\100fsck.com + jesse\100perl.org @@ -450,6 +476,16 @@ rgs rgarciasuarez\100free.fr sky sky\100nanisky.com + artur\100contiller.se + arthur\100contiller.se +smueller 7k8lrvf02\100sneakemail.com ++ kjx9zthh3001\100sneakemail.com ++ dtr8sin02\100sneakemail.com ++ rt8363b02\100sneakemail.com ++ o6hhmk002\100sneakemail.com ++ smueller\100cpan.org ++ l2ot9pa02\100sneakemail.com ++ wyp3rlx02\100sneakemail.com ++ 0mgwtfbbq\100sneakemail.com ++ xyey9001\100sneakemail.com steveh steve.m.hay\100googlemail.com + stevehay\100planit.com + steve.hay\100uk.radan.com @@ -460,21 +496,14 @@ timb Tim.Bunce\100pobox.com + tim.bunce\100ig.co.uk tonyc tony\100develop-help.com + tony\100openbsd32.tony.develop-help.com ++ tony\100saturn.(none) # # Mere mortals. # \043####\100juerd.nl juerd\100cpan.org ++ juerd\100c3.convolution.nl + juerd\100convolution.nl -7k8lrvf02\100sneakemail.com kjx9zthh3001\100sneakemail.com -+ dtr8sin02\100sneakemail.com -+ rt8363b02\100sneakemail.com -+ o6hhmk002\100sneakemail.com -+ smueller\100cpan.org -+ l2ot9pa02\100sneakemail.com -+ wyp3rlx02\100sneakemail.com -+ 0mgwtfbbq\100sneakemail.com -+ xyey9001\100sneakemail.com a.r.ferreira\100gmail.com aferreira\100shopzilla.com abe\100ztreet.demon.nl abeltje\100cpan.org abela\100hsc.fr abela\100geneanet.org @@ -533,10 +562,15 @@ bepi\100perl.it enrico.sorcinelli\100gmail.com bert\100alum.mit.edu bert\100genscan.com bigbang7\100gmail.com ddascalescu+github\100gmail.com blgl\100stacken.kth.se blgl\100hagernas.com ++ 2bfjdsla52kztwejndzdstsxl9athp\100gmail.com brian.d.foy\100gmail.com bdfoy\100cpan.org BQW10602\100nifty.com sadahiro\100cpan.org +bulk88\100hotmail.com bulk88 +chad.granum\100dreamhost.com exodist7\100gmail.com +choroba\100cpan.org choroba\100weed.(none) chromatic\100wgz.org chromatic\100rmci.net +ckuskie\100cadence.com colink\100perldreamer.com claes\100surfar.nu claes\100versed.se clintp\100geeksalad.org cpierce1\100ford.com clkao\100clkao.org clkao\100bestpractical.com @@ -554,12 +588,15 @@ crt\100kiski.net perl\100ctweten.amsite.com dairiki\100dairiki.org dairiki at dairiki.org dagolden\100cpan.org xdaveg\100gmail.com ++ xdg\100xdg.me damian\100conway.org damian\100cs.monash.edu.au dan\100sidhe.org sugalsd\100lbcc.cc.or.us + sugalskd\100osshe.edu daniel\100bitpusher.com daniel\100biz.bitpusher.com david.dyck\100fluke.com dcd\100tc.fluke.com -david\100kineticode.com david\100wheeler.com +david\100justatheory.com david\100wheeler.net ++ david\100kineticode.com ++ david\100wheeler.com + david\100wheeler.net dennis\100booking.com dennis\100camel.ams6.corp.booking.com + dennis.kaarsemaker\100booking.com @@ -567,6 +604,7 @@ dennis\100booking.com dennis\100camel.ams6.corp.booking.com dev-perl\100pimb.org knew-p5p\100pimb.org + lists-p5p\100pimb.org djberg86\100attbi.com djberg96\100attbi.com +dk\100tetsuo.karasik.eu.org dmitry\100karasik.eu.org domo\100computer.org shouldbedomo\100mac.com + domo\100slipper.ip.lu + domo\100tcp.ip.lu @@ -579,6 +617,7 @@ edwardp\100excitehome.net epeschko\100den-mdev1 + esp5\100pge.com egf7\100columbia.edu efifer\100sanwaint.com eggert\100twinsun.com eggert\100sea.sm.unisys.com +etj\100cpan.org mohawk2\100users.noreply.github.com fugazi\100zyx.net larrysh\100cpan.org + lshatzer\100islanddata.com @@ -589,10 +628,13 @@ gfuji\100cpan.org g.psy.va\100gmail.com gerard\100ggoossen.net gerard\100tty.nl gibreel\100pobox.com stephen.zander\100interlock.mckesson.com + srz\100loopback +gideon\100cpan.org gidisrael\100gmail.com gnat\100frii.com gnat\100prometheus.frii.com gp\100familiehaase.de gerrit\100familiehaase.de grazz\100pobox.com grazz\100nyc.rr.com gward\100ase.com greg\100bic.mni.mcgill.ca +haggai\100cpan.org alanhaggai\100alanhaggai.org ++ alanhaggai\100gmail.com hansmu\100xs4all.nl hansm\100icgroup.nl + hansm\100icgned.nl + hans\100icgned.nl @@ -606,7 +648,8 @@ ian.goodacre\100xtra.co.nz ian\100debian.lan ingo_weinhold\100gmx.de bonefish\100cs.tu-berlin.de james\100mastros.biz theorb\100desert-island.me.uk -jand\100activestate.com jan.dubois\100ibm.net +jan\100jandubois.com jand\100activestate.com ++ jan.dubois\100ibm.net japhy\100pobox.com japhy\100pobox.org + japhy\100perlmonk.org + japhy\100cpan.org @@ -622,6 +665,7 @@ jdhedden\100cpan.org jerry\100hedden.us + jdhedden\100gmail.com + jdhedden\100yahoo.com + jhedden\100pn100-02-2-356p.corp.bloomberg.com ++ jdhedden\100solydxk jeremy\100zawodny.com jzawodn\100wcnet.org jesse\100sig.bsh.com jesse\100ginger jfriedl\100yahoo.com jfriedl\100yahoo-inc.com @@ -630,6 +674,8 @@ jhannah\100mutationgrid.com jay\100jays.net + jhannah\100omnihotels.com jidanni\100jidanni.org jidanni\100hoffa.dreamhost.com jjore\100cpan.org twists\100gmail.com +jkeenan\100cpan.org jkeen\100verizon.net ++ jkeenan\100dromedary-001.ams6.corp.booking.com jns\100integration-house.com jns\100gellyfish.com + gellyfish\100gellyfish.com john\100atlantech.com john\100titanic.atlantech.com @@ -643,6 +689,7 @@ jpeacock\100messagesystems.com john.peacock\100havurah-software.org + jpeacock\100jpeacock-hp.doesntexist.org + jpeacock\100cpan.org + jpeacock\100rowman.com +jpl.jpl\100gmail.com jpl\100research.att.com jql\100accessone.com jql\100jql.accessone.com jsm28\100hermes.cam.ac.uk jsm28\100cam.ac.uk @@ -654,6 +701,9 @@ kane\100dwim.org kane\100xs4all.net keith.s.thompson\100gmail.com kst\100mib.org ken\100mathforum.org kenahoo\100gmail.com + ken.williams\100thomsonreuters.com +kentfredric\100gmail.com kentnl\100cpan.org +kmx\100volny.cz kmx\100volny.cz ++ kmx\100cpan.org kroepke\100dolphin-services.de kay\100dolphin-services.de kst\100mib.org kst\100cts.com + kst\100SDSC.EDU @@ -670,18 +720,23 @@ laszlo.molnar\100eth.ericsson.se molnarl\100cdata.tvnet.hu + ml1050\100freemail.hu lewart\100uiuc.edu lewart\100vadds.cvm.uiuc.edu + d-lewart\100uiuc.edu -lkundrak\100v3.sk lubo.rintel\100gooddata.com +lkundrak\100v3.sk lubo.rintel\100gooddata.com lstein\100cshl.org lstein\100formaggio.cshl.org + lstein\100genome.wi.mit.edu +l.mai\100web.de plokinom\100gmail.com lupe\100lupe-christoph.de lupe\100alanya.m.isar.de lutherh\100stratcom.com lutherh\100infinet.com mab\100wdl.loral.com markb\100rdcf.sm.unisys.com marcel\100codewerk.com gr\100univie.ac.at ++ hanekomu\100gmail.com +marcgreen\100cpan.org marcgreen\100wpi.edu +markleightonfisher\100gmail.com fisherm\100tce.com mark.p.lutz\100boeing.com tecmpl1\100triton.ca.boeing.com marnix\100gmail.com pttesac!marnix!vanam marty+p5p\100kasei.com marty\100martian.org mats\100sm6sxl.net mats\100sm5sxl.net mbarbon\100dsi.unive.it mattia.barbon\100libero.it ++ mattia\100barbon.org mcmahon\100ibiblio.org mcmahon\100metalab.unc.edu me\100davidglasser.net glasser\100tang-eleven-seventy-nine.mit.edu merijnb\100iloquent.nl merijnb\100ms.com @@ -720,6 +775,8 @@ ilya\100martynov.org ilya\100juil.nonet joshua.pritikin\100db.com joshua\100paloalto.com +litt\100acm.org tlhackque\100yahoo.com + meyering@asic.sc.ti.com jim\100meyering.net okamoto\100corp.hp.com okamoto\100hpcc123.corp.hp.com @@ -750,7 +807,8 @@ Peter.Dintelmann\100Dresdner-Bank.com peter.dintelmann\100dresdner-bank.com # NOTE: There is an intentional trailing space in the line above pfeifer\100wait.de pfeifer\100charly.informatik.uni-dortmund.de + upf\100de.uu.net -rabbit\100rabbit.us rabbit+bugs\100rabbit.us +ribasushi@cpan.org rabbit\100rabbit.us ++ rabbit+bugs\100rabbit.us perl\100aaroncrane.co.uk arc\100cpan.org phil\100perkpartners.com phil\100finchcomputer.com pimlott\100idiomtech.com andrew\100pimlott.net @@ -760,14 +818,18 @@ pne\100cpan.org philip.newton\100gmx.net + philip.newton\100datenrevision.de + pnewton\100gmx.de pprymmer\100factset.com pvhp\100forte.com -public\100khwilliamson.com khw\100karl.(none) +khw\100cpan.org khw\100karl.(none) ++ public\100khwilliamson.com + khw\100khw-desktop.(none) radu\100netsoft.ro rgreab\100fx.ro +rajagopa\100pauline.schrodinger.com rajagopa\100schrodinger.com raphael.manfredi\100pobox.com raphael_manfredi\100grenoble.hp.com module@renee-baecker.de renee.baecker\100smart-websolutions.de + reneeb\100reneeb-desktop.(none) ++ github@renee-baecker.de + otrs\100ubuntu.(none) ++ perl\100renee-baecker.de richard.foley\100rfi.net richard.foley\100t-online.de + richard.foley\100ubs.com + richard.foley\100ubsw.com @@ -779,6 +841,7 @@ rjbs\100cpan.org rjbs-perl-p5p\100lists.manxome.org + perl.p5p\100rjbs.manxome.org rjk\100linguist.dartmouth.edu rjk\100linguist.thayer.dartmouth.edu + rjk-perl-p5p\100tamias.net ++ rjk\100tamias.net rjray\100redhat.com rjray\100uswest.com rmgiroux\100acm.org rmgiroux\100hotmail.com + mgiroux\100bear.com @@ -793,11 +856,14 @@ roberto\100keltia.freenix.fr roberto\100eurocontrol.fr robin\100cpan.org robin\100kitsite.com roderick\100argon.org roderick\100gate.net + roderick\100ibcinc.com +argrath\100ub32.org root\100ub32.org rootbeer\100teleport.com rootbeer\100redcat.com + tomphoenix\100unknown rurban\100x-ray.at rurban\100cpan.org - ++ rurban\100cpanel.net +rvtol+news\100isolution.nl rvtol\100isolution.nl sartak\100bestpractical.com sartak\100gmail.com ++ code\100sartak.org sadinoff\100olf.com danny-cpan\100sadinoff.com schubiger\100cpan.org steven\100accognoscere.org + sts\100accognoscere.org @@ -823,6 +889,8 @@ simon\100simon-cozens.org simon\100pembro4.pmb.ox.ac.uk + simon\100othersideofthe.earth.li + simon\100cozens.net + simon\100netthink.co.uk +lannings\100who.int lannings\100gmail.com ++ slanning\100cpan.org slaven\100rezic.de slaven.rezic\100berlin.de + srezic\100iconmobile.com + srezic\100cpan.org @@ -848,6 +916,8 @@ stef\100mongueurs.net stef\100payrard.net + s.payrard\100wanadoo.fr + properler\100freesurf.fr + stef\100francenet.fr +stevan\100cpan.org stevan.little\100gmail.com ++ stevan.little\100iinteractive.com sthoenna\100efn.org ysth\100raven.shiftboard.com sisyphus1\100optusnet.com.au sisyphus\100cpan.org @@ -858,7 +928,7 @@ thomas.dorner\100start.de tdorner\100amadeus.net tjenness\100cpan.org t.jenness\100jach.hawaii.edu + timj\100jach.hawaii.edu tobez\100tobez.org tobez\100plab.ku.dk -toddr\100cpanel.net toddr\100cpan.org +toddr\100cpan.org toddr\100cpanel.net tom\100compton.nu thh\100cyberscience.com tom.horsley\100mail.ccur.com tom.horsley\100ccur.com + tom\100amber.ssd.hcsc.com @@ -874,6 +944,6 @@ whatever\100davidnicol.com davidnicol\100gmail.com wolfgang.laun\100alcatel.at wolfgang.laun\100chello.at + wolfgang.laun\100thalesgroup.com + wolfgang.laun\100gmail.com +wolfsage\100gmail.com mhorsfall\100darmstadtium.(none) yath\100yath.de yath-perlbug\100yath.de -jkeen@verizon.net jkeenan@cpan.org