This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libhtml-tableparser-perl.
commit e68c64972b015f079296ec827e8d8d787328e41e Author: gregor herrmann <[email protected]> Date: Thu Oct 23 22:30:04 2014 +0200 Imported Upstream version 0.40 --- ChangeLog | 136 +++++- Changes | 171 ++++--- LICENSE | 6 + MANIFEST | 20 +- META.json | 68 +++ META.yml | 44 +- Makefile.PL | 12 +- cpanfile | 29 ++ inc/Module/AutoInstall.pm | 768 ------------------------------ inc/Module/CPANfile.pm | 164 +++++++ inc/Module/CPANfile/Environment.pm | 59 +++ inc/Module/CPANfile/Result.pm | 94 ++++ inc/Module/Install.pm | 596 +++++++++++++++-------- inc/Module/Install/AuthorTests.pm | 59 +++ inc/Module/Install/AutoInstall.pm | 61 --- inc/Module/Install/AutoLicense.pm | 63 +++ inc/Module/Install/Base.pm | 65 +-- inc/Module/Install/CPANfile.pm | 66 +++ inc/Module/Install/Can.pm | 100 +++- inc/Module/Install/Fetch.pm | 16 +- inc/Module/Install/Include.pm | 34 -- inc/Module/Install/Makefile.pm | 293 +++++++++--- inc/Module/Install/Metadata.pm | 936 +++++++++++++++++++++++++++---------- inc/Module/Install/Win32.pm | 19 +- inc/Module/Install/WriteAll.pm | 84 ++-- lib/HTML/TableParser.pm | 5 +- t/contents.t | 2 +- t/pod-coverage.t | 13 - xt/00-compile.t | 10 + xt/changes.t | 3 + xt/nobreakpoints.t | 7 + {t => xt}/perlcritic.t | 0 xt/pod-coverage.t | 7 + {t => xt}/pod.t | 0 34 files changed, 2431 insertions(+), 1579 deletions(-) diff --git a/ChangeLog b/ChangeLog index b523aca..9a4c5ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,103 @@ -2007-09-21 Diab Jerius <[email protected]> +2014-08-22 14:05 -0400 Diab Jerius <[email protected]> (6608e8fa4852 [tip]) - Tag: 0.37 + * .hgtags: + Added tag 0.40 for changeset efdcf646274d + +2014-08-22 14:04 -0400 Diab Jerius <[email protected]> (efdcf646274d [0.40]) + + * Changes, lib/HTML/TableParser.pm: + update logs and version for release + +2014-08-22 14:04 -0400 Diab Jerius <[email protected]> (b7432601d9bc) + + * lib/HTML/TableParser.pm: + fix typo in docs + +2014-08-22 13:47 -0400 Diab Jerius <[email protected]> (fcddaa10e696) + + * .hgtags: + Added tag 0.39 for changeset 699f32458562 + +2014-08-22 13:47 -0400 Diab Jerius <[email protected]> (699f32458562 [0.39]) + + * Changes, lib/HTML/TableParser.pm: + update logs and version for release + +2014-08-18 15:20 -0400 Diab Jerius <[email protected]> (57a726f11191) + + * .hgtags: + Added tag 0.38_02 for changeset 6d31ae6ae6a7 + +2014-08-18 15:19 -0400 Diab Jerius <[email protected]> (6d31ae6ae6a7 [0.38_02]) + + * Changes, lib/HTML/TableParser.pm: + update logs and version for release + +2014-08-18 15:18 -0400 Diab Jerius <[email protected]> (a586c72c83af) + + * MANIFEST.SKIP: + don't distribute MYMETA files + +2014-08-18 12:18 -0400 Diab Jerius <[email protected]> (641d87cd2e78) + + * ChangeLog: deleted file. + * ChangeLog: + don't track ChangeLog; it's a derived product + +2014-08-18 12:16 -0400 Diab Jerius <[email protected]> (d150b3bdd19f) + + * .hgtags: + Added tag 0.38_01 for changeset b5e0152958a9 + +2014-08-18 12:15 -0400 Diab Jerius <[email protected]> (b5e0152958a9 [0.38_01]) + + * Changes, lib/HTML/TableParser.pm: + update logs and version for release + +2014-08-18 10:18 -0400 Diab Jerius <[email protected]> (153e4c40701e) -2007-09-21 11:50 -0400 djerius <[email protected]> (3a78dd44540c [tip]) + * cpanfile, xt/00-compile.t, xt/changes.t, xt/nobreakpoints.t, + xt/perlcritic.t, xt/pod-coverage.t, xt/pod.t: new file. + * LICENSE, t/perlcritic.t, t/pod-coverage.t, t/pod.t: deleted file. + * Changes, LICENSE, Makefile.PL, cpanfile, lib/HTML/TableParser.pm, + t/perlcritic.t, t/pod-coverage.t, t/pod.t, xt/00-compile.t, + xt/changes.t, xt/nobreakpoints.t, xt/perlcritic.t, xt/pod- + coverage.t, xt/pod.t: + upgrade build infrastructre; use cpanfile, authortests, + CPAN::Changes + +2014-08-18 10:17 -0400 Diab Jerius <[email protected]> (93401bbfb425) + + * t/contents.t: + remove bogus and deprecated defined @array + +2008-05-13 22:54 -0400 djerius <[email protected]> (edbdc3889e71) + + * .hgtags: + no code changes -- CPAN distribution had bad META.yml file + +2008-05-13 22:53 -0400 djerius <[email protected]> (d41c9e970c9c [0.38]) + + * lib/HTML/TableParser/Table.pm: + keep versions the same + +2008-05-13 22:30 -0400 djerius <[email protected]> (e10688237c23) + + * Changes, lib/HTML/TableParser.pm: + no code changes -- CPAN distribution had bad META.yml file + +2007-09-21 11:54 -0400 djerius <[email protected]> (a3b6a9282706) + + * .hgtags: + Added tag 0.37 for changeset f8aab23730f6 + +2007-09-21 11:53 -0400 djerius <[email protected]> (f8aab23730f6 [0.37]) + + * ChangeLog, Changes, lib/HTML/TableParser.pm, + lib/HTML/TableParser/Table.pm: + update for release + +2007-09-21 11:50 -0400 djerius <[email protected]> (3a78dd44540c) * t/pod-coverage.t: incorrect setting of plans if Test::Pod::Coverage wasn't available @@ -54,6 +149,7 @@ 2007-09-19 21:20 -0400 djerius <[email protected]> (97709599c2ee) + * MANIFEST: deleted file. * MANIFEST: no longer necessary @@ -64,6 +160,8 @@ 2007-09-19 21:18 -0400 djerius <[email protected]> (df8f9fd02b7f) + * lib/HTML/TableParser.pm, lib/HTML/TableParser/Table.pm: new file. + * TableParser.pm: deleted file. * TableParser.pm, lib/HTML/TableParser.pm, lib/HTML/TableParser/Table.pm: separate modules into separate files. rename private methods to @@ -71,6 +169,7 @@ 2007-09-19 21:12 -0400 djerius <[email protected]> (0cba157ce5f9) + * t/00-load.t, t/perlcritic.t, t/pod-coverage.t, t/pod.t: new file. * t/00-load.t, t/perlcritic.t, t/pod-coverage.t, t/pod.t: add new tests for pod and perlcritic @@ -81,6 +180,7 @@ 2007-09-19 21:46 +0000 dj <dj> (f60fb810ce45) + * ChangeLog: new file. * ChangeLog: 2007-09-19 21:46:25 by dj added ChangeLog @@ -117,6 +217,7 @@ 2002-09-03 15:36 +0000 dj <dj> (836e5206bc16) + * t/end_table.t, tdata/end_table.html: new file. * Changes, t/end_table.t, tdata/end_table.html: 2002-09-03 15:36:54 by dj new tests for extra </table> tag @@ -150,8 +251,8 @@ * TableParser.pm: 2002-04-18 16:50:16 by dj - - decode_entitites was being called too late in fix_texts, so Trim - was less than effectual. + - decode_entitites was being called too late in fix_texts, so Trim was + less than effectual. - added DecodeNBSP attribute to fix nbsp decoding issues. @@ -168,6 +269,7 @@ 2002-04-18 13:22 +0000 dj <dj> (a7f7a965932d) + * t/class-01.t: new file. * t/class-01.t: 2002-04-18 13:22:25 by dj test of method/class undef @@ -213,6 +315,7 @@ 2002-01-31 02:06 +0000 dj <dj> (476ba2ba3831) + * THANKS: new file. * MANIFEST, README, THANKS: 2002-01-31 02:05:05 by dj @@ -244,6 +347,7 @@ 2002-01-31 01:58 +0000 dj <dj> (595fbdeb6f11) + * t/common.pl: new file. * t/common.pl, t/contents.t: 2002-01-31 01:58:38 by dj consolidated some code. now tests embedded table fixed some errors from before. how'd it work? @@ -255,6 +359,7 @@ 2002-01-31 01:57 +0000 dj <dj> (5678b2ab5146) + * t/req_order.t: new file. * t/req_order.t: 2002-01-31 01:57:51 by dj new test @@ -267,6 +372,9 @@ * data/table2-1.Chomp.data, data/table2-1.Decode.data, data/table2-1.Default.data, data/table2-1.Trim.data, + data/table2-1.hdr: new file. + * data/table2-1.Chomp.data, data/table2-1.Decode.data, + data/table2-1.Default.data, data/table2-1.Trim.data, data/table2-1.hdr: 2002-01-31 01:34:06 by dj new data for embedded table @@ -293,6 +401,19 @@ 2001-12-12 22:17 +0000 dj <dj> (513f7d1f73cb) + * LICENSE, MANIFEST.SKIP, README, data/ned.Chomp.data, + data/ned.Decode.data, data/ned.Default.data, data/ned.Trim.data, + data/ned.hdr, data/ned.html, data/screwy.Chomp.data, + data/screwy.Decode.data, data/screwy.Default.data, + data/screwy.Trim.data, data/screwy.hdr, data/screwy.html, + data/table.Chomp.data, data/table.Decode.data, + data/table.Default.data, data/table.Trim.data, data/table.hdr, + data/table.html, data/table2.Chomp.data, data/table2.Decode.data, + data/table2.Default.data, data/table2.Trim.data, data/table2.hdr, + data/table2.html, t/class.t, t/contents.t, t/counts.pl, t/funcs.t, + t/methods.t: new file. + * INSTALL, html/ned.html, html/screwy.html, html/table.html, + html/table2.html, test.pl: deleted file. * Changes, INSTALL, LICENSE, MANIFEST, MANIFEST.SKIP, Makefile.PL, README, TableParser.pm, data/ned.Chomp.data, data/ned.Decode.data, data/ned.Default.data, data/ned.Trim.data, data/ned.hdr, @@ -309,6 +430,7 @@ 2007-09-19 17:46 -0400 djerius <[email protected]> (ea46c684d5de) + * .hgtags: new file. * .hgtags: Added tag initial for changeset 11a58a96c262 @@ -316,11 +438,15 @@ * Changes, INSTALL, MANIFEST, Makefile.PL, TableParser.pm, html/ned.html, html/screwy.html, html/table.html, html/table2.html, + test.pl: new file. + * Changes, INSTALL, MANIFEST, Makefile.PL, TableParser.pm, + html/ned.html, html/screwy.html, html/table.html, html/table2.html, test.pl: 1999-12-16 18:00:21 by dj Initial revision 2007-09-19 17:46 -0400 djerius <[email protected]> (11692bba182f) + * .hgignore: new file. * .hgignore: Tailor preparing to convert repo by adding .hgignore diff --git a/Changes b/Changes index 3950bba..691a289 100644 --- a/Changes +++ b/Changes @@ -1,91 +1,130 @@ Revision history for Perl extension HTML::TableParser. -0.38 Tue May 13 22:28:38 EDT 2008 - - no code changes -- CPAN distribution had bad META.yml file +0.40 2014-08-22T14:02:33-0400 -0.37 Fri Sep 21 11:52:34 EDT 2007 - - incorrect setting of plans if Test::Pod::Coverage wasn't available - - quiet inappropriate perlcritic warning + * fix typo in docs RT#82224 -0.36 Thu Sep 20 09:30:35 EDT 2007 - - add version to Table.pm to fix PAUSE indexer error -0.35 Wed Sep 19 21:22:22 EDT 2007 - - fix test to work with Test::More 0.71 - - reorganize to a more modern layout - - new pod & perlcritic tests +0.39 2014-08-22T13:45:47-0400 -0.34 Sat Sep 7 01:25:01 EDT 2002 - - HTML::Parser v. 3.25 didn't handle croaks in callbacks - correctly. 3.26 does; Makefile.PL was updated to require it. + * CPAN::testers all green; upgrade to release. -0.33 Tue Sep 3 14:15:13 EDT 2002 - - MANIFEST was out of date. oops. +0.38_02 2014-08-18T15:17:53-0400 -0.32 Tue Sep 3 11:32:20 EDT 2002 - - extra </table> tags were not handled properly. it now - croaks if it hits an extra </table> tag. + [PACKAGING] -0.31 Sat Apr 20 01:56:28 EDT 2002 - - was using features of Test::More v0.32 and didn't - specify a version in Makefile.PL, causing problems - with earlier versions. Ooops. + * don't distribute MYMETA files + * update ChangeLog -0.3 Wed Apr 17 11:26:31 EDT 2002 - - specification of ids and column names in matches has been - extended and simplified. id and cols now may take - arrayrefs of things to match. colre is deprecated. +0.38_01 2014-08-18T10:55:06-0400 - - matches can be made using literals, subroutines and qr// - created regexps. the latter two are automatically recognized. + [BUILD FIXES] + * move author tests to xt/ RT98127 - - explicit exclusions and skipping of tables is now possible + * remove deprecated syntax in t/contents.t RT97725 - - improved docs (a bit) + * use cpanfile to manage dependencies - - decode_entitites was being called too late in fix_texts, - so Trim was less than effectual. + * add repository link to metadata - - added DecodeNBSP attribute to fix nbsp decoding issues. +0.38 2008-05-13T22:28:38-0400 - - callbacks for methods and classes can be turned off - by assigning an undef value to the appropriate key in the - table request. + * no code changes -- CPAN distribution had bad META.yml file - - the warn callback is also passed the line number now. - this is an incompatible change in the API. +0.37 2007-09-20T09:30:35-0400 -0.2 Wed Jan 30 19:54:14 EST 2002 + * incorrect setting of plans if Test::Pod::Coverage wasn't available - - one could not use id=DEFAULT as a fall through if a column - name match didn't work. in fact, one couldn't intersperse - id's in a request list; they all had to be at the beginning. - there's now a well defined order in how requests are - processed. + * quiet inappropriate perlcritic warning - - fixing this uncovered another subtle bug. a header line was - originally recognized only after finishing the first - non-header line. this lead to the situation that if an - embedded table was in the first non-header row, it would be - matched against column name match requests before the enclosing - table, because it would be completely parsed before the - enclosing table's header was even recognized. to fix this, - we finish off a header in the first non-header column if the - previous row was a header and the current row isn't a - header. - - - added an embedded table test in t/contents.t +0.36 2007-09-20T09:30:35-0400 - - format of comparison data was wrong. wanted embedded tab - between columns, got character sequence '\t' - - - checking whether a request had been used was 99% foobared. + * add version to Table.pm to fix PAUSE indexer error +0.35 2007-09-19T21:22:22-0400 -0.1 Wed Dec 12 17:12:22 EST 2001 - - total rewrite. the only thing left of the old - code is probably the header/row column&row spanning code. + * fix test to work with Test::More 0.71 -0.01 Fri Dec 10 14:36:39 1999 - - original version; created by h2xs 1.18 + * reorganize to a more modern layout + * new pod & perlcritic tests + +0.34 2002-09-07T01:25:01-0400 + + * HTML::Parser v. 3.25 didn't handle croaks in callbacks + correctly. 3.26 does; Makefile.PL was updated to require it. + +0.33 2002-09-03T14:15:13-0400 + + * MANIFEST was out of date. oops. + +0.32 2002-09-03T11:32:20-0400 + + * extra </table> tags were not handled properly. it now croaks if it + hits an extra </table> tag. + +0.31 2002-04-20T01:56:28-0400 + + * was using features of Test::More v0.32 and didn't specify a + version in Makefile.PL, causing problems with earlier versions. + Ooops. + +0.3 2002-04-17T11:26:31-0400 + + * specification of ids and column names in matches has been + extended and simplified. id and cols now may take + arrayrefs of things to match. colre is deprecated. + + * matches can be made using literals, subroutines and qr// + created regexps. the latter two are automatically recognized. + + * explicit exclusions and skipping of tables is now possible + + * improved docs (a bit) + + * decode_entitites was being called too late in fix_texts, + so Trim was less than effectual. + + * added DecodeNBSP attribute to fix nbsp decoding issues. + + * callbacks for methods and classes can be turned off + by assigning an undef value to the appropriate key in the + table request. + + * the warn callback is also passed the line number now. + this is an incompatible change in the API. + +0.2 2002-01-30T19:54:14-0500 + + * one could not use id=DEFAULT as a fall through if a column + name match didn't work. in fact, one couldn't intersperse + id's in a request list; they all had to be at the beginning. + there's now a well defined order in how requests are + processed. + + * fixing this uncovered another subtle bug. a header line was + originally recognized only after finishing the first + non-header line. this lead to the situation that if an + embedded table was in the first non-header row, it would be + matched against column name match requests before the enclosing + table, because it would be completely parsed before the + enclosing table's header was even recognized. to fix this, + we finish off a header in the first non-header column if the + previous row was a header and the current row isn't a + header. + + * added an embedded table test in t/contents.t + + * format of comparison data was wrong. wanted embedded tab + between columns, got character sequence '\t' + + * checking whether a request had been used was 99% foobared. + + +0.1 2001-12-12T17:12:22-0500 + + * total rewrite. the only thing left of the old code is probably + the header/row column&row spanning code. + +0.01 1999-12-10T14:36:39-0500 + * original version; created by h2xs 1.18 diff --git a/LICENSE b/LICENSE index 94a9ed0..d6cfb51 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,9 @@ +This software is Copyright (c) 2014 by Smithsonian Astrophysical Observatory. + +This is free software, licensed under: + + The GNU General Public License, Version 3, June 2007 + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/MANIFEST b/MANIFEST index 3ebeccf..67e26f7 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,5 +1,6 @@ ChangeLog Changes +cpanfile data/ned.Chomp.data data/ned.Decode.data data/ned.Default.data @@ -29,13 +30,16 @@ data/table2.Default.data data/table2.hdr data/table2.html data/table2.Trim.data -inc/Module/AutoInstall.pm +inc/Module/CPANfile.pm +inc/Module/CPANfile/Environment.pm +inc/Module/CPANfile/Result.pm inc/Module/Install.pm -inc/Module/Install/AutoInstall.pm +inc/Module/Install/AuthorTests.pm +inc/Module/Install/AutoLicense.pm inc/Module/Install/Base.pm inc/Module/Install/Can.pm +inc/Module/Install/CPANfile.pm inc/Module/Install/Fetch.pm -inc/Module/Install/Include.pm inc/Module/Install/Makefile.pm inc/Module/Install/Metadata.pm inc/Module/Install/Win32.pm @@ -45,6 +49,7 @@ lib/HTML/TableParser/Table.pm LICENSE Makefile.PL MANIFEST This list of files +META.json META.yml README t/00-load.t @@ -56,9 +61,12 @@ t/counts.pl t/end_table.t t/funcs.t t/methods.t -t/perlcritic.t -t/pod-coverage.t -t/pod.t t/req_order.t tdata/end_table.html THANKS +xt/00-compile.t +xt/changes.t +xt/nobreakpoints.t +xt/perlcritic.t +xt/pod-coverage.t +xt/pod.t diff --git a/META.json b/META.json new file mode 100644 index 0000000..3839199 --- /dev/null +++ b/META.json @@ -0,0 +1,68 @@ +{ + "abstract" : "Extract data from an HTML table", + "author" : [ + "Diab Jerius ([email protected])" + ], + "dynamic_config" : "0", + "generated_by" : "Module::Install version 1.10, CPAN::Meta::Converter version 2.142060", + "license" : [ + "unknown" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "HTML-TableParser", + "no_index" : { + "directory" : [ + "inc", + "t", + "xt" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.59" + } + }, + "configure" : { + "requires" : { + "CPAN::Meta" : "0", + "ExtUtils::MakeMaker" : "6.59" + } + }, + "develop" : { + "requires" : { + "Module::Install" : "0", + "Module::Install::AuthorTests" : "0", + "Module::Install::CPANfile" : "0", + "Test::CPAN::Changes" : "0", + "Test::Compile" : "0", + "Test::NoBreakpoints" : "0", + "Test::Perl::Critic" : "0", + "Test::Pod" : "0", + "Test::Pod::Coverage" : "0" + } + }, + "runtime" : { + "requires" : { + "HTML::Entities" : "0", + "HTML::Parser" : "3.26", + "perl" : "v5.8.1" + } + }, + "test" : { + "requires" : { + "Test::More" : "0.32" + } + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "url" : "http://bitbucket.org/djerius/html-tableparser"; + } + }, + "version" : "0.40" +} diff --git a/META.yml b/META.yml index 3f2fc79..d58c90c 100644 --- a/META.yml +++ b/META.yml @@ -1,21 +1,29 @@ ---- -abstract: Extract data from an HTML table -author: - - Diab Jerius ([email protected]) -build_requires: - Test::More: 0.32 -distribution_type: module -generated_by: Module::Install version 0.68 -license: gpl -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.3.html - version: 1.3 +--- +abstract: 'Extract data from an HTML table' +author: + - 'Diab Jerius ([email protected])' +build_requires: + ExtUtils::MakeMaker: '6.59' + Test::More: '0.32' +configure_requires: + CPAN::Meta: '0' + ExtUtils::MakeMaker: '6.59' +dynamic_config: '0' +generated_by: 'Module::Install version 1.10, CPAN::Meta::Converter version 2.142060' +license: unknown +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' name: HTML-TableParser -no_index: - directory: +no_index: + directory: - inc - t -requires: - HTML::Entities: 0 - HTML::Parser: 3.26 -version: 0.38 + - xt +requires: + HTML::Entities: '0' + HTML::Parser: '3.26' + perl: v5.8.1 +resources: + repository: http://bitbucket.org/djerius/html-tableparser +version: '0.40' diff --git a/Makefile.PL b/Makefile.PL index c754d2f..de14bc0 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -4,13 +4,17 @@ use warnings; use inc::Module::Install; name 'HTML-TableParser'; +license 'gpl3'; + +auto_license( holder => 'Smithsonian Astrophysical Observatory' ); all_from 'lib/HTML/TableParser.pm'; -requires 'HTML::Entities'; -requires 'HTML::Parser' => 3.26; -build_requires 'Test::More' => 0.32; +repository 'http://bitbucket.org/djerius/html-tableparser'; + +author_tests( 'xt' ); + +cpanfile; -auto_install; WriteAll; diff --git a/cpanfile b/cpanfile new file mode 100644 index 0000000..9f4befe --- /dev/null +++ b/cpanfile @@ -0,0 +1,29 @@ +#!perl + +on runtime => sub { + + requires 'HTML::Entities'; + requires 'HTML::Parser' => 3.26; + +}; + +on develop => sub { + + requires 'Test::NoBreakpoints'; + requires 'Test::Pod'; + requires 'Test::Pod::Coverage'; + requires 'Test::Perl::Critic'; + requires 'Test::Compile'; + requires 'Test::CPAN::Changes'; + + requires 'Module::Install'; + requires 'Module::Install::AuthorTests'; + requires 'Module::Install::CPANfile'; + +}; + +on test => sub { + + requires 'Test::More' => 0.32; + +}; diff --git a/inc/Module/AutoInstall.pm b/inc/Module/AutoInstall.pm deleted file mode 100644 index 7efc552..0000000 --- a/inc/Module/AutoInstall.pm +++ /dev/null @@ -1,768 +0,0 @@ -#line 1 -package Module::AutoInstall; - -use strict; -use Cwd (); -use ExtUtils::MakeMaker (); - -use vars qw{$VERSION}; -BEGIN { - $VERSION = '1.03'; -} - -# special map on pre-defined feature sets -my %FeatureMap = ( - '' => 'Core Features', # XXX: deprecated - '-core' => 'Core Features', -); - -# various lexical flags -my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $HasCPANPLUS ); -my ( $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly ); -my ( $PostambleActions, $PostambleUsed ); - -# See if it's a testing or non-interactive session -_accept_default( $ENV{AUTOMATED_TESTING} or ! -t STDIN ); -_init(); - -sub _accept_default { - $AcceptDefault = shift; -} - -sub missing_modules { - return @Missing; -} - -sub do_install { - __PACKAGE__->install( - [ - $Config - ? ( UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} ) - : () - ], - @Missing, - ); -} - -# initialize various flags, and/or perform install -sub _init { - foreach my $arg ( - @ARGV, - split( - /[\s\t]+/, - $ENV{PERL_AUTOINSTALL} || $ENV{PERL_EXTUTILS_AUTOINSTALL} || '' - ) - ) - { - if ( $arg =~ /^--config=(.*)$/ ) { - $Config = [ split( ',', $1 ) ]; - } - elsif ( $arg =~ /^--installdeps=(.*)$/ ) { - __PACKAGE__->install( $Config, @Missing = split( /,/, $1 ) ); - exit 0; - } - elsif ( $arg =~ /^--default(?:deps)?$/ ) { - $AcceptDefault = 1; - } - elsif ( $arg =~ /^--check(?:deps)?$/ ) { - $CheckOnly = 1; - } - elsif ( $arg =~ /^--skip(?:deps)?$/ ) { - $SkipInstall = 1; - } - elsif ( $arg =~ /^--test(?:only)?$/ ) { - $TestOnly = 1; - } - } -} - -# overrides MakeMaker's prompt() to automatically accept the default choice -sub _prompt { - goto &ExtUtils::MakeMaker::prompt unless $AcceptDefault; - - my ( $prompt, $default ) = @_; - my $y = ( $default =~ /^[Yy]/ ); - - print $prompt, ' [', ( $y ? 'Y' : 'y' ), '/', ( $y ? 'n' : 'N' ), '] '; - print "$default\n"; - return $default; -} - -# the workhorse -sub import { - my $class = shift; - my @args = @_ or return; - my $core_all; - - print "*** $class version " . $class->VERSION . "\n"; - print "*** Checking for Perl dependencies...\n"; - - my $cwd = Cwd::cwd(); - - $Config = []; - - my $maxlen = length( - ( - sort { length($b) <=> length($a) } - grep { /^[^\-]/ } - map { - ref($_) - ? ( ( ref($_) eq 'HASH' ) ? keys(%$_) : @{$_} ) - : '' - } - map { +{@args}->{$_} } - grep { /^[^\-]/ or /^-core$/i } keys %{ +{@args} } - )[0] - ); - - while ( my ( $feature, $modules ) = splice( @args, 0, 2 ) ) { - my ( @required, @tests, @skiptests ); - my $default = 1; - my $conflict = 0; - - if ( $feature =~ m/^-(\w+)$/ ) { - my $option = lc($1); - - # check for a newer version of myself - _update_to( $modules, @_ ) and return if $option eq 'version'; - - # sets CPAN configuration options - $Config = $modules if $option eq 'config'; - - # promote every features to core status - $core_all = ( $modules =~ /^all$/i ) and next - if $option eq 'core'; - - next unless $option eq 'core'; - } - - print "[" . ( $FeatureMap{ lc($feature) } || $feature ) . "]\n"; - - $modules = [ %{$modules} ] if UNIVERSAL::isa( $modules, 'HASH' ); - - unshift @$modules, -default => &{ shift(@$modules) } - if ( ref( $modules->[0] ) eq 'CODE' ); # XXX: bugward combatability - - while ( my ( $mod, $arg ) = splice( @$modules, 0, 2 ) ) { - if ( $mod =~ m/^-(\w+)$/ ) { - my $option = lc($1); - - $default = $arg if ( $option eq 'default' ); - $conflict = $arg if ( $option eq 'conflict' ); - @tests = @{$arg} if ( $option eq 'tests' ); - @skiptests = @{$arg} if ( $option eq 'skiptests' ); - - next; - } - - printf( "- %-${maxlen}s ...", $mod ); - - if ( $arg and $arg =~ /^\D/ ) { - unshift @$modules, $arg; - $arg = 0; - } - - # XXX: check for conflicts and uninstalls(!) them. - if ( - defined( my $cur = _version_check( _load($mod), $arg ||= 0 ) ) ) - { - print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n"; - push @Existing, $mod => $arg; - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - else { - print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n"; - push @required, $mod => $arg; - } - } - - next unless @required; - - my $mandatory = ( $feature eq '-core' or $core_all ); - - if ( - !$SkipInstall - and ( - $CheckOnly - or _prompt( - qq{==> Auto-install the } - . ( @required / 2 ) - . ( $mandatory ? ' mandatory' : ' optional' ) - . qq{ module(s) from CPAN?}, - $default ? 'y' : 'n', - ) =~ /^[Yy]/ - ) - ) - { - push( @Missing, @required ); - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - - elsif ( !$SkipInstall - and $default - and $mandatory - and - _prompt( qq{==> The module(s) are mandatory! Really skip?}, 'n', ) - =~ /^[Nn]/ ) - { - push( @Missing, @required ); - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - - else { - $DisabledTests{$_} = 1 for map { glob($_) } @tests; - } - } - - $UnderCPAN = _check_lock(); # check for $UnderCPAN - - if ( @Missing and not( $CheckOnly or $UnderCPAN ) ) { - require Config; - print -"*** Dependencies will be installed the next time you type '$Config::Config{make}'.\n"; - - # make an educated guess of whether we'll need root permission. - print " (You may need to do that as the 'root' user.)\n" - if eval '$>'; - } - print "*** $class configuration finished.\n"; - - chdir $cwd; - - # import to main:: - no strict 'refs'; - *{'main::WriteMakefile'} = \&Write if caller(0) eq 'main'; -} - -# Check to see if we are currently running under CPAN.pm and/or CPANPLUS; -# if we are, then we simply let it taking care of our dependencies -sub _check_lock { - return unless @Missing; - - if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) { - print <<'END_MESSAGE'; - -*** Since we're running under CPANPLUS, I'll just let it take care - of the dependency's installation later. -END_MESSAGE - return 1; - } - - _load_cpan(); - - # Find the CPAN lock-file - my $lock = MM->catfile( $CPAN::Config->{cpan_home}, ".lock" ); - return unless -f $lock; - - # Check the lock - local *LOCK; - return unless open(LOCK, $lock); - - if ( - ( $^O eq 'MSWin32' ? _under_cpan() : <LOCK> == getppid() ) - and ( $CPAN::Config->{prerequisites_policy} || '' ) ne 'ignore' - ) { - print <<'END_MESSAGE'; - -*** Since we're running under CPAN, I'll just let it take care - of the dependency's installation later. -END_MESSAGE - return 1; - } - - close LOCK; - return; -} - -sub install { - my $class = shift; - - my $i; # used below to strip leading '-' from config keys - my @config = ( map { s/^-// if ++$i; $_ } @{ +shift } ); - - my ( @modules, @installed ); - while ( my ( $pkg, $ver ) = splice( @_, 0, 2 ) ) { - - # grep out those already installed - if ( defined( _version_check( _load($pkg), $ver ) ) ) { - push @installed, $pkg; - } - else { - push @modules, $pkg, $ver; - } - } - - return @installed unless @modules; # nothing to do - return @installed if _check_lock(); # defer to the CPAN shell - - print "*** Installing dependencies...\n"; - - return unless _connected_to('cpan.org'); - - my %args = @config; - my %failed; - local *FAILED; - if ( $args{do_once} and open( FAILED, '.#autoinstall.failed' ) ) { - while (<FAILED>) { chomp; $failed{$_}++ } - close FAILED; - - my @newmod; - while ( my ( $k, $v ) = splice( @modules, 0, 2 ) ) { - push @newmod, ( $k => $v ) unless $failed{$k}; - } - @modules = @newmod; - } - - if ( _has_cpanplus() ) { - _install_cpanplus( \@modules, \@config ); - } else { - _install_cpan( \@modules, \@config ); - } - - print "*** $class installation finished.\n"; - - # see if we have successfully installed them - while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) { - if ( defined( _version_check( _load($pkg), $ver ) ) ) { - push @installed, $pkg; - } - elsif ( $args{do_once} and open( FAILED, '>> .#autoinstall.failed' ) ) { - print FAILED "$pkg\n"; - } - } - - close FAILED if $args{do_once}; - - return @installed; -} - -sub _install_cpanplus { - my @modules = @{ +shift }; - my @config = _cpanplus_config( @{ +shift } ); - my $installed = 0; - - require CPANPLUS::Backend; - my $cp = CPANPLUS::Backend->new; - my $conf = $cp->configure_object; - - return unless $conf->can('conf') # 0.05x+ with "sudo" support - or _can_write($conf->_get_build('base')); # 0.04x - - # if we're root, set UNINST=1 to avoid trouble unless user asked for it. - my $makeflags = $conf->get_conf('makeflags') || ''; - if ( UNIVERSAL::isa( $makeflags, 'HASH' ) ) { - # 0.03+ uses a hashref here - $makeflags->{UNINST} = 1 unless exists $makeflags->{UNINST}; - - } else { - # 0.02 and below uses a scalar - $makeflags = join( ' ', split( ' ', $makeflags ), 'UNINST=1' ) - if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } ); - - } - $conf->set_conf( makeflags => $makeflags ); - $conf->set_conf( prereqs => 1 ); - - - - while ( my ( $key, $val ) = splice( @config, 0, 2 ) ) { - $conf->set_conf( $key, $val ); - } - - my $modtree = $cp->module_tree; - while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) { - print "*** Installing $pkg...\n"; - - MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall; - - my $success; - my $obj = $modtree->{$pkg}; - - if ( $obj and defined( _version_check( $obj->{version}, $ver ) ) ) { - my $pathname = $pkg; - $pathname =~ s/::/\\W/; - - foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) { - delete $INC{$inc}; - } - - my $rv = $cp->install( modules => [ $obj->{module} ] ); - - if ( $rv and ( $rv->{ $obj->{module} } or $rv->{ok} ) ) { - print "*** $pkg successfully installed.\n"; - $success = 1; - } else { - print "*** $pkg installation cancelled.\n"; - $success = 0; - } - - $installed += $success; - } else { - print << "."; -*** Could not find a version $ver or above for $pkg; skipping. -. - } - - MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall; - } - - return $installed; -} - -sub _cpanplus_config { - my @config = (); - while ( @_ ) { - my ($key, $value) = (shift(), shift()); - if ( $key eq 'prerequisites_policy' ) { - if ( $value eq 'follow' ) { - $value = CPANPLUS::Internals::Constants::PREREQ_INSTALL(); - } elsif ( $value eq 'ask' ) { - $value = CPANPLUS::Internals::Constants::PREREQ_ASK(); - } elsif ( $value eq 'ignore' ) { - $value = CPANPLUS::Internals::Constants::PREREQ_IGNORE(); - } else { - die "*** Cannot convert option $key = '$value' to CPANPLUS version.\n"; - } - } else { - die "*** Cannot convert option $key to CPANPLUS version.\n"; - } - } - return @config; -} - -sub _install_cpan { - my @modules = @{ +shift }; - my @config = @{ +shift }; - my $installed = 0; - my %args; - - _load_cpan(); - require Config; - - if (CPAN->VERSION < 1.80) { - # no "sudo" support, probe for writableness - return unless _can_write( MM->catfile( $CPAN::Config->{cpan_home}, 'sources' ) ) - and _can_write( $Config::Config{sitelib} ); - } - - # if we're root, set UNINST=1 to avoid trouble unless user asked for it. - my $makeflags = $CPAN::Config->{make_install_arg} || ''; - $CPAN::Config->{make_install_arg} = - join( ' ', split( ' ', $makeflags ), 'UNINST=1' ) - if ( $makeflags !~ /\bUNINST\b/ and eval qq{ $> eq '0' } ); - - # don't show start-up info - $CPAN::Config->{inhibit_startup_message} = 1; - - # set additional options - while ( my ( $opt, $arg ) = splice( @config, 0, 2 ) ) { - ( $args{$opt} = $arg, next ) - if $opt =~ /^force$/; # pseudo-option - $CPAN::Config->{$opt} = $arg; - } - - local $CPAN::Config->{prerequisites_policy} = 'follow'; - - while ( my ( $pkg, $ver ) = splice( @modules, 0, 2 ) ) { - MY::preinstall( $pkg, $ver ) or next if defined &MY::preinstall; - - print "*** Installing $pkg...\n"; - - my $obj = CPAN::Shell->expand( Module => $pkg ); - my $success = 0; - - if ( $obj and defined( _version_check( $obj->cpan_version, $ver ) ) ) { - my $pathname = $pkg; - $pathname =~ s/::/\\W/; - - foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) { - delete $INC{$inc}; - } - - my $rv = $args{force} ? CPAN::Shell->force( install => $pkg ) - : CPAN::Shell->install($pkg); - $rv ||= eval { - $CPAN::META->instance( 'CPAN::Distribution', $obj->cpan_file, ) - ->{install} - if $CPAN::META; - }; - - if ( $rv eq 'YES' ) { - print "*** $pkg successfully installed.\n"; - $success = 1; - } - else { - print "*** $pkg installation failed.\n"; - $success = 0; - } - - $installed += $success; - } - else { - print << "."; -*** Could not find a version $ver or above for $pkg; skipping. -. - } - - MY::postinstall( $pkg, $ver, $success ) if defined &MY::postinstall; - } - - return $installed; -} - -sub _has_cpanplus { - return ( - $HasCPANPLUS = ( - $INC{'CPANPLUS/Config.pm'} - or _load('CPANPLUS::Shell::Default') - ) - ); -} - -# make guesses on whether we're under the CPAN installation directory -sub _under_cpan { - require Cwd; - require File::Spec; - - my $cwd = File::Spec->canonpath( Cwd::cwd() ); - my $cpan = File::Spec->canonpath( $CPAN::Config->{cpan_home} ); - - return ( index( $cwd, $cpan ) > -1 ); -} - -sub _update_to { - my $class = __PACKAGE__; - my $ver = shift; - - return - if defined( _version_check( _load($class), $ver ) ); # no need to upgrade - - if ( - _prompt( "==> A newer version of $class ($ver) is required. Install?", - 'y' ) =~ /^[Nn]/ - ) - { - die "*** Please install $class $ver manually.\n"; - } - - print << "."; -*** Trying to fetch it from CPAN... -. - - # install ourselves - _load($class) and return $class->import(@_) - if $class->install( [], $class, $ver ); - - print << '.'; exit 1; - -*** Cannot bootstrap myself. :-( Installation terminated. -. -} - -# check if we're connected to some host, using inet_aton -sub _connected_to { - my $site = shift; - - return ( - ( _load('Socket') and Socket::inet_aton($site) ) or _prompt( - qq( -*** Your host cannot resolve the domain name '$site', which - probably means the Internet connections are unavailable. -==> Should we try to install the required module(s) anyway?), 'n' - ) =~ /^[Yy]/ - ); -} - -# check if a directory is writable; may create it on demand -sub _can_write { - my $path = shift; - mkdir( $path, 0755 ) unless -e $path; - - return 1 if -w $path; - - print << "."; -*** You are not allowed to write to the directory '$path'; - the installation may fail due to insufficient permissions. -. - - if ( - eval '$>' and lc(`sudo -V`) =~ /version/ and _prompt( - qq( -==> Should we try to re-execute the autoinstall process with 'sudo'?), - ((-t STDIN) ? 'y' : 'n') - ) =~ /^[Yy]/ - ) - { - - # try to bootstrap ourselves from sudo - print << "."; -*** Trying to re-execute the autoinstall process with 'sudo'... -. - my $missing = join( ',', @Missing ); - my $config = join( ',', - UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} ) - if $Config; - - return - unless system( 'sudo', $^X, $0, "--config=$config", - "--installdeps=$missing" ); - - print << "."; -*** The 'sudo' command exited with error! Resuming... -. - } - - return _prompt( - qq( -==> Should we try to install the required module(s) anyway?), 'n' - ) =~ /^[Yy]/; -} - -# load a module and return the version it reports -sub _load { - my $mod = pop; # class/instance doesn't matter - my $file = $mod; - - $file =~ s|::|/|g; - $file .= '.pm'; - - local $@; - return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 ); -} - -# Load CPAN.pm and it's configuration -sub _load_cpan { - return if $CPAN::VERSION; - require CPAN; - if ( $CPAN::HandleConfig::VERSION ) { - # Newer versions of CPAN have a HandleConfig module - CPAN::HandleConfig->load; - } else { - # Older versions had the load method in Config directly - CPAN::Config->load; - } -} - -# compare two versions, either use Sort::Versions or plain comparison -sub _version_check { - my ( $cur, $min ) = @_; - return unless defined $cur; - - $cur =~ s/\s+$//; - - # check for version numbers that are not in decimal format - if ( ref($cur) or ref($min) or $cur =~ /v|\..*\./ or $min =~ /v|\..*\./ ) { - if ( ( $version::VERSION or defined( _load('version') )) and - version->can('new') - ) { - - # use version.pm if it is installed. - return ( - ( version->new($cur) >= version->new($min) ) ? $cur : undef ); - } - elsif ( $Sort::Versions::VERSION or defined( _load('Sort::Versions') ) ) - { - - # use Sort::Versions as the sorting algorithm for a.b.c versions - return ( ( Sort::Versions::versioncmp( $cur, $min ) != -1 ) - ? $cur - : undef ); - } - - warn "Cannot reliably compare non-decimal formatted versions.\n" - . "Please install version.pm or Sort::Versions.\n"; - } - - # plain comparison - local $^W = 0; # shuts off 'not numeric' bugs - return ( $cur >= $min ? $cur : undef ); -} - -# nothing; this usage is deprecated. -sub main::PREREQ_PM { return {}; } - -sub _make_args { - my %args = @_; - - $args{PREREQ_PM} = { %{ $args{PREREQ_PM} || {} }, @Existing, @Missing } - if $UnderCPAN or $TestOnly; - - if ( $args{EXE_FILES} and -e 'MANIFEST' ) { - require ExtUtils::Manifest; - my $manifest = ExtUtils::Manifest::maniread('MANIFEST'); - - $args{EXE_FILES} = - [ grep { exists $manifest->{$_} } @{ $args{EXE_FILES} } ]; - } - - $args{test}{TESTS} ||= 't/*.t'; - $args{test}{TESTS} = join( ' ', - grep { !exists( $DisabledTests{$_} ) } - map { glob($_) } split( /\s+/, $args{test}{TESTS} ) ); - - my $missing = join( ',', @Missing ); - my $config = - join( ',', UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config} ) - if $Config; - - $PostambleActions = ( - $missing - ? "\$(PERL) $0 --config=$config --installdeps=$missing" - : "\$(NOECHO) \$(NOOP)" - ); - - return %args; -} - -# a wrapper to ExtUtils::MakeMaker::WriteMakefile -sub Write { - require Carp; - Carp::croak "WriteMakefile: Need even number of args" if @_ % 2; - - if ($CheckOnly) { - print << "."; -*** Makefile not written in check-only mode. -. - return; - } - - my %args = _make_args(@_); - - no strict 'refs'; - - $PostambleUsed = 0; - local *MY::postamble = \&postamble unless defined &MY::postamble; - ExtUtils::MakeMaker::WriteMakefile(%args); - - print << "." unless $PostambleUsed; -*** WARNING: Makefile written with customized MY::postamble() without - including contents from Module::AutoInstall::postamble() -- - auto installation features disabled. Please contact the author. -. - - return 1; -} - -sub postamble { - $PostambleUsed = 1; - - return << "."; - -config :: installdeps -\t\$(NOECHO) \$(NOOP) - -checkdeps :: -\t\$(PERL) $0 --checkdeps - -installdeps :: -\t$PostambleActions - -. - -} - -1; - -__END__ - -#line 1003 diff --git a/inc/Module/CPANfile.pm b/inc/Module/CPANfile.pm new file mode 100644 index 0000000..5a6bfea --- /dev/null +++ b/inc/Module/CPANfile.pm @@ -0,0 +1,164 @@ +#line 1 +package Module::CPANfile; +use strict; +use warnings; +use Cwd; +use Carp (); +use Module::CPANfile::Environment (); +use Module::CPANfile::Result; + +our $VERSION = '0.9034'; + +sub new { + my($class, $file) = @_; + bless {}, $class; +} + +sub load { + my($proto, $file) = @_; + my $self = ref $proto ? $proto : $proto->new; + $self->{file} = $file || "cpanfile"; + $self->parse; + $self; +} + +sub save { + my($self, $path) = @_; + + open my $out, ">", $path or die "$path: $!"; + print {$out} $self->to_string; +} + +sub parse { + my $self = shift; + + my $file = Cwd::abs_path($self->{file}); + $self->{result} = Module::CPANfile::Environment::parse($file) or die $@; +} + +sub from_prereqs { + my($proto, $prereqs) = @_; + + my $self = $proto->new; + $self->{result} = Module::CPANfile::Result->from_prereqs($prereqs); + + $self; +} + +sub features { + my $self = shift; + map $self->feature($_), keys %{$self->{result}{features}}; +} + +sub feature { + my($self, $identifier) = @_; + + my $data = $self->{result}{features}{$identifier} + or Carp::croak("Unknown feature '$identifier'"); + + require CPAN::Meta::Feature; + CPAN::Meta::Feature->new($data->{identifier}, { + description => $data->{description}, + prereqs => $data->{spec}, + }); +} + +sub prereqs { shift->prereq } + +sub prereqs_with { + my($self, @feature_identifiers) = @_; + + my $prereqs = $self->prereqs; + my @others = map { $self->feature($_)->prereqs } @feature_identifiers; + + $prereqs->with_merged_prereqs(\@others); +} + +sub prereq { + my $self = shift; + require CPAN::Meta::Prereqs; + CPAN::Meta::Prereqs->new($self->prereq_specs); +} + +sub prereq_specs { + my $self = shift; + $self->{result}{spec}; +} + +sub merge_meta { + my($self, $file, $version) = @_; + + require CPAN::Meta; + + $version ||= $file =~ /\.yml$/ ? '1.4' : '2'; + + my $prereq = $self->prereqs; + + my $meta = CPAN::Meta->load_file($file); + my $prereqs_hash = $prereq->with_merged_prereqs($meta->effective_prereqs)->as_string_hash; + my $struct = { %{$meta->as_struct}, prereqs => $prereqs_hash }; + + CPAN::Meta->new($struct)->save($file, { version => $version }); +} + +sub _dump { + my $str = shift; + require Data::Dumper; + chomp(my $value = Data::Dumper->new([$str])->Terse(1)->Dump); + $value; +} + +sub to_string { + my($self, $include_empty) = @_; + + my $prereqs = $self->{result}{spec}; + + my $code = ''; + $code .= $self->_dump_prereqs($self->{result}{spec}, $include_empty); + + for my $feature (values %{$self->{result}{features}}) { + $code .= sprintf "feature %s, %s => sub {\n", _dump($feature->{identifier}), _dump($feature->{description}); + $code .= $self->_dump_prereqs($feature->{spec}, $include_empty, 4); + $code .= "}\n\n"; + } + + $code =~ s/\n+$/\n/s; + $code; +} + +sub _dump_prereqs { + my($self, $prereqs, $include_empty, $base_indent) = @_; + + my $code = ''; + for my $phase (qw(runtime configure build test develop)) { + my $indent = $phase eq 'runtime' ? '' : ' '; + $indent = (' ' x ($base_indent || 0)) . $indent; + + my($phase_code, $requirements); + $phase_code .= "on $phase => sub {\n" unless $phase eq 'runtime'; + + for my $type (qw(requires recommends suggests conflicts)) { + for my $mod (sort keys %{$prereqs->{$phase}{$type}}) { + my $ver = $prereqs->{$phase}{$type}{$mod}; + $phase_code .= $ver eq '0' + ? "${indent}$type '$mod';\n" + : "${indent}$type '$mod', '$ver';\n"; + $requirements++; + } + } + + $phase_code .= "\n" unless $requirements; + $phase_code .= "};\n" unless $phase eq 'runtime'; + + $code .= $phase_code . "\n" if $requirements or $include_empty; + } + + $code =~ s/\n+$/\n/s; + $code; +} + +1; + +__END__ + +#line 283 diff --git a/inc/Module/CPANfile/Environment.pm b/inc/Module/CPANfile/Environment.pm new file mode 100644 index 0000000..2c8931f --- /dev/null +++ b/inc/Module/CPANfile/Environment.pm @@ -0,0 +1,59 @@ +#line 1 +package Module::CPANfile::Environment; +use strict; +use Module::CPANfile::Result; +use Carp (); + +my @bindings = qw( + on requires recommends suggests conflicts + feature + osname + configure_requires build_requires test_requires author_requires +); + +my $file_id = 1; + +sub import { + my($class, $result_ref) = @_; + my $pkg = caller; + + $$result_ref = Module::CPANfile::Result->new; + for my $binding (@bindings) { + no strict 'refs'; + *{"$pkg\::$binding"} = sub { $$result_ref->$binding(@_) }; + } +} + +sub parse { + my $file = shift; + + my $code = do { + open my $fh, "<", $file or die "$file: $!"; + join '', <$fh>; + }; + + my($res, $err); + + { + local $@; + $res = eval sprintf <<EVAL, $file_id++; +package Module::CPANfile::Sandbox%d; +no warnings; +my \$_result; +BEGIN { import Module::CPANfile::Environment \\\$_result }; + +# line 1 "$file" +$code; + +\$_result; +EVAL + $err = $@; + } + + if ($err) { die "Parsing $file failed: $err" }; + + return $res; +} + +1; + diff --git a/inc/Module/CPANfile/Result.pm b/inc/Module/CPANfile/Result.pm new file mode 100644 index 0000000..f2a8ce4 --- /dev/null +++ b/inc/Module/CPANfile/Result.pm @@ -0,0 +1,94 @@ +#line 1 +package Module::CPANfile::Result; +use strict; + +sub from_prereqs { + my($class, $spec) = @_; + bless { + phase => 'runtime', + spec => $spec, + }, $class; +} + +sub new { + bless { + phase => 'runtime', # default phase + features => {}, + feature => undef, + spec => {}, + }, shift; +} + +sub on { + my($self, $phase, $code) = @_; + local $self->{phase} = $phase; + $code->() +} + +sub feature { + my($self, $identifier, $description, $code) = @_; + + # shortcut: feature identifier => sub { ... } + if (@_ == 3 && ref($description) eq 'CODE') { + $code = $description; + $description = $identifier; + } + + unless (ref $description eq '' && ref $code eq 'CODE') { + Carp::croak("Usage: feature 'identifier', 'Description' => sub { ... }"); + } + + local $self->{feature} = $self->{features}{$identifier} + = { identifier => $identifier, description => $description, spec => {} }; + $code->(); +} + +sub osname { die "TODO" } + +sub requires { + my($self, $module, $requirement) = @_; + ($self->{feature} ? $self->{feature}{spec} : $self->{spec}) + ->{$self->{phase}}{requires}{$module} = $requirement || 0; +} + +sub recommends { + my($self, $module, $requirement) = @_; + ($self->{feature} ? $self->{feature}{spec} : $self->{spec}) + ->{$self->{phase}}{recommends}{$module} = $requirement || 0; +} + +sub suggests { + my($self, $module, $requirement) = @_; + ($self->{feature} ? $self->{feature}{spec} : $self->{spec}) + ->{$self->{phase}}{suggests}{$module} = $requirement || 0; +} + +sub conflicts { + my($self, $module, $requirement) = @_; + ($self->{feature} ? $self->{feature}{spec} : $self->{spec}) + ->{$self->{phase}}{conflicts}{$module} = $requirement || 0; +} + +# Module::Install compatible shortcuts + +sub configure_requires { + my($self, @args) = @_; + $self->on(configure => sub { $self->requires(@args) }); +} + +sub build_requires { + my($self, @args) = @_; + $self->on(build => sub { $self->requires(@args) }); +} + +sub test_requires { + my($self, @args) = @_; + $self->on(test => sub { $self->requires(@args) }); +} + +sub author_requires { + my($self, @args) = @_; + $self->on(develop => sub { $self->requires(@args) }); +} + +1; diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm index 89a8653..99f677c 100644 --- a/inc/Module/Install.pm +++ b/inc/Module/Install.pm @@ -17,163 +17,249 @@ package Module::Install; # 3. The ./inc/ version of Module::Install loads # } -use 5.004; +use 5.006; use strict 'vars'; +use Cwd (); +use File::Find (); +use File::Path (); -use vars qw{$VERSION}; +use vars qw{$VERSION $MAIN}; BEGIN { - # All Module::Install core packages now require synchronised versions. - # This will be used to ensure we don't accidentally load old or - # different versions of modules. - # This is not enforced yet, but will be some time in the next few - # releases once we can make sure it won't clash with custom - # Module::Install extensions. - $VERSION = '0.68'; + # All Module::Install core packages now require synchronised versions. + # This will be used to ensure we don't accidentally load old or + # different versions of modules. + # This is not enforced yet, but will be some time in the next few + # releases once we can make sure it won't clash with custom + # Module::Install extensions. + $VERSION = '1.10'; + + # Storage for the pseudo-singleton + $MAIN = undef; + + *inc::Module::Install::VERSION = *VERSION; + @inc::Module::Install::ISA = __PACKAGE__; + } -# Whether or not inc::Module::Install is actually loaded, the -# $INC{inc/Module/Install.pm} is what will still get set as long as -# the caller loaded module this in the documented manner. -# If not set, the caller may NOT have loaded the bundled version, and thus -# they may not have a MI version that works with the Makefile.PL. This would -# result in false errors or unexpected behaviour. And we don't want that. -my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; -unless ( $INC{$file} ) { - die <<"END_DIE"; +sub import { + my $class = shift; + my $self = $class->new(@_); + my $who = $self->_caller; + + #------------------------------------------------------------- + # all of the following checks should be included in import(), + # to allow "eval 'require Module::Install; 1' to test + # installation of Module::Install. (RT #51267) + #------------------------------------------------------------- + + # Whether or not inc::Module::Install is actually loaded, the + # $INC{inc/Module/Install.pm} is what will still get set as long as + # the caller loaded module this in the documented manner. + # If not set, the caller may NOT have loaded the bundled version, and thus + # they may not have a MI version that works with the Makefile.PL. This would + # result in false errors or unexpected behaviour. And we don't want that. + my $file = join( '/', 'inc', split /::/, __PACKAGE__ ) . '.pm'; + unless ( $INC{$file} ) { die <<"END_DIE" } + Please invoke ${\__PACKAGE__} with: - use inc::${\__PACKAGE__}; + use inc::${\__PACKAGE__}; not: - use ${\__PACKAGE__}; + use ${\__PACKAGE__}; END_DIE -} -# If the script that is loading Module::Install is from the future, -# then make will detect this and cause it to re-run over and over -# again. This is bad. Rather than taking action to touch it (which -# is unreliable on some platforms and requires write permissions) -# for now we should catch this and refuse to run. -if ( -f $0 and (stat($0))[9] > time ) { - die << "END_DIE"; -Your installer $0 has a modification time in the future. + # This reportedly fixes a rare Win32 UTC file time issue, but + # as this is a non-cross-platform XS module not in the core, + # we shouldn't really depend on it. See RT #24194 for detail. + # (Also, this module only supports Perl 5.6 and above). + eval "use Win32::UTCFileTime" if $^O eq 'MSWin32' && $] >= 5.006; + + # If the script that is loading Module::Install is from the future, + # then make will detect this and cause it to re-run over and over + # again. This is bad. Rather than taking action to touch it (which + # is unreliable on some platforms and requires write permissions) + # for now we should catch this and refuse to run. + if ( -f $0 ) { + my $s = (stat($0))[9]; + + # If the modification time is only slightly in the future, + # sleep briefly to remove the problem. + my $a = $s - time; + if ( $a > 0 and $a < 5 ) { sleep 5 } + + # Too far in the future, throw an error. + my $t = time; + if ( $s > $t ) { die <<"END_DIE" } + +Your installer $0 has a modification time in the future ($s > $t). This is known to create infinite loops in make. Please correct this, then run $0 again. END_DIE -} + } -use Cwd (); -use File::Find (); -use File::Path (); -use FindBin; -*inc::Module::Install::VERSION = *VERSION; -@inc::Module::Install::ISA = __PACKAGE__; + # Build.PL was formerly supported, but no longer is due to excessive + # difficulty in implementing every single feature twice. + if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" } -sub autoload { - my $self = shift; - my $who = $self->_caller; - my $cwd = Cwd::cwd(); - my $sym = "${who}::AUTOLOAD"; - $sym->{$cwd} = sub { - my $pwd = Cwd::cwd(); - if ( my $code = $sym->{$pwd} ) { - # delegate back to parent dirs - goto &$code unless $cwd eq $pwd; - } - $$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym"; - unshift @_, ($self, $1); - goto &{$self->can('call')} unless uc($1) eq $1; - }; +Module::Install no longer supports Build.PL. + +It was impossible to maintain duel backends, and has been deprecated. + +Please remove all Build.PL files and only use the Makefile.PL installer. + +END_DIE + + #------------------------------------------------------------- + + # To save some more typing in Module::Install installers, every... + # use inc::Module::Install + # ...also acts as an implicit use strict. + $^H |= strict::bits(qw(refs subs vars)); + + #------------------------------------------------------------- + + unless ( -f $self->{file} ) { + foreach my $key (keys %INC) { + delete $INC{$key} if $key =~ /Module\/Install/; + } + + local $^W; + require "$self->{path}/$self->{dispatch}.pm"; + File::Path::mkpath("$self->{prefix}/$self->{author}"); + $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); + $self->{admin}->init; + @_ = ($class, _self => $self); + goto &{"$self->{name}::import"}; + } + + local $^W; + *{"${who}::AUTOLOAD"} = $self->autoload; + $self->preload; + + # Unregister loader and worker packages so subdirs can use them again + delete $INC{'inc/Module/Install.pm'}; + delete $INC{'Module/Install.pm'}; + + # Save to the singleton + $MAIN = $self; + + return 1; } -sub import { - my $class = shift; - my $self = $class->new(@_); - my $who = $self->_caller; - - unless ( -f $self->{file} ) { - require "$self->{path}/$self->{dispatch}.pm"; - File::Path::mkpath("$self->{prefix}/$self->{author}"); - $self->{admin} = "$self->{name}::$self->{dispatch}"->new( _top => $self ); - $self->{admin}->init; - @_ = ($class, _self => $self); - goto &{"$self->{name}::import"}; - } - - *{"${who}::AUTOLOAD"} = $self->autoload; - $self->preload; - - # Unregister loader and worker packages so subdirs can use them again - delete $INC{"$self->{file}"}; - delete $INC{"$self->{path}.pm"}; +sub autoload { + my $self = shift; + my $who = $self->_caller; + my $cwd = Cwd::getcwd(); + my $sym = "${who}::AUTOLOAD"; + $sym->{$cwd} = sub { + my $pwd = Cwd::getcwd(); + if ( my $code = $sym->{$pwd} ) { + # Delegate back to parent dirs + goto &$code unless $cwd eq $pwd; + } + unless ($$sym =~ s/([^:]+)$//) { + # XXX: it looks like we can't retrieve the missing function + # via $$sym (usually $main::AUTOLOAD) in this case. + # I'm still wondering if we should slurp Makefile.PL to + # get some context or not ... + my ($package, $file, $line) = caller; + die <<"EOT"; +Unknown function is found at $file line $line. +Execution of $file aborted due to runtime errors. + +If you're a contributor to a project, you may need to install +some Module::Install extensions from CPAN (or other repository). +If you're a user of a module, please contact the author. +EOT + } + my $method = $1; + if ( uc($method) eq $method ) { + # Do nothing + return; + } elsif ( $method =~ /^_/ and $self->can($method) ) { + # Dispatch to the root M:I class + return $self->$method(@_); + } + + # Dispatch to the appropriate plugin + unshift @_, ( $self, $1 ); + goto &{$self->can('call')}; + }; } sub preload { - my ($self) = @_; - - unless ( $self->{extensions} ) { - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ); - } - - my @exts = @{$self->{extensions}}; - unless ( @exts ) { - my $admin = $self->{admin}; - @exts = $admin->load_all_extensions; - } - - my %seen; - foreach my $obj ( @exts ) { - while (my ($method, $glob) = each %{ref($obj) . '::'}) { - next unless $obj->can($method); - next if $method =~ /^_/; - next if $method eq uc($method); - $seen{$method}++; - } - } - - my $who = $self->_caller; - foreach my $name ( sort keys %seen ) { - *{"${who}::$name"} = sub { - ${"${who}::AUTOLOAD"} = "${who}::$name"; - goto &{"${who}::AUTOLOAD"}; - }; - } + my $self = shift; + unless ( $self->{extensions} ) { + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ); + } + + my @exts = @{$self->{extensions}}; + unless ( @exts ) { + @exts = $self->{admin}->load_all_extensions; + } + + my %seen; + foreach my $obj ( @exts ) { + while (my ($method, $glob) = each %{ref($obj) . '::'}) { + next unless $obj->can($method); + next if $method =~ /^_/; + next if $method eq uc($method); + $seen{$method}++; + } + } + + my $who = $self->_caller; + foreach my $name ( sort keys %seen ) { + local $^W; + *{"${who}::$name"} = sub { + ${"${who}::AUTOLOAD"} = "${who}::$name"; + goto &{"${who}::AUTOLOAD"}; + }; + } } sub new { - my ($class, %args) = @_; - - # ignore the prefix on extension modules built from top level. - my $base_path = Cwd::abs_path($FindBin::Bin); - unless ( Cwd::abs_path(Cwd::cwd()) eq $base_path ) { - delete $args{prefix}; - } - - return $args{_self} if $args{_self}; - - $args{dispatch} ||= 'Admin'; - $args{prefix} ||= 'inc'; - $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); - $args{bundle} ||= 'inc/BUNDLES'; - $args{base} ||= $base_path; - $class =~ s/^\Q$args{prefix}\E:://; - $args{name} ||= $class; - $args{version} ||= $class->VERSION; - unless ( $args{path} ) { - $args{path} = $args{name}; - $args{path} =~ s!::!/!g; - } - $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; - - bless( \%args, $class ); + my ($class, %args) = @_; + + delete $INC{'FindBin.pm'}; + { + # to suppress the redefine warning + local $SIG{__WARN__} = sub {}; + require FindBin; + } + + # ignore the prefix on extension modules built from top level. + my $base_path = Cwd::abs_path($FindBin::Bin); + unless ( Cwd::abs_path(Cwd::getcwd()) eq $base_path ) { + delete $args{prefix}; + } + return $args{_self} if $args{_self}; + + $args{dispatch} ||= 'Admin'; + $args{prefix} ||= 'inc'; + $args{author} ||= ($^O eq 'VMS' ? '_author' : '.author'); + $args{bundle} ||= 'inc/BUNDLES'; + $args{base} ||= $base_path; + $class =~ s/^\Q$args{prefix}\E:://; + $args{name} ||= $class; + $args{version} ||= $class->VERSION; + unless ( $args{path} ) { + $args{path} = $args{name}; + $args{path} =~ s!::!/!g; + } + $args{file} ||= "$args{base}/$args{prefix}/$args{path}.pm"; + $args{wrote} = 0; + + bless( \%args, $class ); } sub call { @@ -184,98 +270,204 @@ sub call { } sub load { - my ($self, $method) = @_; + my ($self, $method) = @_; - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; + $self->load_extensions( + "$self->{prefix}/$self->{path}", $self + ) unless $self->{extensions}; - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } + foreach my $obj (@{$self->{extensions}}) { + return $obj if $obj->can($method); + } - my $admin = $self->{admin} or die <<"END_DIE"; + my $admin = $self->{admin} or die <<"END_DIE"; The '$method' method does not exist in the '$self->{prefix}' path! Please remove the '$self->{prefix}' directory and run $0 again to load it. END_DIE - my $obj = $admin->load($method, 1); - push @{$self->{extensions}}, $obj; + my $obj = $admin->load($method, 1); + push @{$self->{extensions}}, $obj; - $obj; + $obj; } sub load_extensions { - my ($self, $path, $top) = @_; - - unless ( grep { lc $_ eq lc $self->{prefix} } @INC ) { - unshift @INC, $self->{prefix}; - } - - foreach my $rv ( $self->find_extensions($path) ) { - my ($file, $pkg) = @{$rv}; - next if $self->{pathnames}{$pkg}; - - local $@; - my $new = eval { require $file; $pkg->can('new') }; - unless ( $new ) { - warn $@ if $@; - next; - } - $self->{pathnames}{$pkg} = delete $INC{$file}; - push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); - } - - $self->{extensions} ||= []; + my ($self, $path, $top) = @_; + + my $should_reload = 0; + unless ( grep { ! ref $_ and lc $_ eq lc $self->{prefix} } @INC ) { + unshift @INC, $self->{prefix}; + $should_reload = 1; + } + + foreach my $rv ( $self->find_extensions($path) ) { + my ($file, $pkg) = @{$rv}; + next if $self->{pathnames}{$pkg}; + + local $@; + my $new = eval { local $^W; require $file; $pkg->can('new') }; + unless ( $new ) { + warn $@ if $@; + next; + } + $self->{pathnames}{$pkg} = + $should_reload ? delete $INC{$file} : $INC{$file}; + push @{$self->{extensions}}, &{$new}($pkg, _top => $top ); + } + + $self->{extensions} ||= []; } sub find_extensions { - my ($self, $path) = @_; - - my @found; - File::Find::find( sub { - my $file = $File::Find::name; - return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; - my $subpath = $1; - return if lc($subpath) eq lc($self->{dispatch}); - - $file = "$self->{path}/$subpath.pm"; - my $pkg = "$self->{name}::$subpath"; - $pkg =~ s!/!::!g; - - # If we have a mixed-case package name, assume case has been preserved - # correctly. Otherwise, root through the file to locate the case-preserved - # version of the package name. - if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { - open PKGFILE, "<$subpath.pm" or die "find_extensions: Can't open $subpath.pm: $!"; - my $in_pod = 0; - while ( <PKGFILE> ) { - $in_pod = 1 if /^=\w/; - $in_pod = 0 if /^=cut/; - next if ($in_pod || /^=cut/); # skip pod text - next if /^\s*#/; # and comments - if ( m/^\s*package\s+($pkg)\s*;/i ) { - $pkg = $1; - last; - } - } - close PKGFILE; - } - - push @found, [ $file, $pkg ]; - }, $path ) if -d $path; - - @found; + my ($self, $path) = @_; + + my @found; + File::Find::find( sub { + my $file = $File::Find::name; + return unless $file =~ m!^\Q$path\E/(.+)\.pm\Z!is; + my $subpath = $1; + return if lc($subpath) eq lc($self->{dispatch}); + + $file = "$self->{path}/$subpath.pm"; + my $pkg = "$self->{name}::$subpath"; + $pkg =~ s!/!::!g; + + # If we have a mixed-case package name, assume case has been preserved + # correctly. Otherwise, root through the file to locate the case-preserved + # version of the package name. + if ( $subpath eq lc($subpath) || $subpath eq uc($subpath) ) { + my $content = Module::Install::_read($subpath . '.pm'); + my $in_pod = 0; + foreach ( split /\n/, $content ) { + $in_pod = 1 if /^=\w/; + $in_pod = 0 if /^=cut/; + next if ($in_pod || /^=cut/); # skip pod text + next if /^\s*#/; # and comments + if ( m/^\s*package\s+($pkg)\s*;/i ) { + $pkg = $1; + last; + } + } + } + + push @found, [ $file, $pkg ]; + }, $path ) if -d $path; + + @found; } + + + + +##################################################################### +# Common Utility Functions + sub _caller { - my $depth = 0; - my $call = caller($depth); - while ( $call eq __PACKAGE__ ) { - $depth++; - $call = caller($depth); - } - return $call; + my $depth = 0; + my $call = caller($depth); + while ( $call eq __PACKAGE__ ) { + $depth++; + $call = caller($depth); + } + return $call; +} + +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; +sub _read { + local *FH; + open( FH, '<', $_[0] ) or die "open($_[0]): $!"; + my $string = do { local $/; <FH> }; + close FH or die "close($_[0]): $!"; + return $string; +} +END_NEW +sub _read { + local *FH; + open( FH, "< $_[0]" ) or die "open($_[0]): $!"; + my $string = do { local $/; <FH> }; + close FH or die "close($_[0]): $!"; + return $string; +} +END_OLD + +sub _readperl { + my $string = Module::Install::_read($_[0]); + $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; + $string =~ s/(\n)\n*__(?:DATA|END)__\b.*\z/$1/s; + $string =~ s/\n\n=\w+.+?\n\n=cut\b.+?\n+/\n\n/sg; + return $string; +} + +sub _readpod { + my $string = Module::Install::_read($_[0]); + $string =~ s/(?:\015{1,2}\012|\015|\012)/\n/sg; + return $string if $_[0] =~ /\.pod\z/; + $string =~ s/(^|\n=cut\b.+?\n+)[^=\s].+?\n(\n=\w+|\z)/$1$2/sg; + $string =~ s/\n*=pod\b[^\n]*\n+/\n\n/sg; + $string =~ s/\n*=cut\b[^\n]*\n+/\n\n/sg; + $string =~ s/^\n+//s; + return $string; +} + +# Done in evals to avoid confusing Perl::MinimumVersion +eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@; +sub _write { + local *FH; + open( FH, '>', $_[0] ) or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; + } + close FH or die "close($_[0]): $!"; +} +END_NEW +sub _write { + local *FH; + open( FH, "> $_[0]" ) or die "open($_[0]): $!"; + foreach ( 1 .. $#_ ) { + print FH $_[$_] or die "print($_[0]): $!"; + } + close FH or die "close($_[0]): $!"; +} +END_OLD + +# _version is for processing module versions (eg, 1.03_05) not +# Perl versions (eg, 5.8.1). +sub _version { + my $s = shift || 0; + my $d =()= $s =~ /(\.)/g; + if ( $d >= 2 ) { + # Normalise multipart versions + $s =~ s/(\.)(\d{1,3})/sprintf("$1%03d",$2)/eg; + } + $s =~ s/^(\d+)\.?//; + my $l = $1 || 0; + my @v = map { + $_ . '0' x (3 - length $_) + } $s =~ /(\d{1,3})\D?/g; + $l = $l . '.' . join '', @v if @v; + return $l + 0; +} + +sub _cmp { + _version($_[1]) <=> _version($_[2]); +} + +# Cloned from Params::Util::_CLASS +sub _CLASS { + ( + defined $_[0] + and + ! ref $_[0] + and + $_[0] =~ m/^[^\W\d]\w*(?:::\w+)*\z/s + ) ? $_[0] : undef; } 1; + + +__END__ + +#line 485 diff --git a/inc/Module/Install/AuthorTests.pm b/inc/Module/Install/AuthorTests.pm new file mode 100644 index 0000000..c44931b --- /dev/null +++ b/inc/Module/Install/AuthorTests.pm @@ -0,0 +1,59 @@ +#line 1 +package Module::Install::AuthorTests; + +use 5.005; +use strict; +use Module::Install::Base; +use Carp (); + +#line 16 + +use vars qw{$VERSION $ISCORE @ISA}; +BEGIN { + $VERSION = '0.002'; + $ISCORE = 1; + @ISA = qw{Module::Install::Base}; +} + +#line 42 + +sub author_tests { + my ($self, @dirs) = @_; + _add_author_tests($self, \@dirs, 0); +} + +#line 56 + +sub recursive_author_tests { + my ($self, @dirs) = @_; + _add_author_tests($self, \@dirs, 1); +} + +sub _wanted { + my $href = shift; + sub { /\.t$/ and -f $_ and $href->{$File::Find::dir} = 1 } +} + +sub _add_author_tests { + my ($self, $dirs, $recurse) = @_; + return unless $Module::Install::AUTHOR; + + my @tests = $self->tests ? (split / /, $self->tests) : 't/*.t'; + + # XXX: pick a default, later -- rjbs, 2008-02-24 + my @dirs = @$dirs ? @$dirs : Carp::confess "no dirs given to author_tests"; + @dirs = grep { -d } @dirs; + + if ($recurse) { + require File::Find; + my %test_dir; + File::Find::find(_wanted(\%test_dir), @dirs); + $self->tests( join ' ', @tests, map { "$_/*.t" } sort keys %test_dir ); + } else { + $self->tests( join ' ', @tests, map { "$_/*.t" } sort @dirs ); + } +} + +#line 107 + +1; diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm deleted file mode 100644 index 3a490fb..0000000 --- a/inc/Module/Install/AutoInstall.pm +++ /dev/null @@ -1,61 +0,0 @@ -#line 1 -package Module::Install::AutoInstall; - -use strict; -use Module::Install::Base; - -use vars qw{$VERSION $ISCORE @ISA}; -BEGIN { - $VERSION = '0.68'; - $ISCORE = 1; - @ISA = qw{Module::Install::Base}; -} - -sub AutoInstall { $_[0] } - -sub run { - my $self = shift; - $self->auto_install_now(@_); -} - -sub write { - my $self = shift; - $self->auto_install(@_); -} - -sub auto_install { - my $self = shift; - return if $self->{done}++; - - # Flatten array of arrays into a single array - my @core = map @$_, map @$_, grep ref, - $self->build_requires, $self->requires; - - my @config = @_; - - # We'll need Module::AutoInstall - $self->include('Module::AutoInstall'); - require Module::AutoInstall; - - Module::AutoInstall->import( - (@config ? (-config => \@config) : ()), - (@core ? (-core => \@core) : ()), - $self->features, - ); - - $self->makemaker_args( Module::AutoInstall::_make_args() ); - - my $class = ref($self); - $self->postamble( - "# --- $class section:\n" . - Module::AutoInstall::postamble() - ); -} - -sub auto_install_now { - my $self = shift; - $self->auto_install(@_); - Module::AutoInstall::do_install(); -} - -1; diff --git a/inc/Module/Install/AutoLicense.pm b/inc/Module/Install/AutoLicense.pm new file mode 100644 index 0000000..97cc1fd --- /dev/null +++ b/inc/Module/Install/AutoLicense.pm @@ -0,0 +1,63 @@ +#line 1 +package Module::Install::AutoLicense; + +use strict; +use warnings; +use base qw(Module::Install::Base); +use vars qw($VERSION); + +$VERSION = '0.08'; + +my %licenses = ( + perl => 'Software::License::Perl_5', + apache => 'Software::License::Apache_2_0', + artistic => 'Software::License::Artistic_1_0', + artistic_2 => 'Software::License::Artistic_2_0', + lgpl2 => 'Software::License::LGPL_2_1', + lgpl3 => 'Software::License::LGPL_3_0', + bsd => 'Software::License::BSD', + gpl => 'Software::License::GPL_1', + gpl2 => 'Software::License::GPL_2', + gpl3 => 'Software::License::GPL_3', + mit => 'Software::License::MIT', + mozilla => 'Software::License::Mozilla_1_1', +); + +sub auto_license { + my $self = shift; + return unless $Module::Install::AUTHOR; + my %opts = @_; + $opts{lc $_} = delete $opts{$_} for keys %opts; + my $holder = $opts{holder} || _get_authors( $self ); + #my $holder = $opts{holder} || $self->author; + my $license = $self->license(); + unless ( defined $licenses{ $license } ) { + warn "No license definition for '$license', aborting\n"; + return 1; + } + my $class = $licenses{ $license }; + eval "require $class"; + my $sl = $class->new( { holder => $holder } ); + open LICENSE, '>LICENSE' or die "$!\n"; + print LICENSE $sl->fulltext; + close LICENSE; + $self->postamble(<<"END"); +distclean :: license_clean + +license_clean: +\t\$(RM_F) LICENSE +END + + return 1; +} + +sub _get_authors { + my $self = shift; + my $joined = join ', ', @{ $self->author() || [] }; + return $joined; +} + +'Licensed to auto'; +__END__ + +#line 125 diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm index 49dfde6..5e25388 100644 --- a/inc/Module/Install/Base.pm +++ b/inc/Module/Install/Base.pm @@ -1,7 +1,11 @@ #line 1 package Module::Install::Base; -$VERSION = '0.68'; +use strict 'vars'; +use vars qw{$VERSION}; +BEGIN { + $VERSION = '1.10'; +} # Suspend handler for "redefined" warnings BEGIN { @@ -9,52 +13,61 @@ BEGIN { $SIG{__WARN__} = sub { $w }; } -### This is the ONLY module that shouldn't have strict on -# use strict; - -#line 41 +#line 42 sub new { - my ($class, %args) = @_; - - foreach my $method ( qw(call load) ) { - *{"$class\::$method"} = sub { - shift()->_top->$method(@_); - } unless defined &{"$class\::$method"}; - } - - bless( \%args, $class ); + my $class = shift; + unless ( defined &{"${class}::call"} ) { + *{"${class}::call"} = sub { shift->_top->call(@_) }; + } + unless ( defined &{"${class}::load"} ) { + *{"${class}::load"} = sub { shift->_top->load(@_) }; + } + bless { @_ }, $class; } #line 61 sub AUTOLOAD { - my $self = shift; - local $@; - my $autoload = eval { $self->_top->autoload } or return; - goto &$autoload; + local $@; + my $func = eval { shift->_top->autoload } or return; + goto &$func; } -#line 76 +#line 75 -sub _top { $_[0]->{_top} } +sub _top { + $_[0]->{_top}; +} -#line 89 +#line 90 sub admin { - $_[0]->_top->{admin} or Module::Install::Base::FakeAdmin->new; + $_[0]->_top->{admin} + or + Module::Install::Base::FakeAdmin->new; } +#line 106 + sub is_admin { - $_[0]->admin->VERSION; + ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); } sub DESTROY {} package Module::Install::Base::FakeAdmin; -my $Fake; -sub new { $Fake ||= bless(\@_, $_[0]) } +use vars qw{$VERSION}; +BEGIN { + $VERSION = $Module::Install::Base::VERSION; +} + +my $fake; + +sub new { + $fake ||= bless(\@_, $_[0]); +} sub AUTOLOAD {} @@ -67,4 +80,4 @@ BEGIN { 1; -#line 138 +#line 159 diff --git a/inc/Module/Install/CPANfile.pm b/inc/Module/Install/CPANfile.pm new file mode 100644 index 0000000..0d89c1c --- /dev/null +++ b/inc/Module/Install/CPANfile.pm @@ -0,0 +1,66 @@ +#line 1 +package Module::Install::CPANfile; + +use strict; +use 5.008_001; +our $VERSION = '0.12'; + +use Module::CPANfile; +use base qw(Module::Install::Base); + +sub merge_meta_with_cpanfile { + my $self = shift; + + require CPAN::Meta; + + my $file = Module::CPANfile->load; + + if ($self->is_admin) { + # force generate META.json + CPAN::Meta->load_file('META.yml')->save('META.json'); + + print "Regenerate META.json and META.yml using cpanfile\n"; + $file->merge_meta('META.yml'); + $file->merge_meta('META.json'); + } + + for my $metafile (grep -e, qw(MYMETA.yml MYMETA.json)) { + print "Merging cpanfile prereqs to $metafile\n"; + $file->merge_meta($metafile); + } +} + +sub cpanfile { + my($self, %options) = @_; + + $self->dynamic_config(0) unless $options{dynamic}; + + my $write_all = \&::WriteAll; + + *main::WriteAll = sub { + $write_all->(@_); + $self->merge_meta_with_cpanfile; + }; + + $self->configure_requires("CPAN::Meta"); + + if ($self->is_admin) { + $self->admin->include_one_dist("Module::CPANfile"); + if (eval { require CPAN::Meta::Check; 1 }) { + my $prereqs = Module::CPANfile->load->prereqs; + my @err = CPAN::Meta::Check::verify_dependencies($prereqs, [qw/runtime build test develop/], 'requires'); + for (@err) { + warn "Warning: $_\n"; + } + } else { + warn "CPAN::Meta::Check is not installed. Skipping dependencies check for the author.\n"; + } + } +} + +1; +__END__ + +=encoding utf-8 + +#line 149 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm index ec66fdb..d49f8d6 100644 --- a/inc/Module/Install/Can.pm +++ b/inc/Module/Install/Can.pm @@ -2,18 +2,15 @@ package Module::Install::Can; use strict; -use Module::Install::Base; -use Config (); -### This adds a 5.005 Perl version dependency. -### This is a bug and will be fixed. -use File::Spec (); -use ExtUtils::MakeMaker (); - -use vars qw{$VERSION $ISCORE @ISA}; +use Config (); +use ExtUtils::MakeMaker (); +use Module::Install::Base (); + +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.68'; + $VERSION = '1.10'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } # check if we can load some module @@ -31,7 +28,7 @@ sub can_use { eval { require $mod; $pkg->VERSION($ver || 0); 1 }; } -# check if we can run some command +# Check if we can run some command sub can_run { my ($self, $cmd) = @_; @@ -39,14 +36,89 @@ sub can_run { return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - my $abs = File::Spec->catfile($dir, $_[1]); + next if $dir eq ''; + require File::Spec; + my $abs = File::Spec->catfile($dir, $cmd); return $abs if (-x $abs or $abs = MM->maybe_command($abs)); } return; } -# can we locate a (the) C compiler +# Can our C compiler environment build XS files +sub can_xs { + my $self = shift; + + # Ensure we have the CBuilder module + $self->configure_requires( 'ExtUtils::CBuilder' => 0.27 ); + + # Do we have the configure_requires checker? + local $@; + eval "require ExtUtils::CBuilder;"; + if ( $@ ) { + # They don't obey configure_requires, so it is + # someone old and delicate. Try to avoid hurting + # them by falling back to an older simpler test. + return $self->can_cc(); + } + + # Do we have a working C compiler + my $builder = ExtUtils::CBuilder->new( + quiet => 1, + ); + unless ( $builder->have_compiler ) { + # No working C compiler + return 0; + } + + # Write a C file representative of what XS becomes + require File::Temp; + my ( $FH, $tmpfile ) = File::Temp::tempfile( + "compilexs-XXXXX", + SUFFIX => '.c', + ); + binmode $FH; + print $FH <<'END_C'; +#include "EXTERN.h" +#include "perl.h" +#include "XSUB.h" + +int main(int argc, char **argv) { + return 0; +} + +int boot_sanexs() { + return 1; +} + +END_C + close $FH; + + # Can the C compiler access the same headers XS does + my @libs = (); + my $object = undef; + eval { + local $^W = 0; + $object = $builder->compile( + source => $tmpfile, + ); + @libs = $builder->link( + objects => $object, + module_name => 'sanexs', + ); + }; + my $result = $@ ? 0 : 1; + + # Clean up all the build files + foreach ( $tmpfile, $object, @libs ) { + next unless defined $_; + 1 while unlink; + } + + return $result; +} + +# Can we locate a (the) C compiler sub can_cc { my $self = shift; my @chunks = split(/ /, $Config::Config{cc}) or return; @@ -79,4 +151,4 @@ if ( $^O eq 'cygwin' ) { __END__ -#line 157 +#line 236 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm index e0dd6db..648b569 100644 --- a/inc/Module/Install/Fetch.pm +++ b/inc/Module/Install/Fetch.pm @@ -2,24 +2,24 @@ package Module::Install::Fetch; use strict; -use Module::Install::Base; +use Module::Install::Base (); -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.68'; + $VERSION = '1.10'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } sub get_file { my ($self, %args) = @_; - my ($scheme, $host, $path, $file) = + my ($scheme, $host, $path, $file) = $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; if ( $scheme eq 'http' and ! eval { require LWP::Simple; 1 } ) { $args{url} = $args{ftp_url} or (warn("LWP support unavailable!\n"), return); - ($scheme, $host, $path, $file) = + ($scheme, $host, $path, $file) = $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; } @@ -91,3 +91,7 @@ END_FTP } 1; + +__END__ + +#line 109 diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm deleted file mode 100644 index 001d0c6..0000000 --- a/inc/Module/Install/Include.pm +++ /dev/null @@ -1,34 +0,0 @@ -#line 1 -package Module::Install::Include; - -use strict; -use Module::Install::Base; - -use vars qw{$VERSION $ISCORE @ISA}; -BEGIN { - $VERSION = '0.68'; - $ISCORE = 1; - @ISA = qw{Module::Install::Base}; -} - -sub include { - shift()->admin->include(@_); -} - -sub include_deps { - shift()->admin->include_deps(@_); -} - -sub auto_include { - shift()->admin->auto_include(@_); -} - -sub auto_include_deps { - shift()->admin->auto_include_deps(@_); -} - -sub auto_include_dependent_dists { - shift()->admin->auto_include_dependent_dists(@_); -} - -1; diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm index 17bd8a7..170c3fa 100644 --- a/inc/Module/Install/Makefile.pm +++ b/inc/Module/Install/Makefile.pm @@ -2,14 +2,15 @@ package Module::Install::Makefile; use strict 'vars'; -use Module::Install::Base; -use ExtUtils::MakeMaker (); +use ExtUtils::MakeMaker (); +use Module::Install::Base (); +use Fcntl qw/:flock :seek/; -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.68'; + $VERSION = '1.10'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } sub Makefile { $_[0] } @@ -25,8 +26,8 @@ sub prompt { die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; } - # In automated testing, always use defaults - if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) { + # In automated testing or non-interactive session, always use defaults + if ( ($ENV{AUTOMATED_TESTING} or -! -t STDIN) and ! $ENV{PERL_MM_USE_DEFAULT} ) { local $ENV{PERL_MM_USE_DEFAULT} = 1; goto &ExtUtils::MakeMaker::prompt; } else { @@ -34,21 +35,112 @@ sub prompt { } } +# Store a cleaned up version of the MakeMaker version, +# since we need to behave differently in a variety of +# ways based on the MM version. +my $makemaker = eval $ExtUtils::MakeMaker::VERSION; + +# If we are passed a param, do a "newer than" comparison. +# Otherwise, just return the MakeMaker version. +sub makemaker { + ( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0 +} + +# Ripped from ExtUtils::MakeMaker 6.56, and slightly modified +# as we only need to know here whether the attribute is an array +# or a hash or something else (which may or may not be appendable). +my %makemaker_argtype = ( + C => 'ARRAY', + CONFIG => 'ARRAY', +# CONFIGURE => 'CODE', # ignore + DIR => 'ARRAY', + DL_FUNCS => 'HASH', + DL_VARS => 'ARRAY', + EXCLUDE_EXT => 'ARRAY', + EXE_FILES => 'ARRAY', + FUNCLIST => 'ARRAY', + H => 'ARRAY', + IMPORTS => 'HASH', + INCLUDE_EXT => 'ARRAY', + LIBS => 'ARRAY', # ignore '' + MAN1PODS => 'HASH', + MAN3PODS => 'HASH', + META_ADD => 'HASH', + META_MERGE => 'HASH', + PL_FILES => 'HASH', + PM => 'HASH', + PMLIBDIRS => 'ARRAY', + PMLIBPARENTDIRS => 'ARRAY', + PREREQ_PM => 'HASH', + CONFIGURE_REQUIRES => 'HASH', + SKIP => 'ARRAY', + TYPEMAPS => 'ARRAY', + XS => 'HASH', +# VERSION => ['version',''], # ignore +# _KEEP_AFTER_FLUSH => '', + + clean => 'HASH', + depend => 'HASH', + dist => 'HASH', + dynamic_lib=> 'HASH', + linkext => 'HASH', + macro => 'HASH', + postamble => 'HASH', + realclean => 'HASH', + test => 'HASH', + tool_autosplit => 'HASH', + + # special cases where you can use makemaker_append + CCFLAGS => 'APPENDABLE', + DEFINE => 'APPENDABLE', + INC => 'APPENDABLE', + LDDLFLAGS => 'APPENDABLE', + LDFROM => 'APPENDABLE', +); + sub makemaker_args { - my $self = shift; - my $args = ($self->{makemaker_args} ||= {}); - %$args = ( %$args, @_ ) if @_; - $args; + my ($self, %new_args) = @_; + my $args = ( $self->{makemaker_args} ||= {} ); + foreach my $key (keys %new_args) { + if ($makemaker_argtype{$key}) { + if ($makemaker_argtype{$key} eq 'ARRAY') { + $args->{$key} = [] unless defined $args->{$key}; + unless (ref $args->{$key} eq 'ARRAY') { + $args->{$key} = [$args->{$key}] + } + push @{$args->{$key}}, + ref $new_args{$key} eq 'ARRAY' + ? @{$new_args{$key}} + : $new_args{$key}; + } + elsif ($makemaker_argtype{$key} eq 'HASH') { + $args->{$key} = {} unless defined $args->{$key}; + foreach my $skey (keys %{ $new_args{$key} }) { + $args->{$key}{$skey} = $new_args{$key}{$skey}; + } + } + elsif ($makemaker_argtype{$key} eq 'APPENDABLE') { + $self->makemaker_append($key => $new_args{$key}); + } + } + else { + if (defined $args->{$key}) { + warn qq{MakeMaker attribute "$key" is overriden; use "makemaker_append" to append values\n}; + } + $args->{$key} = $new_args{$key}; + } + } + return $args; } -# For mm args that take multiple space-seperated args, +# For mm args that take multiple space-separated args, # append an argument to the current list. sub makemaker_append { - my $self = sShift; + my $self = shift; my $name = shift; my $args = $self->makemaker_args; - $args->{name} = defined $args->{$name} - ? join( ' ', $args->{name}, @_ ) + $args->{$name} = defined $args->{$name} + ? join( ' ', $args->{$name}, @_ ) : join( ' ', @_ ); } @@ -63,18 +155,18 @@ sub build_subdirs { sub clean_files { my $self = shift; my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join(' ', grep length, $clean->{FILES}, @_), + %$clean = ( + %$clean, + FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), ); } sub realclean_files { - my $self = shift; + my $self = shift; my $realclean = $self->makemaker_args->{realclean} ||= {}; - %$realclean = ( - %$realclean, - FILES => join(' ', grep length, $realclean->{FILES}, @_), + %$realclean = ( + %$realclean, + FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), ); } @@ -89,85 +181,173 @@ sub inc { $self->makemaker_args( INC => shift ); } -my %test_dir = (); - sub _wanted_t { - /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1; } sub tests_recursive { my $self = shift; - if ( $self->tests ) { - die "tests_recursive will not work if tests are already defined"; - } my $dir = shift || 't'; unless ( -d $dir ) { die "tests_recursive dir '$dir' does not exist"; } + my %tests = map { $_ => 1 } split / /, ($self->tests || ''); require File::Find; - %test_dir = (); - File::Find::find( \&_wanted_t, $dir ); - $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir ); + File::Find::find( + sub { /\.t$/ and -f $_ and $tests{"$File::Find::dir/*.t"} = 1 }, + $dir + ); + $self->tests( join ' ', sort keys %tests ); } sub write { my $self = shift; die "&Makefile->write() takes no arguments\n" if @_; + # Check the current Perl version + my $perl_version = $self->perl_version; + if ( $perl_version ) { + eval "use $perl_version; 1" + or die "ERROR: perl: Version $] is installed, " + . "but we need version >= $perl_version"; + } + + # Make sure we have a new enough MakeMaker + require ExtUtils::MakeMaker; + + if ( $perl_version and $self->_cmp($perl_version, '5.006') >= 0 ) { + # This previous attempted to inherit the version of + # ExtUtils::MakeMaker in use by the module author, but this + # was found to be untenable as some authors build releases + # using future dev versions of EU:MM that nobody else has. + # Instead, #toolchain suggests we use 6.59 which is the most + # stable version on CPAN at time of writing and is, to quote + # ribasushi, "not terminally fucked, > and tested enough". + # TODO: We will now need to maintain this over time to push + # the version up as new versions are released. + $self->build_requires( 'ExtUtils::MakeMaker' => 6.59 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.59 ); + } else { + # Allow legacy-compatibility with 5.005 by depending on the + # most recent EU:MM that supported 5.005. + $self->build_requires( 'ExtUtils::MakeMaker' => 6.36 ); + $self->configure_requires( 'ExtUtils::MakeMaker' => 6.36 ); + } + + # Generate the MakeMaker params my $args = $self->makemaker_args; $args->{DISTNAME} = $self->name; - $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args); - $args->{VERSION} = $self->version || $self->determine_VERSION($args); + $args->{NAME} = $self->module_name || $self->name; $args->{NAME} =~ s/-/::/g; + $args->{VERSION} = $self->version or die <<'EOT'; +ERROR: Can't determine distribution version. Please specify it +explicitly via 'version' in Makefile.PL, or set a valid $VERSION +in a module, and provide its file path via 'version_from' (or +'all_from' if you prefer) in Makefile.PL. +EOT + if ( $self->tests ) { - $args->{test} = { TESTS => $self->tests }; + my @tests = split ' ', $self->tests; + my %seen; + $args->{test} = { + TESTS => (join ' ', grep {!$seen{$_}++} @tests), + }; + } elsif ( $Module::Install::ExtraTests::use_extratests ) { + # Module::Install::ExtraTests doesn't set $self->tests and does its own tests via harness. + # So, just ignore our xt tests here. + } elsif ( -d 'xt' and ($Module::Install::AUTHOR or $ENV{RELEASE_TESTING}) ) { + $args->{test} = { + TESTS => join( ' ', map { "$_/*.t" } grep { -d $_ } qw{ t xt } ), + }; } - if ($] >= 5.005) { + if ( $] >= 5.005 ) { $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = $self->author; + $args->{AUTHOR} = join ', ', @{$self->author || []}; } - if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) { - $args->{NO_META} = 1; + if ( $self->makemaker(6.10) ) { + $args->{NO_META} = 1; + #$args->{NO_MYMETA} = 1; } - if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) { + if ( $self->makemaker(6.17) and $self->sign ) { $args->{SIGN} = 1; } unless ( $self->is_admin ) { delete $args->{SIGN}; } + if ( $self->makemaker(6.31) and $self->license ) { + $args->{LICENSE} = $self->license; + } - # merge both kinds of requires into prereq_pm my $prereq = ($args->{PREREQ_PM} ||= {}); %$prereq = ( %$prereq, + map { @$_ } # flatten [module => version] map { @$_ } + grep $_, + ($self->requires) + ); + + # Remove any reference to perl, PREREQ_PM doesn't support it + delete $args->{PREREQ_PM}->{perl}; + + # Merge both kinds of requires into BUILD_REQUIRES + my $build_prereq = ($args->{BUILD_REQUIRES} ||= {}); + %$build_prereq = ( %$build_prereq, + map { @$_ } # flatten [module => version] map { @$_ } grep $_, - ($self->build_requires, $self->requires) + ($self->configure_requires, $self->build_requires) ); - # merge both kinds of requires into prereq_pm - my $subdirs = ($args->{DIR} ||= []); + # Remove any reference to perl, BUILD_REQUIRES doesn't support it + delete $args->{BUILD_REQUIRES}->{perl}; + + # Delete bundled dists from prereq_pm, add it to Makefile DIR + my $subdirs = ($args->{DIR} || []); if ($self->bundles) { + my %processed; foreach my $bundle (@{ $self->bundles }) { - my ($file, $dir) = @$bundle; - push @$subdirs, $dir if -d $dir; - delete $prereq->{$file}; + my ($mod_name, $dist_dir) = @$bundle; + delete $prereq->{$mod_name}; + $dist_dir = File::Basename::basename($dist_dir); # dir for building this module + if (not exists $processed{$dist_dir}) { + if (-d $dist_dir) { + # List as sub-directory to be processed by make + push @$subdirs, $dist_dir; + } + # Else do nothing: the module is already present on the system + $processed{$dist_dir} = undef; + } } } + unless ( $self->makemaker('6.55_03') ) { + %$prereq = (%$prereq,%$build_prereq); + delete $args->{BUILD_REQUIRES}; + } + if ( my $perl_version = $self->perl_version ) { eval "use $perl_version; 1" or die "ERROR: perl: Version $] is installed, " . "but we need version >= $perl_version"; + + if ( $self->makemaker(6.48) ) { + $args->{MIN_PERL_VERSION} = $perl_version; + } } - $args->{INSTALLDIRS} = $self->installdirs; + if ($self->installdirs) { + warn qq{old INSTALLDIRS (probably set by makemaker_args) is overriden by installdirs\n} if $args->{INSTALLDIRS}; + $args->{INSTALLDIRS} = $self->installdirs; + } - my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args; + my %args = map { + ( $_ => $args->{$_} ) } grep {defined($args->{$_} ) + } keys %$args; my $user_preop = delete $args{dist}->{PREOP}; - if (my $preop = $self->admin->preop($user_preop)) { - $args{dist} = $preop; + if ( my $preop = $self->admin->preop($user_preop) ) { + foreach my $key ( keys %$preop ) { + $args{dist}->{$key} = $preop->{$key}; + } } my $mm = ExtUtils::MakeMaker::WriteMakefile(%args); @@ -180,7 +360,7 @@ sub fix_up_makefile { my $top_class = ref($self->_top) || ''; my $top_version = $self->_top->VERSION || ''; - my $preamble = $self->preamble + my $preamble = $self->preamble ? "# Preamble by $top_class $top_version\n" . $self->preamble : ''; @@ -188,9 +368,9 @@ sub fix_up_makefile { . ($self->postamble || ''); local *MAKEFILE; - open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + eval { flock MAKEFILE, LOCK_EX }; my $makefile = do { local $/; <MAKEFILE> }; - close MAKEFILE or die $!; $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; @@ -205,12 +385,13 @@ sub fix_up_makefile { #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m; # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well. - $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g; + $makefile =~ s/(\"?)-I\$\(PERL_LIB\)\1//g; # XXX - This is currently unused; not sure if it breaks other MM-users # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; + seek MAKEFILE, 0, SEEK_SET; + truncate MAKEFILE, 0; print MAKEFILE "$preamble$makefile$postamble" or die $!; close MAKEFILE or die $!; @@ -234,4 +415,4 @@ sub postamble { __END__ -#line 363 +#line 544 diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm index f77d68a..1f48315 100644 --- a/inc/Module/Install/Metadata.pm +++ b/inc/Module/Install/Metadata.pm @@ -2,335 +2,753 @@ package Module::Install::Metadata; use strict 'vars'; -use Module::Install::Base; +use Module::Install::Base (); -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.68'; + $VERSION = '1.10'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } +my @boolean_keys = qw{ + sign +}; + my @scalar_keys = qw{ - name module_name abstract author version license - distribution_type perl_version tests installdirs + name + module_name + abstract + version + distribution_type + tests + installdirs }; my @tuple_keys = qw{ - build_requires requires recommends bundles + configure_requires + build_requires + requires + recommends + bundles + resources +}; + +my @resource_keys = qw{ + homepage + bugtracker + repository +}; + +my @array_keys = qw{ + keywords + author }; -sub Meta { shift } -sub Meta_ScalarKeys { @scalar_keys } -sub Meta_TupleKeys { @tuple_keys } - -foreach my $key (@scalar_keys) { - *$key = sub { - my $self = shift; - return $self->{values}{$key} if defined wantarray and !@_; - $self->{values}{$key} = shift; - return $self; - }; -} - -foreach my $key (@tuple_keys) { - *$key = sub { - my $self = shift; - return $self->{values}{$key} unless @_; - - my @rv; - while (@_) { - my $module = shift or last; - my $version = shift || 0; - if ( $module eq 'perl' ) { - $version =~ s{^(\d+)\.(\d+)\.(\d+)} - {$1 + $2/1_000 + $3/1_000_000}e; - $self->perl_version($version); - next; - } - my $rv = [ $module, $version ]; - push @rv, $rv; - } - push @{ $self->{values}{$key} }, @rv; - @rv; - }; -} - -# configure_requires is currently a null-op -sub configure_requires { 1 } +*authors = \&author; + +sub Meta { shift } +sub Meta_BooleanKeys { @boolean_keys } +sub Meta_ScalarKeys { @scalar_keys } +sub Meta_TupleKeys { @tuple_keys } +sub Meta_ResourceKeys { @resource_keys } +sub Meta_ArrayKeys { @array_keys } + +foreach my $key ( @boolean_keys ) { + *$key = sub { + my $self = shift; + if ( defined wantarray and not @_ ) { + return $self->{values}->{$key}; + } + $self->{values}->{$key} = ( @_ ? $_[0] : 1 ); + return $self; + }; +} + +foreach my $key ( @scalar_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} if defined wantarray and !@_; + $self->{values}->{$key} = shift; + return $self; + }; +} + +foreach my $key ( @array_keys ) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} if defined wantarray and !@_; + $self->{values}->{$key} ||= []; + push @{$self->{values}->{$key}}, @_; + return $self; + }; +} + +foreach my $key ( @resource_keys ) { + *$key = sub { + my $self = shift; + unless ( @_ ) { + return () unless $self->{values}->{resources}; + return map { $_->[1] } + grep { $_->[0] eq $key } + @{ $self->{values}->{resources} }; + } + return $self->{values}->{resources}->{$key} unless @_; + my $uri = shift or die( + "Did not provide a value to $key()" + ); + $self->resources( $key => $uri ); + return 1; + }; +} + +foreach my $key ( grep { $_ ne "resources" } @tuple_keys) { + *$key = sub { + my $self = shift; + return $self->{values}->{$key} unless @_; + my @added; + while ( @_ ) { + my $module = shift or last; + my $version = shift || 0; + push @added, [ $module, $version ]; + } + push @{ $self->{values}->{$key} }, @added; + return map {@$_} @added; + }; +} + +# Resource handling +my %lc_resource = map { $_ => 1 } qw{ + homepage + license + bugtracker + repository +}; + +sub resources { + my $self = shift; + while ( @_ ) { + my $name = shift or last; + my $value = shift or next; + if ( $name eq lc $name and ! $lc_resource{$name} ) { + die("Unsupported reserved lowercase resource '$name'"); + } + $self->{values}->{resources} ||= []; + push @{ $self->{values}->{resources} }, [ $name, $value ]; + } + $self->{values}->{resources}; +} # Aliases for build_requires that will have alternative # meanings in some future version of META.yml. -sub test_requires { shift->build_requires(@_) } -sub install_requires { shift->build_requires(@_) } +sub test_requires { shift->build_requires(@_) } +sub install_requires { shift->build_requires(@_) } # Aliases for installdirs options -sub install_as_core { $_[0]->installdirs('perl') } -sub install_as_cpan { $_[0]->installdirs('site') } -sub install_as_site { $_[0]->installdirs('site') } -sub install_as_vendor { $_[0]->installdirs('vendor') } +sub install_as_core { $_[0]->installdirs('perl') } +sub install_as_cpan { $_[0]->installdirs('site') } +sub install_as_site { $_[0]->installdirs('site') } +sub install_as_vendor { $_[0]->installdirs('vendor') } -sub sign { - my $self = shift; - return $self->{'values'}{'sign'} if defined wantarray and ! @_; - $self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 ); - return $self; +sub dynamic_config { + my $self = shift; + my $value = @_ ? shift : 1; + if ( $self->{values}->{dynamic_config} ) { + # Once dynamic we never change to static, for safety + return 0; + } + $self->{values}->{dynamic_config} = $value ? 1 : 0; + return 1; } -sub dynamic_config { +# Convenience command +sub static_config { + shift->dynamic_config(0); +} + +sub perl_version { my $self = shift; - unless ( @_ ) { - warn "You MUST provide an explicit true/false value to dynamic_config, skipping\n"; - return $self; + return $self->{values}->{perl_version} unless @_; + my $version = shift or die( + "Did not provide a value to perl_version()" + ); + + # Normalize the version + $version = $self->_perl_version($version); + + # We don't support the really old versions + unless ( $version >= 5.005 ) { + die "Module::Install only supports 5.005 or newer (use ExtUtils::MakeMaker)\n"; } - $self->{'values'}{'dynamic_config'} = $_[0] ? 1 : 0; - return $self; + + $self->{values}->{perl_version} = $version; } sub all_from { - my ( $self, $file ) = @_; - - unless ( defined($file) ) { - my $name = $self->name - or die "all_from called with no args without setting name() first"; - $file = join('/', 'lib', split(/-/, $name)) . '.pm'; - $file =~ s{.*/}{} unless -e $file; - die "all_from: cannot find $file from $name" unless -e $file; - } + my ( $self, $file ) = @_; + + unless ( defined($file) ) { + my $name = $self->name or die( + "all_from called with no args without setting name() first" + ); + $file = join('/', 'lib', split(/-/, $name)) . '.pm'; + $file =~ s{.*/}{} unless -e $file; + unless ( -e $file ) { + die("all_from cannot find $file from $name"); + } + } + unless ( -f $file ) { + die("The path '$file' does not exist, or is not a file"); + } - $self->version_from($file) unless $self->version; - $self->perl_version_from($file) unless $self->perl_version; + $self->{values}{all_from} = $file; - # The remaining probes read from POD sections; if the file - # has an accompanying .pod, use that instead - my $pod = $file; - if ( $pod =~ s/\.pm$/.pod/i and -e $pod ) { - $file = $pod; - } + # Some methods pull from POD instead of code. + # If there is a matching .pod, use that instead + my $pod = $file; + $pod =~ s/\.pm$/.pod/i; + $pod = $file unless -e $pod; + + # Pull the different values + $self->name_from($file) unless $self->name; + $self->version_from($file) unless $self->version; + $self->perl_version_from($file) unless $self->perl_version; + $self->author_from($pod) unless @{$self->author || []}; + $self->license_from($pod) unless $self->license; + $self->abstract_from($pod) unless $self->abstract; - $self->author_from($file) unless $self->author; - $self->license_from($file) unless $self->license; - $self->abstract_from($file) unless $self->abstract; + return 1; } sub provides { - my $self = shift; - my $provides = ( $self->{values}{provides} ||= {} ); - %$provides = (%$provides, @_) if @_; - return $provides; + my $self = shift; + my $provides = ( $self->{values}->{provides} ||= {} ); + %$provides = (%$provides, @_) if @_; + return $provides; } sub auto_provides { - my $self = shift; - return $self unless $self->is_admin; - - unless (-e 'MANIFEST') { - warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; - return $self; - } - - # Avoid spurious warnings as we are not checking manifest here. - - local $SIG{__WARN__} = sub {1}; - require ExtUtils::Manifest; - local *ExtUtils::Manifest::manicheck = sub { return }; - - require Module::Build; - my $build = Module::Build->new( - dist_name => $self->name, - dist_version => $self->version, - license => $self->license, - ); - $self->provides(%{ $build->find_dist_packages || {} }); + my $self = shift; + return $self unless $self->is_admin; + unless (-e 'MANIFEST') { + warn "Cannot deduce auto_provides without a MANIFEST, skipping\n"; + return $self; + } + # Avoid spurious warnings as we are not checking manifest here. + local $SIG{__WARN__} = sub {1}; + require ExtUtils::Manifest; + local *ExtUtils::Manifest::manicheck = sub { return }; + + require Module::Build; + my $build = Module::Build->new( + dist_name => $self->name, + dist_version => $self->version, + license => $self->license, + ); + $self->provides( %{ $build->find_dist_packages || {} } ); } sub feature { - my $self = shift; - my $name = shift; - my $features = ( $self->{values}{features} ||= [] ); - - my $mods; - - if ( @_ == 1 and ref( $_[0] ) ) { - # The user used ->feature like ->features by passing in the second - # argument as a reference. Accomodate for that. - $mods = $_[0]; - } else { - $mods = \@_; - } + my $self = shift; + my $name = shift; + my $features = ( $self->{values}->{features} ||= [] ); + my $mods; + + if ( @_ == 1 and ref( $_[0] ) ) { + # The user used ->feature like ->features by passing in the second + # argument as a reference. Accomodate for that. + $mods = $_[0]; + } else { + $mods = \@_; + } - my $count = 0; - push @$features, ( - $name => [ - map { - ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ - : @$_ - : $_ - } @$mods - ] - ); + my $count = 0; + push @$features, ( + $name => [ + map { + ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ + } @$mods + ] + ); - return @$features; + return @$features; } sub features { - my $self = shift; - while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { - $self->feature( $name, @$mods ); - } - return $self->{values}->{features} - ? @{ $self->{values}->{features} } - : (); + my $self = shift; + while ( my ( $name, $mods ) = splice( @_, 0, 2 ) ) { + $self->feature( $name, @$mods ); + } + return $self->{values}->{features} + ? @{ $self->{values}->{features} } + : (); } sub no_index { - my $self = shift; - my $type = shift; - push @{ $self->{values}{no_index}{$type} }, @_ if $type; - return $self->{values}{no_index}; + my $self = shift; + my $type = shift; + push @{ $self->{values}->{no_index}->{$type} }, @_ if $type; + return $self->{values}->{no_index}; } sub read { - my $self = shift; - $self->include_deps( 'YAML', 0 ); - - require YAML; - my $data = YAML::LoadFile('META.yml'); - - # Call methods explicitly in case user has already set some values. - while ( my ( $key, $value ) = each %$data ) { - next unless $self->can($key); - if ( ref $value eq 'HASH' ) { - while ( my ( $module, $version ) = each %$value ) { - $self->can($key)->($self, $module => $version ); - } - } - else { - $self->can($key)->($self, $value); - } - } - return $self; + my $self = shift; + $self->include_deps( 'YAML::Tiny', 0 ); + + require YAML::Tiny; + my $data = YAML::Tiny::LoadFile('META.yml'); + + # Call methods explicitly in case user has already set some values. + while ( my ( $key, $value ) = each %$data ) { + next unless $self->can($key); + if ( ref $value eq 'HASH' ) { + while ( my ( $module, $version ) = each %$value ) { + $self->can($key)->($self, $module => $version ); + } + } else { + $self->can($key)->($self, $value); + } + } + return $self; } sub write { - my $self = shift; - return $self unless $self->is_admin; - $self->admin->write_meta; - return $self; + my $self = shift; + return $self unless $self->is_admin; + $self->admin->write_meta; + return $self; } sub version_from { - my ( $self, $file ) = @_; - require ExtUtils::MM_Unix; - $self->version( ExtUtils::MM_Unix->parse_version($file) ); + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->version( ExtUtils::MM_Unix->parse_version($file) ); + + # for version integrity check + $self->makemaker_args( VERSION_FROM => $file ); } sub abstract_from { - my ( $self, $file ) = @_; - require ExtUtils::MM_Unix; - $self->abstract( - bless( - { DISTNAME => $self->name }, - 'ExtUtils::MM_Unix' - )->parse_abstract($file) - ); + require ExtUtils::MM_Unix; + my ( $self, $file ) = @_; + $self->abstract( + bless( + { DISTNAME => $self->name }, + 'ExtUtils::MM_Unix' + )->parse_abstract($file) + ); } -sub _slurp { - my ( $self, $file ) = @_; +# Add both distribution and module name +sub name_from { + my ($self, $file) = @_; + if ( + Module::Install::_read($file) =~ m/ + ^ \s* + package \s* + ([\w:]+) + [\s|;]* + /ixms + ) { + my ($name, $module_name) = ($1, $1); + $name =~ s{::}{-}g; + $self->name($name); + unless ( $self->module_name ) { + $self->module_name($module_name); + } + } else { + die("Cannot determine name from $file\n"); + } +} - local *FH; - open FH, "< $file" or die "Cannot open $file.pod: $!"; - do { local $/; <FH> }; +sub _extract_perl_version { + if ( + $_[0] =~ m/ + ^\s* + (?:use|require) \s* + v? + ([\d_\.]+) + \s* ; + /ixms + ) { + my $perl_version = $1; + $perl_version =~ s{_}{}g; + return $perl_version; + } else { + return; + } } sub perl_version_from { - my ( $self, $file ) = @_; - - if ( - $self->_slurp($file) =~ m/ - ^ - use \s* - v? - ([\d_\.]+) - \s* ; - /ixms - ) - { - my $v = $1; - $v =~ s{_}{}g; - $self->perl_version($1); - } - else { - warn "Cannot determine perl version info from $file\n"; - return; - } + my $self = shift; + my $perl_version=_extract_perl_version(Module::Install::_read($_[0])); + if ($perl_version) { + $self->perl_version($perl_version); + } else { + warn "Cannot determine perl version info from $_[0]\n"; + return; + } } sub author_from { - my ( $self, $file ) = @_; - my $content = $self->_slurp($file); - if ($content =~ m/ - =head \d \s+ (?:authors?)\b \s* - ([^\n]*) - | - =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* - .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* - ([^\n]*) - /ixms) { - my $author = $1 || $2; - $author =~ s{E<lt>}{<}g; - $author =~ s{E<gt>}{>}g; - $self->author($author); - } - else { - warn "Cannot determine author info from $file\n"; - } + my $self = shift; + my $content = Module::Install::_read($_[0]); + if ($content =~ m/ + =head \d \s+ (?:authors?)\b \s* + ([^\n]*) + | + =head \d \s+ (?:licen[cs]e|licensing|copyright|legal)\b \s* + .*? copyright .*? \d\d\d[\d.]+ \s* (?:\bby\b)? \s* + ([^\n]*) + /ixms) { + my $author = $1 || $2; + + # XXX: ugly but should work anyway... + if (eval "require Pod::Escapes; 1") { + # Pod::Escapes has a mapping table. + # It's in core of perl >= 5.9.3, and should be installed + # as one of the Pod::Simple's prereqs, which is a prereq + # of Pod::Text 3.x (see also below). + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $Pod::Escapes::Name2character_number{$1} + ? chr($Pod::Escapes::Name2character_number{$1}) + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + elsif (eval "require Pod::Text; 1" && $Pod::Text::VERSION < 3) { + # Pod::Text < 3.0 has yet another mapping table, + # though the table name of 2.x and 1.x are different. + # (1.x is in core of Perl < 5.6, 2.x is in core of + # Perl < 5.9.3) + my $mapping = ($Pod::Text::VERSION < 2) + ? \%Pod::Text::HTML_Escapes + : \%Pod::Text::ESCAPES; + $author =~ s{ E<( (\d+) | ([A-Za-z]+) )> } + { + defined $2 + ? chr($2) + : defined $mapping->{$1} + ? $mapping->{$1} + : do { + warn "Unknown escape: E<$1>"; + "E<$1>"; + }; + }gex; + } + else { + $author =~ s{E<lt>}{<}g; + $author =~ s{E<gt>}{>}g; + } + $self->author($author); + } else { + warn "Cannot determine author info from $_[0]\n"; + } } -sub license_from { - my ( $self, $file ) = @_; - - if ( - $self->_slurp($file) =~ m/ - ( - =head \d \s+ - (?:licen[cs]e|licensing|copyright|legal)\b - .*? - ) - (=head\\d.*|=cut.*|) - \z - /ixms - ) - { - my $license_text = $1; - my @phrases = ( - 'under the same (?:terms|license) as perl itself' => 'perl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser public license' => 'gpl', 1, - 'BSD license' => 'bsd', 1, - 'Artistic license' => 'artistic', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s{\s+}{\\s+}g; - if ( $license_text =~ /\b$pattern\b/i ) { - if ( $osi and $license_text =~ /All rights reserved/i ) { - warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it."; +#Stolen from M::B +my %license_urls = ( + open_source => undef, + unrestricted => undef, + restrictive => undef, + unknown => undef, + +## from Software-License - should we be using S-L instead ? +# duplicates commeted out, see hack above ^^ +# open_source => 'http://www.gnu.org/licenses/agpl-3.0.txt', +# apache => 'http://www.apache.org/licenses/LICENSE-1.1', + apache => 'http://www.apache.org/licenses/LICENSE-2.0.txt', + artistic => 'http://www.perlfoundation.org/artistic_license_1_0', + artistic_2 => 'http://www.perlfoundation.org/artistic_license_2_0', + bsd => 'http://opensource.org/licenses/BSD-3-Clause', +# unrestricted => 'http://creativecommons.org/publicdomain/zero/1.0/', +# open_source => 'http://www.freebsd.org/copyright/freebsd-license.html', +# open_source => 'http://www.gnu.org/licenses/fdl-1.2.txt', +# open_source => 'http://www.gnu.org/licenses/fdl-1.3.txt', +# gpl => 'http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt', +# gpl => 'http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt', + gpl => 'http://www.gnu.org/licenses/gpl-3.0.txt', +# lgpl => 'http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt', + lgpl => 'http://www.gnu.org/licenses/lgpl-3.0.txt', + mit => 'http://www.opensource.org/licenses/mit-license.php', +# mozilla => 'http://www.mozilla.org/MPL/MPL-1.0.txt', +# mozilla => 'http://www.mozilla.org/MPL/MPL-1.1.txt', + mozilla => 'http://www.mozilla.org/MPL/2.0/index.txt', +# restrictive => '', +# open_source => 'http://www.openssl.org/source/license.html', + perl => 'http://dev.perl.org/licenses/', +# open_source => 'http://www.opensource.org/licenses/postgresql', +# open_source => 'http://trolltech.com/products/qt/licenses/licensing/qpl', +# unrestricted => 'http://h71000.www7.hp.com/doc/83final/BA554_90007/apcs02.html', +# open_source => 'http://www.openoffice.org/licenses/sissl_license.html', +# open_source => 'http://www.zlib.net/zlib_license.html', +); + +sub license { + my $self = shift; + return $self->{values}->{license} unless @_; + my $license = shift or die( + 'Did not provide a value to license()' + ); + $license = __extract_license($license) || lc $license; + $self->{values}->{license} = $license; + + # Automatically fill in license URLs + if ( $license_urls{$license} ) { + $self->resources( license => $license_urls{$license} ); + } + + return 1; +} + +sub _extract_license { + my $pod = shift; + my $matched; + return __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ L(?i:ICEN[CS]E|ICENSING)\b.*?) + (=head \d.*|=cut.*|)\z + /xms + ) || __extract_license( + ($matched) = $pod =~ m/ + (=head \d \s+ (?:C(?i:OPYRIGHTS?)|L(?i:EGAL))\b.*?) + (=head \d.*|=cut.*|)\z + /xms + ); +} + +sub __extract_license { + my $license_text = shift or return; + my @phrases = ( + '(?:under )?the same (?:terms|license) as (?:perl|the perl (?:\d )?programming language)' => 'perl', 1, + '(?:under )?the terms of (?:perl|the perl programming language) itself' => 'perl', 1, + + # the following are relied on by the test system even if they are wrong :( + '(?:Free)?BSD license' => 'bsd', 1, + 'Artistic license 2\.0' => 'artistic_2', 1, + 'LGPL' => 'lgpl', 1, + 'MIT' => 'mit', 1, + +## from Software-License + 'The GNU Affero General Public License, Version 3, November 2007' => 'open_source', 1, + 'The Apache Software License, Version 1.1' => 'apache', 1, + 'The Apache License, Version 2.0, January 2004' => 'apache', 1, + 'The Artistic License 1.0' => 'artistic', 1, + 'The Artistic License 2.0 (GPL Compatible)' => 'artistic_2', 1, + 'The (three-clause) BSD License' => 'bsd', 1, + 'CC0 License' => 'unrestricted', 1, + 'The (two-clause) FreeBSD License' => 'open_source', 1, + 'GNU Free Documentation License v1.2' => 'open_source', 1, + 'GNU Free Documentation License v1.3' => 'open_source', 1, + 'The GNU General Public License, Version 1, February 1989' => 'gpl', 1, + 'The GNU General Public License, Version 2, June 1991' => 'gpl', 1, + 'The GNU General Public License, Version 3, June 2007' => 'gpl', 1, + 'The GNU Lesser General Public License, Version 2.1, February 1999' => 'lgpl', 1, + 'The GNU Lesser General Public License, Version 3, June 2007' => 'lgpl', 1, + 'The MIT (X11) License' => 'mit', 1, + 'The Mozilla Public License 1.0' => 'mozilla', 1, + 'The Mozilla Public License 1.1' => 'mozilla', 1, + 'Mozilla Public License Version 2.0' => 'mozilla', 1, + '"No License" License' => 'restrictive', 1, + 'OpenSSL License' => 'open_source', 1, + 'the same terms as the perl 5 programming language system itself' => 'perl', 1, + 'The PostgreSQL License' => 'open_source', 1, + 'The Q Public License, Version 1.0' => 'open_source', 1, + 'Original SSLeay License' => 'unrestricted', 1, + 'Sun Internet Standards Source License (SISSL)' => 'open_source', 1, + 'The zlib License' => 'open_source', 1, + ); + + while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { + $pattern =~ s#\s+#\\s+#gs; + if ( $license_text =~ /\b$pattern\b/i ) { + return $license; } - $self->license($license); - return 1; - } - } + } + return ''; +} + +sub license_from { + my $self = shift; + if (my $license=_extract_license(Module::Install::_read($_[0]))) { + $self->license($license); + } else { + warn "Cannot determine license info from $_[0]\n"; + return 'unknown'; + } +} + +sub _extract_bugtracker { + my @links = $_[0] =~ m#L<( + https?\Q://rt.cpan.org/\E[^>]+| + https?\Q://github.com/\E[\w_]+/[\w_]+/issues| + https?\Q://code.google.com/p/\E[\w_\-]+/issues/list + )>#gx; + my %links; + @links{@links}=(); + @links=keys %links; + return @links; +} + +sub bugtracker_from { + my $self = shift; + my $content = Module::Install::_read($_[0]); + my @links = _extract_bugtracker($content); + unless ( @links ) { + warn "Cannot determine bugtracker info from $_[0]\n"; + return 0; + } + if ( @links > 1 ) { + warn "Found more than one bugtracker link in $_[0]\n"; + return 0; + } + + # Set the bugtracker + bugtracker( $links[0] ); + return 1; +} + +sub requires_from { + my $self = shift; + my $content = Module::Install::_readperl($_[0]); + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+(v?[\d\.]+)/mg; + while ( @requires ) { + my $module = shift @requires; + my $version = shift @requires; + $self->requires( $module => $version ); + } +} + +sub test_requires_from { + my $self = shift; + my $content = Module::Install::_readperl($_[0]); + my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg; + while ( @requires ) { + my $module = shift @requires; + my $version = shift @requires; + $self->test_requires( $module => $version ); + } +} + +# Convert triple-part versions (eg, 5.6.1 or 5.8.9) to +# numbers (eg, 5.006001 or 5.008009). +# Also, convert double-part versions (eg, 5.8) +sub _perl_version { + my $v = $_[-1]; + $v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e; + $v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e; + $v =~ s/(\.\d\d\d)000$/$1/; + $v =~ s/_.+$//; + if ( ref($v) ) { + # Numify + $v = $v + 0; + } + return $v; +} + +sub add_metadata { + my $self = shift; + my %hash = @_; + for my $key (keys %hash) { + warn "add_metadata: $key is not prefixed with 'x_'.\n" . + "Use appopriate function to add non-private metadata.\n" unless $key =~ /^x_/; + $self->{values}->{$key} = $hash{$key}; } +} + + +###################################################################### +# MYMETA Support + +sub WriteMyMeta { + die "WriteMyMeta has been deprecated"; +} + +sub write_mymeta_yaml { + my $self = shift; + + # We need YAML::Tiny to write the MYMETA.yml file + unless ( eval { require YAML::Tiny; 1; } ) { + return 1; + } + + # Generate the data + my $meta = $self->_write_mymeta_data or return 1; + + # Save as the MYMETA.yml file + print "Writing MYMETA.yml\n"; + YAML::Tiny::DumpFile('MYMETA.yml', $meta); +} + +sub write_mymeta_json { + my $self = shift; + + # We need JSON to write the MYMETA.json file + unless ( eval { require JSON; 1; } ) { + return 1; + } + + # Generate the data + my $meta = $self->_write_mymeta_data or return 1; - warn "Cannot determine license info from $file\n"; - return 'unknown'; + # Save as the MYMETA.yml file + print "Writing MYMETA.json\n"; + Module::Install::_write( + 'MYMETA.json', + JSON->new->pretty(1)->canonical->encode($meta), + ); +} + +sub _write_mymeta_data { + my $self = shift; + + # If there's no existing META.yml there is nothing we can do + return undef unless -f 'META.yml'; + + # We need Parse::CPAN::Meta to load the file + unless ( eval { require Parse::CPAN::Meta; 1; } ) { + return undef; + } + + # Merge the perl version into the dependencies + my $val = $self->Meta->{values}; + my $perl = delete $val->{perl_version}; + if ( $perl ) { + $val->{requires} ||= []; + my $requires = $val->{requires}; + + # Canonize to three-dot version after Perl 5.6 + if ( $perl >= 5.006 ) { + $perl =~ s{^(\d+)\.(\d\d\d)(\d*)}{join('.', $1, int($2||0), int($3||0))}e + } + unshift @$requires, [ perl => $perl ]; + } + + # Load the advisory META.yml file + my @yaml = Parse::CPAN::Meta::LoadFile('META.yml'); + my $meta = $yaml[0]; + + # Overwrite the non-configure dependency hashes + delete $meta->{requires}; + delete $meta->{build_requires}; + delete $meta->{recommends}; + if ( exists $val->{requires} ) { + $meta->{requires} = { map { @$_ } @{ $val->{requires} } }; + } + if ( exists $val->{build_requires} ) { + $meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } }; + } + + return $meta; } 1; + +__END__ + +#line 766 diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm index 4f808c7..0b7cd38 100644 --- a/inc/Module/Install/Win32.pm +++ b/inc/Module/Install/Win32.pm @@ -2,13 +2,13 @@ package Module::Install::Win32; use strict; -use Module::Install::Base; +use Module::Install::Base (); -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.68'; + $VERSION = '1.10'; + @ISA = 'Module::Install::Base'; $ISCORE = 1; - @ISA = qw{Module::Install::Base}; } # determine if the user needs nmake, and download it if needed @@ -16,7 +16,7 @@ sub check_nmake { my $self = shift; $self->load('can_run'); $self->load('get_file'); - + require Config; return unless ( $^O eq 'MSWin32' and @@ -38,8 +38,7 @@ sub check_nmake { remove => 1, ); - if (!$rv) { - die <<'END_MESSAGE'; + die <<'END_MESSAGE' unless $rv; ------------------------------------------------------------------------------- @@ -59,7 +58,11 @@ You may then resume the installation process described in README. ------------------------------------------------------------------------------- END_MESSAGE - } + } 1; + +__END__ + +#line 80 diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm index 078797c..53af6d2 100644 --- a/inc/Module/Install/WriteAll.pm +++ b/inc/Module/Install/WriteAll.pm @@ -2,42 +2,66 @@ package Module::Install::WriteAll; use strict; -use Module::Install::Base; +use Module::Install::Base (); -use vars qw{$VERSION $ISCORE @ISA}; +use vars qw{$VERSION @ISA $ISCORE}; BEGIN { - $VERSION = '0.68'; - $ISCORE = 1; + $VERSION = '1.10'; @ISA = qw{Module::Install::Base}; + $ISCORE = 1; } sub WriteAll { - my $self = shift; - my %args = ( - meta => 1, - sign => 0, - inline => 0, - check_nmake => 1, - @_ - ); - - $self->sign(1) if $args{sign}; - $self->Meta->write if $args{meta}; - $self->admin->WriteAll(%args) if $self->is_admin; - - if ( $0 =~ /Build.PL$/i ) { - $self->Build->write; - } else { - $self->check_nmake if $args{check_nmake}; - unless ( $self->makemaker_args->{'PL_FILES'} ) { - $self->makemaker_args( PL_FILES => {} ); - } - if ($args{inline}) { - $self->Inline->write; - } else { - $self->Makefile->write; - } - } + my $self = shift; + my %args = ( + meta => 1, + sign => 0, + inline => 0, + check_nmake => 1, + @_, + ); + + $self->sign(1) if $args{sign}; + $self->admin->WriteAll(%args) if $self->is_admin; + + $self->check_nmake if $args{check_nmake}; + unless ( $self->makemaker_args->{PL_FILES} ) { + # XXX: This still may be a bit over-defensive... + unless ($self->makemaker(6.25)) { + $self->makemaker_args( PL_FILES => {} ) if -f 'Build.PL'; + } + } + + # Until ExtUtils::MakeMaker support MYMETA.yml, make sure + # we clean it up properly ourself. + $self->realclean_files('MYMETA.yml'); + + if ( $args{inline} ) { + $self->Inline->write; + } else { + $self->Makefile->write; + } + + # The Makefile write process adds a couple of dependencies, + # so write the META.yml files after the Makefile. + if ( $args{meta} ) { + $self->Meta->write; + } + + # Experimental support for MYMETA + if ( $ENV{X_MYMETA} ) { + if ( $ENV{X_MYMETA} eq 'JSON' ) { + $self->Meta->write_mymeta_json; + } else { + $self->Meta->write_mymeta_yaml; + } + } + + return 1; } 1; + +__END__ + +#line 79 diff --git a/lib/HTML/TableParser.pm b/lib/HTML/TableParser.pm index 1348395..3b32cb6 100644 --- a/lib/HTML/TableParser.pm +++ b/lib/HTML/TableParser.pm @@ -21,6 +21,7 @@ package HTML::TableParser; +require 5.8.1; use strict; use warnings; @@ -34,7 +35,7 @@ use HTML::TableParser::Table; our @ISA = qw(HTML::Parser); -our $VERSION = '0.38'; +our $VERSION = '0.40'; # Preloaded methods go here. @@ -628,7 +629,7 @@ i.e., $p = HTML::TableParser->new( \@reqs, { Chomp => 1 } ); -will set B<Chomp> on for all of the table requests, unless overriden +will set B<Chomp> on for all of the table requests, unless overridden by them. The data cleanup operations are documented above; C<MultiMatch> is documented in L</Table Requests>. diff --git a/t/contents.t b/t/contents.t index f9bb6b4..0eba6f3 100644 --- a/t/contents.t +++ b/t/contents.t @@ -28,7 +28,7 @@ sub start print STDERR "start: $tbl_id\n" if $verbose; die( "whoops! we're already in the middle of a table!\n" ) - if defined @parse_data; + if @parse_data; @parse_data = (); } diff --git a/t/pod-coverage.t b/t/pod-coverage.t deleted file mode 100644 index 4884ab1..0000000 --- a/t/pod-coverage.t +++ /dev/null @@ -1,13 +0,0 @@ -#!perl -T - -use Test::More; -eval "use Test::Pod::Coverage 1.04"; -if ( $@ ) -{ - plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage"; -} -else -{ - plan tests => 1; -} -pod_coverage_ok('HTML::TableParser'); diff --git a/xt/00-compile.t b/xt/00-compile.t new file mode 100644 index 0000000..65c8a88 --- /dev/null +++ b/xt/00-compile.t @@ -0,0 +1,10 @@ +#!perl + +use strict; +use warnings; +use Test::Compile; + +my $test = Test::Compile->new(); + +$test->all_files_ok(); +$test->done_testing(); diff --git a/xt/changes.t b/xt/changes.t new file mode 100644 index 0000000..e21f1e3 --- /dev/null +++ b/xt/changes.t @@ -0,0 +1,3 @@ +use Test::More; +use Test::CPAN::Changes; +changes_ok(); diff --git a/xt/nobreakpoints.t b/xt/nobreakpoints.t new file mode 100644 index 0000000..b6dc2e8 --- /dev/null +++ b/xt/nobreakpoints.t @@ -0,0 +1,7 @@ + +use Test::More; +eval "use Test::NoBreakpoints 0.10"; +plan skip_all => "Test::NoBreakpoints 0.10 required for testing" if $@; +all_files_no_breakpoints_ok(); + +done_testing; diff --git a/t/perlcritic.t b/xt/perlcritic.t similarity index 100% rename from t/perlcritic.t rename to xt/perlcritic.t diff --git a/xt/pod-coverage.t b/xt/pod-coverage.t new file mode 100644 index 0000000..62fdb7e --- /dev/null +++ b/xt/pod-coverage.t @@ -0,0 +1,7 @@ +#!perl -T + +use Test::More; +eval "use Test::Pod::Coverage 1.04"; +plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage" if $@; + +all_pod_coverage_ok(); diff --git a/t/pod.t b/xt/pod.t similarity index 100% rename from t/pod.t rename to xt/pod.t -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhtml-tableparser-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
