diff options
| author | intrigeri <intrigeri@boum.org> | 2014-08-26 21:29:41 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2014-08-26 21:29:41 +0000 |
| commit | 7f56a02d591d326c10542e935e8535115a55e096 (patch) | |
| tree | 855fd25c3c38bde040c79a8178f295a4e0fa1985 | |
| parent | 3438bf8628021188e734efb2e38b8e1dd7021a63 (diff) | |
| parent | d17f0f4a9daedfbfac037b06b95f226595974c3f (diff) | |
Imported Upstream version 0.015
41 files changed, 877 insertions, 5049 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING index d0e593b..ba115b4 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -27,7 +27,7 @@ DESCRIPTION The file META.yml should contain a link to the source repository. If not, then try <https://github.com/tobyink> or submit a bug report. (As far as I'm concerned the lack of a link is a bug.) Many of my - distributions are also mirrored at <http://bitbucket.org/tobyink>. + distributions are also mirrored at <https://bitbucket.org/tobyink>. To submit the patch, do a pull request on GitHub or Bitbucket, or attach a diff file to a bug report. Unless otherwise stated, I'll @@ -67,10 +67,17 @@ AUTHOR Toby Inkster <tobyink@cpan.org>. COPYRIGHT AND LICENCE - Copyright (c) 2012-2013 by Toby Inkster. + Copyright (c) 2012-2014 by Toby Inkster. - CONTRIBUTING.pod is licensed under the Creative Commons - Attribution-ShareAlike 2.0 UK: England & Wales License. To view a copy - of this license, visit + CONTRIBUTING is available under three different licences permitting its + redistribution: the CC-BY-SA_UK-2.0 licence, plus the same licences as + Perl itself, which is distributed under the GNU General Public Licence + version 1, and the Artistic Licence. + + This file is licensed under the Creative Commons Attribution-ShareAlike + 2.0 UK: England & Wales License. To view a copy of this license, visit <http://creativecommons.org/licenses/by-sa/2.0/uk/>. + This file is free software; you can redistribute it and/or modify it + under the same terms as the Perl 5 programming language system itself. + @@ -1,81 +1,63 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: MooX-late -Upstream-Contact: Toby Inkster <tobyink@cpan.org> +Upstream-Contact: and Toby Inkster (TOBYINK) <tobyink@cpan.org> Source: https://metacpan.org/release/MooX-late Files: CONTRIBUTING - CREDITS - Changes + INSTALL LICENSE - MANIFEST.SKIP - META.ttl - Makefile.PL - README + TODO examples/simple.pl - meta/changes.pret - meta/doap.pret - meta/makefile.pret - meta/people.pret Copyright: Unknown License: Unknown -Files: lib/MooX/late.pm - t/01basic.t +Files: t/01basic.t t/02inflation.t t/03invalid_tc.t t/04arrayofattrs.t Copyright: This software is copyright (c) 2012-2013 by Toby Inkster. License: GPL-1.0+ or Artistic-1.0 -Files: inc/Module/Install.pm - inc/Module/Install/Include.pm - inc/Module/Install/Metadata.pm -Copyright: Copyright 2002 - 2012 Brian Ingerson, Audrey Tang and Adam Kennedy. -License: GPL-1.0+ or Artistic-1.0 - Files: t/05haveimissedanytypes.t t/06handlesvia.t t/07coerce1.t + t/08doesrole.t Copyright: This software is copyright (c) 2013 by Toby Inkster. License: GPL-1.0+ or Artistic-1.0 -Files: inc/Module/Install/TrustMetaYml.pm - inc/Module/Package/Dist/RDF.pm -Copyright: This software is copyright (c) 2011-2012 by Toby Inkster. -License: GPL-1.0+ or Artistic-1.0 - -Files: inc/YAML/Tiny.pm -Copyright: Copyright 2006 - 2012 Adam Kennedy. -License: GPL-1.0+ or Artistic-1.0 - -Files: inc/Module/Install/Base.pm -Copyright: Copyright 2003, 2004 by Audrey Tang <autrijus@autrijus.org>. +Files: Changes + META.json + META.yml + doap.ttl +Copyright: Copyright 2014 Toby Inkster. License: GPL-1.0+ or Artistic-1.0 Files: COPYRIGHT + CREDITS + SIGNATURE Copyright: None License: public-domain -Comment: This file! Automatically generated. -Files: inc/Module/Install/Makefile.pm -Copyright: Copyright 2002, 2003, 2004 Audrey Tang and Brian Ingerson. +Files: Makefile.PL + dist.ini +Copyright: Copyright 2013 Toby Inkster. License: GPL-1.0+ or Artistic-1.0 -Files: inc/Module/Install/Package.pm -Copyright: Copyright (c) 2011. Ingy doet Net. +Files: README + lib/MooX/late.pm +Copyright: This software is copyright (c) 2012-2014 by Toby Inkster. License: GPL-1.0+ or Artistic-1.0 License: Artistic-1.0 - This software is Copyright (c) 2013 by the copyright holder(s). + This software is Copyright (c) 2014 by the copyright holder(s). This is free software, licensed under: The Artistic License 1.0 License: GPL-1.0 - This software is Copyright (c) 2013 by the copyright holder(s). + This software is Copyright (c) 2014 by the copyright holder(s). This is free software, licensed under: The GNU General Public License, Version 1, February 1989 - @@ -1,6 +1,6 @@ Maintainer: -- Toby Inkster (cpan:TOBYINK) <mailto:tobyink@cpan.org> +- Toby Inkster (TOBYINK) <tobyink@cpan.org> Thanks: -- SHLOMIF (cpan:SHLOMIF) <mailto:shlomif@cpan.org> +- SHLOMIF <shlomif@cpan.org> @@ -4,80 +4,107 @@ MooX-late Created: 2012-11-30 Home page: <https://metacpan.org/release/MooX-late> Bug tracker: <http://rt.cpan.org/Dist/Display.html?Queue=MooX-late> -Maintainer: Toby Inkster <mailto:tobyink@cpan.org> +Maintainer: Toby Inkster (TOBYINK) <tobyink@cpan.org> -0.014 2013-07-16 +0.015 2013-08-18 - - (Addition) Support `coerce => 1` for Type::Tiny type constraints and - those providing a similar API. + [ Documentation ] + - Make the list of stuff this module does more concise. -0.013 2013-07-16 + [ Test Suite ] + - Improve test cases for class type constraints. - - (Addition) Support Moose attribute traits using MooX::HandlesVia. - - (Removal) Retire support for non-reference attribute defaults because - Moo now does this natively. - - (Update) Use Type::Utils::dwim_type to translate strings to type + [ Packaging ] + - Depend on Moo 1.006000. + - Depend on Type::Utils 1.000001. + + [ Other ] + - Removed: Drop support for `coerce => 1` because Moo 1.006000 supports + this natively now. + +0.014 2013-07-16 + + - Added: Support `coerce => 1` for Type::Tiny type constraints and those + providing a similar API. + +0.013 2013-07-16 + + - Added: Support Moose attribute traits using MooX::HandlesVia. + - Removed: Retire support for non-reference attribute defaults because Moo + now does this natively. + - Updated: Use Type::Utils::dwim_type to translate strings to type constraint expressions. -0.012 2013-06-28 +0.012 2013-06-28 - - (Update) Use Type::Registry/Type::Parser to translate strings to type + - Updated: Use Type::Registry/Type::Parser to translate strings to type constraint expressions. -0.011 2013-04-27 +0.011 2013-04-27 - - (Bugfix) Fix support for class types. - ++$SHLOMIF + [ Bug Fixes ] + - Fix support for class types. + SHLOMIF++ -0.010 2013-04-23 +0.010 2013-04-23 - - (Bugfix) Fix support for Maybe[`a] type constraint. (It was being - interpreted as an object blessed into package 'Maybe'.) - ++$SHLOMIF + [ Bug Fixes ] + - Fix support for Maybe[`a] type constraint. (It was being interpreted as + an object blessed into package 'Maybe'.) + SHLOMIF++ -0.009 2013-04-15 +0.009 2013-04-15 - - (Update) Switch from MooX::Types::MooseLike::Base to Types::Standard. + - Updated: Switch from MooX::Types::MooseLike::Base to Types::Standard. -0.008 2013-03-11 +0.008 2013-03-11 - - (Documentation) Minor documentation updates. - - (Packaging) Make MooX::Types::MooseLike::Base a required dependency (was - optional). + [ Documentation ] + - Minor documentation updates. -0.007 2012-12-26 + [ Packaging ] + - Make MooX::Types::MooseLike::Base a required dependency (was optional). - - (Documentation) Documentation for use with Moo::Role. - ++$SHLOMIF - - (Documentation) Link to MooX::HandlesVia on github. +0.007 2012-12-26 -0.006 2012-12-11 + [ Documentation ] + - Documentation for use with Moo::Role. + SHLOMIF++ + <https://bitbucket.org/tobyink/p5-moox-late/pull-request/1/-/diff> + - Link to MooX::HandlesVia on github. - - (Bugfix) Skip t/02inflation.t if no MooX::Types::MooseLike::Base. +0.006 2012-12-11 -0.005 2012-12-09 + [ Bug Fixes ] + - Skip t/02inflation.t if no MooX::Types::MooseLike::Base. - - (Bugfix) Cope with has \@attributes => (...). - - (Documentation) Document test suite. - - (Packaging) Bump required version of Moo to 1.000004. +0.005 2012-12-09 -0.004 2012-12-03 + [ Bug Fixes ] + - Cope with has \@attributes => (...). - - (Addition) Issue warnings when type constraint cannot be interpreted + [ Documentation ] + - Document test suite. + + [ Packaging ] + - Bump required version of Moo to 1.000004. + +0.004 2012-12-03 + + - Added: Issue warnings when type constraint cannot be interpreted correctly. Warning is not issued at the time the attribute is built, but the first time the type constraint is checked against. Don't attempt to inflate these type constraints when Moose is loaded. -0.003 2012-12-02 +0.003 2012-12-02 - - (Addition) Inflation of type constraints to Moose. + - Added: Inflation of type constraints to Moose. - General refactoring of type constraint code. - Use MooX::Types::MooseLike::Base for type checks. -0.002 2012-12-02 - - - (Bugfix) use re 'eval' on Perl 5.8 to fix regexp compilation problem - -0.001 2012-12-01 # Initial release +0.002 2012-12-02 + [ Bug Fixes ] + - use re 'eval' on Perl 5.8 to fix regexp compilation problem +0.001 2012-12-01 Initial release @@ -0,0 +1,38 @@ + Installing MooX-late should be straightforward. + +INSTALLATION WITH CPANMINUS + If you have cpanm, you only need one line: + + % cpanm MooX::late + + If you are installing into a system-wide directory, you may need to pass + the "-S" flag to cpanm, which uses sudo to install the module: + + % cpanm -S MooX::late + +INSTALLATION WITH THE CPAN SHELL + Alternatively, if your CPAN shell is set up, you should just be able to + do: + + % cpan MooX::late + +MANUAL INSTALLATION + As a last resort, you can manually install it. Download the tarball and + unpack it. + + Consult the file META.json for a list of pre-requisites. Install these + first. + + To build MooX-late: + + % perl Makefile.PL + % make && make test + + Then install it: + + % make install + + If you are installing into a system-wide directory, you may need to run: + + % sudo make install + @@ -1,4 +1,4 @@ -This software is copyright (c) 2013 by Toby Inkster <tobyink@cpan.org>. +This software is copyright (c) 2014 by Toby Inkster. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,7 +12,7 @@ b) the "Artistic License" --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2013 by Toby Inkster <tobyink@cpan.org>. +This software is Copyright (c) 2014 by Toby Inkster. This is free software, licensed under: @@ -22,7 +22,7 @@ This is free software, licensed under: Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -272,7 +272,7 @@ That's all there is to it! --- The Artistic License 1.0 --- -This software is Copyright (c) 2013 by Toby Inkster <tobyink@cpan.org>. +This software is Copyright (c) 2014 by Toby Inkster. This is free software, licensed under: @@ -1,36 +1,20 @@ -Changes CONTRIBUTING COPYRIGHT CREDITS -examples/simple.pl -inc/Module/AutoInstall.pm -inc/Module/Install.pm -inc/Module/Install/AutoInstall.pm -inc/Module/Install/AutoManifest.pm -inc/Module/Install/Base.pm -inc/Module/Install/Can.pm -inc/Module/Install/Fetch.pm -inc/Module/Install/Include.pm -inc/Module/Install/Makefile.pm -inc/Module/Install/Metadata.pm -inc/Module/Install/Package.pm -inc/Module/Install/TrustMetaYml.pm -inc/Module/Install/Win32.pm -inc/Module/Install/WriteAll.pm -inc/Module/Package.pm -inc/Module/Package/Dist/RDF.pm -inc/YAML/Tiny.pm -lib/MooX/late.pm +Changes +INSTALL LICENSE -Makefile.PL -MANIFEST This list of files -META.ttl +MANIFEST +META.json META.yml -meta/changes.pret -meta/doap.pret -meta/makefile.pret -meta/people.pret +Makefile.PL README +SIGNATURE +TODO +dist.ini +doap.ttl +examples/simple.pl +lib/MooX/late.pm t/01basic.t t/02inflation.t t/03invalid_tc.t @@ -38,4 +22,4 @@ t/04arrayofattrs.t t/05haveimissedanytypes.t t/06handlesvia.t t/07coerce1.t -SIGNATURE Public-key signature (added by MakeMaker) +t/08doesrole.t diff --git a/META.json b/META.json new file mode 100644 index 0000000..b53522a --- /dev/null +++ b/META.json @@ -0,0 +1,81 @@ +{ + "abstract" : "easily translate Moose code to Moo", + "author" : [ + "Toby Inkster (TOBYINK) <tobyink@cpan.org>", + "" + ], + "dynamic_config" : 0, + "generated_by" : "Dist::Inkt::Profile::TOBYINK version 0.016, CPAN::Meta::Converter version 2.140640", + "keywords" : [], + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "MooX-late", + "no_index" : { + "directory" : [ + "eg", + "examples", + "inc", + "t", + "xt" + ] + }, + "optional_features" : {}, + "prereqs" : { + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.17" + } + }, + "runtime" : { + "recommends" : { + "MooX::HandlesVia" : "0.001004" + }, + "requires" : { + "Moo" : "1.006000", + "Type::Utils" : "1.000001" + }, + "suggests" : { + "MooX" : "0" + } + }, + "test" : { + "requires" : { + "Test::Fatal" : "0.010", + "Test::More" : "0.96", + "Test::Requires" : "0.06" + } + } + }, + "provides" : { + "MooX::late" : { + "file" : "lib/MooX/late.pm", + "version" : "0.015" + }, + "MooX::late::DefinitionContext" : { + "file" : "lib/MooX/late.pm", + "version" : "0.015" + } + }, + "release_status" : "stable", + "resources" : { + "X_identifier" : "http://purl.org/NET/cpan-uri/dist/MooX-late/project", + "bugtracker" : { + "web" : "http://rt.cpan.org/Dist/Display.html?Queue=MooX-late" + }, + "homepage" : "https://metacpan.org/release/MooX-late", + "license" : [ + "http://dev.perl.org/licenses/" + ], + "repository" : { + "type" : "git", + "url" : "git://github.com/tobyink/p5-moox-late.git", + "web" : "https://github.com/tobyink/p5-moox-late" + } + }, + "version" : "0.015" +} diff --git a/META.ttl b/META.ttl deleted file mode 100644 index 6a6bec4..0000000 --- a/META.ttl +++ /dev/null @@ -1,323 +0,0 @@ -@prefix cpan: <http://purl.org/NET/cpan-uri/person/> . -@prefix cpant: <http://purl.org/NET/cpan-uri/terms#> . -@prefix dbug: <http://ontologi.es/doap-bugs#> . -@prefix dc: <http://purl.org/dc/terms/> . -@prefix dcs: <http://ontologi.es/doap-changeset#> . -@prefix dist: <http://purl.org/NET/cpan-uri/dist/MooX-late/> . -@prefix doap: <http://usefulinc.com/ns/doap#> . -@prefix foaf: <http://xmlns.com/foaf/0.1/> . -@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> . -@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . -@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . - -dist:project - a doap:Project; - doap:name "MooX-late"; - cpant:perl_version_from [ - a nfo:FileDataObject; - a nfo:SourceCode; - rdfs:label "MooX::late"; - nfo:fileName "lib/MooX/late.pm"; - nfo:programmingLanguage "Perl"; - ]; - cpant:readme_from [ - a nfo:FileDataObject; - a nfo:SourceCode; - rdfs:label "MooX::late"; - nfo:fileName "lib/MooX/late.pm"; - nfo:programmingLanguage "Perl"; - ]; - cpant:recommends "MooX"^^cpant:dsWithoutVersion; - cpant:recommends "MooX::HandlesVia 0.001004"^^cpant:dsWithVersion; - cpant:requires "Moo 1.003000"^^cpant:dsWithVersion; - cpant:requires "Type::Utils 0.016"^^cpant:dsWithVersion; - cpant:test_requires "Test::Fatal 0.010"^^cpant:dsWithVersion; - cpant:test_requires "Test::More 0.96"^^cpant:dsWithVersion; - cpant:test_requires "Test::Requires 0.06"^^cpant:dsWithVersion; - cpant:version_from [ - a nfo:FileDataObject; - a nfo:SourceCode; - rdfs:label "MooX::late"; - nfo:fileName "lib/MooX/late.pm"; - nfo:programmingLanguage "Perl"; - ]; - dc:contributor cpan:tobyink; - doap:bug-database <http://rt.cpan.org/Dist/Display.html?Queue=MooX-late>; - doap:created "2012-11-30"^^xsd:date; - doap:developer cpan:tobyink; - doap:download-page <https://metacpan.org/release/MooX-late>; - doap:homepage <https://metacpan.org/release/MooX-late>; - doap:license <http://dev.perl.org/licenses/>; - doap:maintainer cpan:tobyink; - doap:programming-language "Perl"; - doap:release dist:v_0-001; - doap:release dist:v_0-002; - doap:release dist:v_0-003; - doap:release dist:v_0-004; - doap:release dist:v_0-005; - doap:release dist:v_0-006; - doap:release dist:v_0-007; - doap:release dist:v_0-008; - doap:release dist:v_0-009; - doap:release dist:v_0-010; - doap:release dist:v_0-011; - doap:release dist:v_0-012; - doap:release dist:v_0-013; - doap:release dist:v_0-014; - doap:repository [ - a doap:GitRepository; - doap:browse <https://github.com/tobyink/p5-moox-late>; - ]; - doap:shortdesc "easily translate Moose code to Moo". - -dist:v_0-001 - a doap:Version; - rdfs:label "Initial release"; - dc:identifier "MooX-late-0.001"^^xsd:string; - dc:issued "2012-12-01"^^xsd:date; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.001.tar.gz>; - doap:revision "0.001"^^xsd:string. - -dist:v_0-002 - a doap:Version; - dc:identifier "MooX-late-0.002"^^xsd:string; - dc:issued "2012-12-02"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Bugfix; - rdfs:label "use re 'eval' on Perl 5.8 to fix regexp compilation problem"; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.002.tar.gz>; - doap:revision "0.002"^^xsd:string. - -dist:v_0-003 - a doap:Version; - dc:identifier "MooX-late-0.003"^^xsd:string; - dc:issued "2012-12-02"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Addition; - rdfs:label "Inflation of type constraints to Moose."; - ]; - dcs:item [ - a dcs:Change; - rdfs:label "Use MooX::Types::MooseLike::Base for type checks."; - ]; - dcs:item [ - a dcs:Change; - rdfs:label "General refactoring of type constraint code."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.003.tar.gz>; - doap:revision "0.003"^^xsd:string. - -dist:v_0-004 - a doap:Version; - dc:identifier "MooX-late-0.004"^^xsd:string; - dc:issued "2012-12-03"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Addition; - rdfs:label "Issue warnings when type constraint cannot be interpreted correctly. Warning is not issued at the time the attribute is built, but the first time the type constraint is checked against. Don't attempt to inflate these type constraints when Moose is loaded."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.004.tar.gz>; - doap:revision "0.004"^^xsd:string. - -dist:v_0-005 - a doap:Version; - dc:identifier "MooX-late-0.005"^^xsd:string; - dc:issued "2012-12-09"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Packaging; - rdfs:label "Bump required version of Moo to 1.000004."; - ]; - dcs:item [ - a dcs:Documentation; - rdfs:label "Document test suite."; - ]; - dcs:item [ - a dcs:Bugfix; - rdfs:label "Cope with has \\@attributes => (...)."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.005.tar.gz>; - doap:revision "0.005"^^xsd:string. - -dist:v_0-006 - a doap:Version; - dc:identifier "MooX-late-0.006"^^xsd:string; - dc:issued "2012-12-11"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Bugfix; - rdfs:label "Skip t/02inflation.t if no MooX::Types::MooseLike::Base."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.006.tar.gz>; - doap:revision "0.006"^^xsd:string. - -dist:v_0-007 - a doap:Version; - dc:identifier "MooX-late-0.007"^^xsd:string; - dc:issued "2012-12-26"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Documentation; - rdfs:label "Link to MooX::HandlesVia on github."; - ]; - dcs:item [ - a dcs:Documentation; - rdfs:label "Documentation for use with Moo::Role."; - dcs:thanks cpan:shlomif; - rdfs:seeAlso <https://bitbucket.org/tobyink/p5-moox-late/pull-request/1/-/diff>; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.007.tar.gz>; - doap:revision "0.007"^^xsd:string. - -dist:v_0-008 - a doap:Version; - dc:identifier "MooX-late-0.008"^^xsd:string; - dc:issued "2013-03-11"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Documentation; - rdfs:label "Minor documentation updates."; - ]; - dcs:item [ - a dcs:Packaging; - rdfs:label "Make MooX::Types::MooseLike::Base a required dependency (was optional)."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.008.tar.gz>; - doap:revision "0.008"^^xsd:string. - -dist:v_0-009 - a doap:Version; - dc:identifier "MooX-late-0.009"^^xsd:string; - dc:issued "2013-04-15"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Update; - rdfs:label "Switch from MooX::Types::MooseLike::Base to Types::Standard."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.009.tar.gz>; - doap:revision "0.009"^^xsd:string. - -dist:v_0-010 - a doap:Version; - dc:identifier "MooX-late-0.010"^^xsd:string; - dc:issued "2013-04-23"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Bugfix; - rdfs:label "Fix support for Maybe[`a] type constraint. (It was being interpreted as an object blessed into package 'Maybe'.)"; - dcs:fixes [ - dbug:affects dist:v_0-009; - dbug:reporter cpan:shlomif; - ]; - dcs:thanks cpan:shlomif; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.010.tar.gz>; - doap:revision "0.010"^^xsd:string. - -dist:v_0-011 - a doap:Version; - dc:identifier "MooX-late-0.011"^^xsd:string; - dc:issued "2013-04-27"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Bugfix; - rdfs:label "Fix support for class types."; - dcs:fixes [ - dbug:affects dist:v_0-009; - dbug:affects dist:v_0-010; - dbug:reporter cpan:shlomif; - ]; - dcs:thanks cpan:shlomif; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.011.tar.gz>; - doap:revision "0.011"^^xsd:string. - -dist:v_0-012 - a doap:Version; - dc:identifier "MooX-late-0.012"^^xsd:string; - dc:issued "2013-06-28"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Update; - rdfs:label "Use Type::Registry/Type::Parser to translate strings to type constraint expressions."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.012.tar.gz>; - doap:revision "0.012"^^xsd:string. - -dist:v_0-013 - a doap:Version; - dc:identifier "MooX-late-0.013"^^xsd:string; - dc:issued "2013-07-16"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Update; - rdfs:label "Use Type::Utils::dwim_type to translate strings to type constraint expressions."; - ]; - dcs:item [ - a dcs:Addition; - rdfs:label "Support Moose attribute traits using MooX::HandlesVia."; - ]; - dcs:item [ - a dcs:Removal; - rdfs:label "Retire support for non-reference attribute defaults because Moo now does this natively."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.013.tar.gz>; - doap:revision "0.013"^^xsd:string. - -dist:v_0-014 - a doap:Version; - dc:identifier "MooX-late-0.014"^^xsd:string; - dc:issued "2013-07-16"^^xsd:date; - dcs:changeset [ - dcs:item [ - a dcs:Addition; - rdfs:label "Support `coerce => 1` for Type::Tiny type constraints and those providing a similar API."; - ]; - ]; - dcs:released-by cpan:tobyink; - doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.014.tar.gz>; - doap:revision "0.014"^^xsd:string. - -cpan:shlomif - a foaf:Person; - foaf:nick "SHLOMIF"; - foaf:page <https://metacpan.org/author/SHLOMIF>. - -cpan:tobyink - a foaf:Person; - foaf:name "Toby Inkster"; - foaf:mbox <mailto:tobyink@cpan.org>; - foaf:nick "TOBYINK"; - foaf:page <https://metacpan.org/author/TOBYINK>. - -<http://dev.perl.org/licenses/> - dc:title "the same terms as the perl 5 programming language system itself". - @@ -1,40 +1,46 @@ --- abstract: 'easily translate Moose code to Moo' author: - - 'Toby Inkster <tobyink@cpan.org>' + - 'Toby Inkster (TOBYINK) <tobyink@cpan.org>' + - unknown build_requires: - ExtUtils::MakeMaker: 6.59 - Test::Fatal: 0.010 - Test::More: 0.96 - Test::Requires: 0.06 + Test::Fatal: '0.010' + Test::More: '0.96' + Test::Requires: '0.06' configure_requires: - ExtUtils::MakeMaker: 6.59 -distribution_type: module + ExtUtils::MakeMaker: '6.17' dynamic_config: 0 -generated_by: 'Module::Install version 1.06' +generated_by: 'Dist::Inkt::Profile::TOBYINK version 0.016, CPAN::Meta::Converter version 2.140640' keywords: [] license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 -module_name: MooX::late + version: '1.4' name: MooX-late no_index: directory: + - eg - examples - inc - t - xt +optional_features: {} +provides: + MooX::late: + file: lib/MooX/late.pm + version: '0.015' + MooX::late::DefinitionContext: + file: lib/MooX/late.pm + version: '0.015' recommends: - MooX: 0 - MooX::HandlesVia: 0.001004 + MooX::HandlesVia: '0.001004' requires: - Moo: 1.003000 - Type::Utils: 0.016 - perl: 5.8.0 + Moo: '1.006000' + Type::Utils: '1.000001' resources: + X_identifier: http://purl.org/NET/cpan-uri/dist/MooX-late/project bugtracker: http://rt.cpan.org/Dist/Display.html?Queue=MooX-late homepage: https://metacpan.org/release/MooX-late license: http://dev.perl.org/licenses/ - repository: https://github.com/tobyink/p5-moox-late -version: 0.014 + repository: git://github.com/tobyink/p5-moox-late.git +version: '0.015' diff --git a/Makefile.PL b/Makefile.PL index 87d1790..92ed2f8 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,2 +1,148 @@ -use inc::Module::Package 'RDF:tobyink 0.009'; +use strict; +use ExtUtils::MakeMaker 6.17; + +my $EUMM = eval( $ExtUtils::MakeMaker::VERSION ); + +my $meta = { + "abstract" => "easily translate Moose code to Moo", + "author" => ["Toby Inkster (TOBYINK) <tobyink\@cpan.org>", "unknown"], + "dynamic_config" => 0, + "generated_by" => "Dist::Inkt::Profile::TOBYINK version 0.016, CPAN::Meta::Converter version 2.140640", + "keywords" => [], + "license" => ["perl_5"], + "meta-spec" => { + url => "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + version => 2, + }, + "name" => "MooX-late", + "no_index" => { directory => ["eg", "examples", "inc", "t", "xt"] }, + "prereqs" => { + configure => { requires => { "ExtUtils::MakeMaker" => 6.17 } }, + runtime => { + recommends => { "MooX::HandlesVia" => 0.001004 }, + requires => { "Moo" => "1.006000", "Type::Utils" => 1.000001 }, + suggests => { MooX => 0 }, + }, + test => { + requires => { + "Test::Fatal" => "0.010", + "Test::More" => 0.96, + "Test::Requires" => 0.06, + }, + }, + }, + "provides" => { + "MooX::late" => { file => "lib/MooX/late.pm", version => 0.015 }, + "MooX::late::DefinitionContext" => { file => "lib/MooX/late.pm", version => 0.015 }, + }, + "release_status" => "stable", + "resources" => { + bugtracker => { web => "http://rt.cpan.org/Dist/Display.html?Queue=MooX-late" }, + homepage => "https://metacpan.org/release/MooX-late", + license => ["http://dev.perl.org/licenses/"], + repository => { + type => "git", + url => "git://github.com/tobyink/p5-moox-late.git", + web => "https://github.com/tobyink/p5-moox-late", + }, + X_identifier => "http://purl.org/NET/cpan-uri/dist/MooX-late/project", + }, + "version" => 0.015, +}; + +my %dynamic_config; + +my %WriteMakefileArgs = ( + ABSTRACT => $meta->{abstract}, + AUTHOR => ($EUMM >= 6.5702 ? $meta->{author} : $meta->{author}[0]), + DISTNAME => $meta->{name}, + VERSION => $meta->{version}, + EXE_FILES => [ map $_->{file}, values %{ $meta->{x_provides_scripts} || {} } ], + NAME => do { my $n = $meta->{name}; $n =~ s/-/::/g; $n }, + test => { TESTS => "t/*.t" }, + %dynamic_config, +); + +$WriteMakefileArgs{LICENSE} = $meta->{license}[0] if $EUMM >= 6.3001; + +sub deps +{ + my %r; + for my $stage (@_) + { + for my $dep (keys %{$meta->{prereqs}{$stage}{requires}}) + { + next if $dep eq 'perl'; + my $ver = $meta->{prereqs}{$stage}{requires}{$dep}; + $r{$dep} = $ver if !exists($r{$dep}) || $ver >= $r{$dep}; + } + } + \%r; +} + +my ($build_requires, $configure_requires, $runtime_requires, $test_requires); +if ($EUMM >= 6.6303) +{ + $WriteMakefileArgs{BUILD_REQUIRES} ||= deps('build'); + $WriteMakefileArgs{CONFIGURE_REQUIRES} ||= deps('configure'); + $WriteMakefileArgs{TEST_REQUIRES} ||= deps('test'); + $WriteMakefileArgs{PREREQ_PM} ||= deps('runtime'); +} +elsif ($EUMM >= 6.5503) +{ + $WriteMakefileArgs{BUILD_REQUIRES} ||= deps('build', 'test'); + $WriteMakefileArgs{CONFIGURE_REQUIRES} ||= deps('configure'); + $WriteMakefileArgs{PREREQ_PM} ||= deps('runtime'); +} +elsif ($EUMM >= 6.52) +{ + $WriteMakefileArgs{CONFIGURE_REQUIRES} ||= deps('configure'); + $WriteMakefileArgs{PREREQ_PM} ||= deps('runtime', 'build', 'test'); +} +else +{ + $WriteMakefileArgs{PREREQ_PM} ||= deps('configure', 'build', 'test', 'runtime'); +} + +{ + my ($minperl) = reverse sort( + grep defined && /^[0-9]+(\.[0-9]+)?$/, + map $meta->{prereqs}{$_}{requires}{perl}, + qw( configure build runtime ) + ); + + if (defined($minperl)) + { + die "Installing $meta->{name} requires Perl >= $minperl" + unless $] >= $minperl; + + $WriteMakefileArgs{MIN_PERL_VERSION} ||= $minperl + if $EUMM >= 6.48; + } +} + +sub FixMakefile +{ + return unless -d 'inc'; + my $file = shift; + + local *MAKEFILE; + open MAKEFILE, "< $file" or die "FixMakefile: Couldn't open $file: $!; bailing out"; + 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; + $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; + $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; + $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; + + open MAKEFILE, "> $file" or die "FixMakefile: Couldn't open $file: $!; bailing out"; + print MAKEFILE $makefile or die $!; + close MAKEFILE or die $!; +} + +my $mm = WriteMakefile(%WriteMakefileArgs); +FixMakefile($mm->{FIRST_MAKEFILE} || 'Makefile'); +exit(0); @@ -10,52 +10,46 @@ SYNOPSIS (Examples for Moo roles in section below.) DESCRIPTION - Moo is a light-weight object oriented programming framework which aims - to be compatible with Moose. It does this by detecting when Moose has - been loaded, and automatically "inflating" its classes and roles to full - Moose classes and roles. This way, Moo classes can consume Moose roles, - Moose classes can extend Moo classes, and so forth. + Moo is a light-weight object oriented programming framework which aims to + be compatible with Moose. It does this by detecting when Moose has been + loaded, and automatically "inflating" its classes and roles to full Moose + classes and roles. This way, Moo classes can consume Moose roles, Moose + classes can extend Moo classes, and so forth. However, the surface syntax of Moo differs somewhat from Moose. For - example the "isa" option when defining attributes in Moose must be - either a string or a blessed Moose::Meta::TypeConstraint object; but in - Moo must be a coderef. These differences in surface syntax make porting - code from Moose to Moo potentially tricky. MooX::late provides some - assistance by enabling a slightly more Moosey surface syntax. + example the `isa` option when defining attributes in Moose must be either + a string or a blessed Moose::Meta::TypeConstraint object; but in Moo must + be a coderef. These differences in surface syntax make porting code from + Moose to Moo potentially tricky. MooX::late provides some assistance by + enabling a slightly more Moosey surface syntax. MooX::late does the following: - 1. Allows "isa => $string" to work when defining attributes for all - Moose's built-in type constraints (and assumes other strings are - package names). + 1. Supports `isa => $stringytype`. - This feature requires Types::Standard. + 2. Supports `does => $rolename` . - 2. Retired feature: this is now built in to Moo. + 3. Supports `lazy_build => 1`. - Allows "default => $non_reference_value" to work when defining - attributes. + 4. Exports `blessed` and `confess` functions to your namespace. - 3. Allows "lazy_build => 1" to work when defining attributes. + 5. Handles certain attribute traits. Currently `Hash`, `Array` and `Code` + are supported. This feature requires MooX::HandlesVia. - 4. Exports "blessed" and "confess" functions to your namespace. - - 5. Handles certain attribute traits. Currently "Hash", "Array" and - "Code" are supported. This feature requires MooX::HandlesVia. - - "String", "Number", "Counter" and "Bool" are unlikely to ever be + `String`, `Number`, `Counter` and `Bool` are unlikely to ever be supported because of internal implementation details of Moo. If you need another attribute trait to be supported, let me know and I will consider it. - 6. Supports "coerce => 1" if the type constraint is a blessed object - implementing Type::API::Constraint::Coercible. - - Five features. It is not the aim of "MooX::late" to make every aspect of + Five features. It is not the aim of `MooX::late` to make every aspect of Moo behave exactly identically to Moose. It's just going after the low-hanging fruit. So it does five things right now, and I promise that future versions will never do more than seven. + Previous releases of MooX::late added support for `coerce => 1` and + `default => $nonref`. These features have now been added to Moo itself, so + MooX::late no longer has to deal with them. + Use in Moo::Roles MooX::late should work in Moo::Roles, with no particular caveats. @@ -63,19 +57,17 @@ DESCRIPTION use Moo::Role; use MooX::late; - Package::Variant can be used to build the Moo equivalent of - parameterized roles. MooX::late should work in roles built with - Package::Variant. + Package::Variant can be used to build the Moo equivalent of parameterized + roles. MooX::late should work in roles built with Package::Variant. use Package::Variant importing => [ qw( Moo::Role MooX::late ) ], subs => [ qw( has with ) ]; Type constraints - Type constraint strings are interpreted using Type::Parser, using the - type constraints defined in Types::Standard. This provides a very slight - superset of Moose's type constraint syntax and built-in type - constraints. + Type constraint strings are interpreted using Type::Parser, using the type + constraints defined in Types::Standard. This provides a very slight + superset of Moose's type constraint syntax and built-in type constraints. Any unrecognized string that looks like it might be a class name is interpreted as a class type constraint. @@ -89,9 +81,9 @@ BUGS <http://rt.cpan.org/Dist/Display.html?Queue=MooX-late>. SEE ALSO - "MooX::late" uses Types::Standard to check type constraints. + `MooX::late` uses Types::Standard to check type constraints. - "MooX::late" uses MooX::HandlesVia to provide native attribute traits + `MooX::late` uses MooX::HandlesVia to provide native attribute traits support. The following modules bring additional Moose functionality to Moo: @@ -107,10 +99,10 @@ AUTHOR Toby Inkster <tobyink@cpan.org>. COPYRIGHT AND LICENCE - This software is copyright (c) 2012-2013 by Toby Inkster. + This software is copyright (c) 2012-2014 by Toby Inkster. - This is free software; you can redistribute it and/or modify it under - the same terms as the Perl 5 programming language system itself. + This is free software; you can redistribute it and/or modify it under the + same terms as the Perl 5 programming language system itself. DISCLAIMER OF WARRANTIES THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED @@ -1,5 +1,5 @@ This file contains message digests of all files listed in MANIFEST, -signed via the Module::Signature module, version 0.70. +signed via the Module::Signature module, version 0.73. To verify the content in this distribution, first make sure you have Module::Signature installed, then type: @@ -14,50 +14,34 @@ not run its Makefile.PL or Build.PL. -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -SHA1 294505f858f11dd062e9916e3f50d88210a9ef54 CONTRIBUTING -SHA1 54cd94132d6e859dfda7b9a0319f4629450821ed COPYRIGHT -SHA1 b6a175614af68b22b697f92aff81f69c4061c91b CREDITS -SHA1 6e18c6b0210df72c670838acb1ad129ba68308d3 Changes -SHA1 937d452c5c4069f4cda9ffaf45a33f1eb5f060e8 LICENSE -SHA1 0cb78eb8c5ec95938e0de56ae9a89aa3b7137aad MANIFEST -SHA1 2cd8254c59b0571aa231080e91fb1d51c2e31f45 META.ttl -SHA1 2dd5cdc01d65cf4b566f144d1de9cfa6d2473909 META.yml -SHA1 b9d5dd0b476253d37384aed42664179605286153 Makefile.PL -SHA1 f1d5de3e6d2f59bb64d9c5de25987928d26ef621 README +SHA1 33317486c4fa2cf7fec85bf92ed38ac0f64233a0 CONTRIBUTING +SHA1 10a180a41f91e5461699b5a32d83af4eb2019063 COPYRIGHT +SHA1 502c559978c40e9248b93b179985933644ebfca1 CREDITS +SHA1 d540676247c6223ce63af2e24dd27ec597172804 Changes +SHA1 4b001f59d6016da8f1dd32e32c92340d098f4e4d INSTALL +SHA1 34f5e12514b91055de4b164a1f2327ef5c30ba53 LICENSE +SHA1 116b15d3035daeef65599f9c3d17da12a8a16b6e MANIFEST +SHA1 95d62b7d820562b9cab86d1ef25e85e71b481bf1 META.json +SHA1 f1b3c39140ce0efa4863837742633fc63b563a06 META.yml +SHA1 5f987fbb0941e6958dfe94859126be66ee4f3a5a Makefile.PL +SHA1 848b6a996d0e479d6cc8d279214891df84843e44 README +SHA1 82a5dbef757dbba311ab59332cd5c3092dc1dc4a TODO +SHA1 19114c43d58f7b89287f77b0a2318ea72d7d9983 dist.ini +SHA1 0f0783dd1b2c74f19c23c34f224ef959b45d5c4b doap.ttl SHA1 6c115a020133c60ececeae3b2fde21abdcb83179 examples/simple.pl -SHA1 06c410f05488c1612ed66b06d3a86b2580581e4a inc/Module/AutoInstall.pm -SHA1 8a924add836b60fb23b25c8506d45945e02f42f4 inc/Module/Install.pm -SHA1 61ab1dd37e33ddbe155907ce51df8a3e56ac8bbf inc/Module/Install/AutoInstall.pm -SHA1 c04f94f91fa97b9f8cfb5a36071098ab0e6c78e3 inc/Module/Install/AutoManifest.pm -SHA1 2d0fad3bf255f8c1e7e1e34eafccc4f595603ddc inc/Module/Install/Base.pm -SHA1 f0e01fff7d73cd145fbf22331579918d4628ddb0 inc/Module/Install/Can.pm -SHA1 7328966e4fda0c8451a6d3850704da0b84ac1540 inc/Module/Install/Fetch.pm -SHA1 66d3d335a03492583a3be121a7d888f63f08412c inc/Module/Install/Include.pm -SHA1 b62ca5e2d58fa66766ccf4d64574f9e1a2250b34 inc/Module/Install/Makefile.pm -SHA1 1aa925be410bb3bfcd84a16985921f66073cc1d2 inc/Module/Install/Metadata.pm -SHA1 3b9281ddf7dd6d6f5de0a9642c69333023193c80 inc/Module/Install/Package.pm -SHA1 41f76ff6b39368a65da86377e43b34bacc2fb0eb inc/Module/Install/TrustMetaYml.pm -SHA1 e4196994fa75e98bdfa2be0bdeeffef66de88171 inc/Module/Install/Win32.pm -SHA1 c3a6d0d5b84feb3280622e9599e86247d58b0d18 inc/Module/Install/WriteAll.pm -SHA1 26d58a041cd6b3d21db98b32e8fd1841aae21204 inc/Module/Package.pm -SHA1 5a2f84a7a82eee0d1e5ed3628fe503a608efc10f inc/Module/Package/Dist/RDF.pm -SHA1 feb933cefe2e3762e8322bd6071a2499f3440da1 inc/YAML/Tiny.pm -SHA1 a8c8cd29969736c6035499904657b0c68ad78f5b lib/MooX/late.pm -SHA1 543127e584ff86f44b5f5ed0b6d9df03f7acbdee meta/changes.pret -SHA1 6fc2e963de83ce34e4fcb66932f712ec5799ea4b meta/doap.pret -SHA1 4b1a0bd7e3864a8697e78b333c40e9e90de6f4be meta/makefile.pret -SHA1 a151cff74b5f29c00381a14d4ec8726e3763b6b2 meta/people.pret +SHA1 eb8f9f75bbec3fce01fae54dec155d3189867439 lib/MooX/late.pm SHA1 f8833de7f2ab9f1d40f29c32943da5d513d7e623 t/01basic.t SHA1 888f8a494a4d43c821e6bc581d59f577859b0c5d t/02inflation.t SHA1 ff6dd69d308062933193712fe88abad29490838c t/03invalid_tc.t SHA1 904411100b6e3c06629020bb2bc52eeca3afa802 t/04arrayofattrs.t -SHA1 c092caffac162547f710d77b0261c876fa28ca92 t/05haveimissedanytypes.t +SHA1 de4ffc50f992e994565223480950ced4456976e2 t/05haveimissedanytypes.t SHA1 7a6b642014d821f39bca5c5570b17ed8805843e1 t/06handlesvia.t -SHA1 5c7f151ef57babbe356db7455a29815c3406d960 t/07coerce1.t +SHA1 5367c78be6846f7f71fcdbbc77a4a9495e024451 t/07coerce1.t +SHA1 066a4a083faf2ec211c72d346e0ab7ad6a710f95 t/08doesrole.t -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.12 (GNU/Linux) +Version: GnuPG v1 -iEYEARECAAYFAlHlsOIACgkQzr+BKGoqfTkE9QCfaM63WfW+woDUDYhoTcshQjeX -YL0AoIku50DmVNMMWLY5NG0HFVcyMv/j -=mepm +iEYEARECAAYFAlPx7dQACgkQzr+BKGoqfTnS2gCffhbs29dRF02DkXg+eMRqw1MU +ZhIAmwR7bblwp6hX4jU76hcv3e+MGE/5 +=kcLS -----END PGP SIGNATURE----- @@ -0,0 +1,2 @@ +- make (handles => $rolename) work for Moo classes consuming Moose roles. + - mst has given me the go-ahead to do this in Moo directly rather than here diff --git a/dist.ini b/dist.ini new file mode 100644 index 0000000..1eda099 --- /dev/null +++ b/dist.ini @@ -0,0 +1,4 @@ +; Configuration file for Dist::Inkt +; +;; class = 'Dist::Inkt::Profile::TOBYINK' +;; name = 'MooX-late' diff --git a/doap.ttl b/doap.ttl new file mode 100644 index 0000000..79b6131 --- /dev/null +++ b/doap.ttl @@ -0,0 +1,306 @@ +@prefix dc: <http://purl.org/dc/terms/> . +@prefix doap: <http://usefulinc.com/ns/doap#> . +@prefix doap-bugs: <http://ontologi.es/doap-bugs#> . +@prefix doap-changeset: <http://ontologi.es/doap-changeset#> . +@prefix doap-deps: <http://ontologi.es/doap-deps#> . +@prefix foaf: <http://xmlns.com/foaf/0.1/> . +@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> . +@prefix xsd: <http://www.w3.org/2001/XMLSchema#> . + +<http://dev.perl.org/licenses/> + dc:title "the same terms as the perl 5 programming language system itself". + +<http://purl.org/NET/cpan-uri/dist/MooX-late/project> + a doap:Project; + dc:contributor <http://purl.org/NET/cpan-uri/person/tobyink>; + doap-deps:runtime-recommendation [ + doap-deps:on "MooX::HandlesVia 0.001004"^^doap-deps:CpanId; + ]; + doap-deps:runtime-requirement [ doap-deps:on "Moo 1.006000"^^doap-deps:CpanId ], [ + doap-deps:on "Type::Utils 1.000001"^^doap-deps:CpanId; + ]; + doap-deps:runtime-suggestion [ doap-deps:on "MooX"^^doap-deps:CpanId ]; + doap-deps:test-requirement [ doap-deps:on "Test::More 0.96"^^doap-deps:CpanId ], [ + doap-deps:on "Test::Requires 0.06"^^doap-deps:CpanId; + ], [ doap-deps:on "Test::Fatal 0.010"^^doap-deps:CpanId ]; + doap:bug-database <http://rt.cpan.org/Dist/Display.html?Queue=MooX-late>; + doap:created "2012-11-30"^^xsd:date; + doap:developer <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:download-page <https://metacpan.org/release/MooX-late>; + doap:homepage <https://metacpan.org/release/MooX-late>; + doap:license <http://dev.perl.org/licenses/>; + doap:maintainer <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:name "MooX-late"; + doap:programming-language "Perl"; + doap:release <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-001>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-002>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-003>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-004>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-005>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-006>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-007>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-008>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-009>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-010>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-011>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-012>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-013>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-014>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-015>; + doap:repository [ + a doap:GitRepository; + doap:browse <https://github.com/tobyink/p5-moox-late>; + ]; + doap:shortdesc "easily translate Moose code to Moo". + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-001> + a doap:Version; + rdfs:label "Initial release"; + dc:identifier "MooX-late-0.001"^^xsd:string; + dc:issued "2012-12-01"^^xsd:date; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.001.tar.gz>; + doap:revision "0.001"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-002> + a doap:Version; + dc:identifier "MooX-late-0.002"^^xsd:string; + dc:issued "2012-12-02"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Bugfix; + rdfs:label "use re 'eval' on Perl 5.8 to fix regexp compilation problem"; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.002.tar.gz>; + doap:revision "0.002"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-003> + a doap:Version; + dc:identifier "MooX-late-0.003"^^xsd:string; + dc:issued "2012-12-02"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Addition; + rdfs:label "Inflation of type constraints to Moose."; + ], [ + a doap-changeset:Change; + rdfs:label "Use MooX::Types::MooseLike::Base for type checks."; + ], [ + a doap-changeset:Change; + rdfs:label "General refactoring of type constraint code."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.003.tar.gz>; + doap:revision "0.003"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-004> + a doap:Version; + dc:identifier "MooX-late-0.004"^^xsd:string; + dc:issued "2012-12-03"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Addition; + rdfs:label "Issue warnings when type constraint cannot be interpreted correctly. Warning is not issued at the time the attribute is built, but the first time the type constraint is checked against. Don't attempt to inflate these type constraints when Moose is loaded."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.004.tar.gz>; + doap:revision "0.004"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-005> + a doap:Version; + dc:identifier "MooX-late-0.005"^^xsd:string; + dc:issued "2012-12-09"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Packaging; + rdfs:label "Bump required version of Moo to 1.000004."; + ], [ + a doap-changeset:Documentation; + rdfs:label "Document test suite."; + ], [ + a doap-changeset:Bugfix; + rdfs:label "Cope with has \\@attributes => (...)."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.005.tar.gz>; + doap:revision "0.005"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-006> + a doap:Version; + dc:identifier "MooX-late-0.006"^^xsd:string; + dc:issued "2012-12-11"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Bugfix; + rdfs:label "Skip t/02inflation.t if no MooX::Types::MooseLike::Base."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.006.tar.gz>; + doap:revision "0.006"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-007> + a doap:Version; + dc:identifier "MooX-late-0.007"^^xsd:string; + dc:issued "2012-12-26"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Documentation; + rdfs:label "Link to MooX::HandlesVia on github."; + ], [ + a doap-changeset:Documentation; + rdfs:label "Documentation for use with Moo::Role."; + doap-changeset:thanks <http://purl.org/NET/cpan-uri/person/shlomif>; + rdfs:seeAlso <https://bitbucket.org/tobyink/p5-moox-late/pull-request/1/-/diff>; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.007.tar.gz>; + doap:revision "0.007"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-008> + a doap:Version; + dc:identifier "MooX-late-0.008"^^xsd:string; + dc:issued "2013-03-11"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Documentation; + rdfs:label "Minor documentation updates."; + ], [ + a doap-changeset:Packaging; + rdfs:label "Make MooX::Types::MooseLike::Base a required dependency (was optional)."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.008.tar.gz>; + doap:revision "0.008"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-009> + a doap:Version; + dc:identifier "MooX-late-0.009"^^xsd:string; + dc:issued "2013-04-15"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Update; + rdfs:label "Switch from MooX::Types::MooseLike::Base to Types::Standard."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.009.tar.gz>; + doap:revision "0.009"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-010> + a doap:Version; + dc:identifier "MooX-late-0.010"^^xsd:string; + dc:issued "2013-04-23"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Bugfix; + rdfs:label "Fix support for Maybe[`a] type constraint. (It was being interpreted as an object blessed into package 'Maybe'.)"; + doap-changeset:fixes [ + doap-bugs:affects <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-009>; + doap-bugs:reporter <http://purl.org/NET/cpan-uri/person/shlomif>; + ]; + doap-changeset:thanks <http://purl.org/NET/cpan-uri/person/shlomif>; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.010.tar.gz>; + doap:revision "0.010"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-011> + a doap:Version; + dc:identifier "MooX-late-0.011"^^xsd:string; + dc:issued "2013-04-27"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Bugfix; + rdfs:label "Fix support for class types."; + doap-changeset:fixes [ + doap-bugs:affects <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-009>, <http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-010>; + doap-bugs:reporter <http://purl.org/NET/cpan-uri/person/shlomif>; + ]; + doap-changeset:thanks <http://purl.org/NET/cpan-uri/person/shlomif>; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.011.tar.gz>; + doap:revision "0.011"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-012> + a doap:Version; + dc:identifier "MooX-late-0.012"^^xsd:string; + dc:issued "2013-06-28"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Update; + rdfs:label "Use Type::Registry/Type::Parser to translate strings to type constraint expressions."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.012.tar.gz>; + doap:revision "0.012"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-013> + a doap:Version; + dc:identifier "MooX-late-0.013"^^xsd:string; + dc:issued "2013-07-16"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Update; + rdfs:label "Use Type::Utils::dwim_type to translate strings to type constraint expressions."; + ], [ + a doap-changeset:Addition; + rdfs:label "Support Moose attribute traits using MooX::HandlesVia."; + ], [ + a doap-changeset:Removal; + rdfs:label "Retire support for non-reference attribute defaults because Moo now does this natively."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.013.tar.gz>; + doap:revision "0.013"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-014> + a doap:Version; + dc:identifier "MooX-late-0.014"^^xsd:string; + dc:issued "2013-07-16"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Addition; + rdfs:label "Support `coerce => 1` for Type::Tiny type constraints and those providing a similar API."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.014.tar.gz>; + doap:revision "0.014"^^xsd:string. + +<http://purl.org/NET/cpan-uri/dist/MooX-late/v_0-015> + a doap:Version; + dc:identifier "MooX-late-0.015"^^xsd:string; + dc:issued "2013-08-18"^^xsd:date; + doap-changeset:changeset [ + doap-changeset:item [ + a doap-changeset:Documentation; + rdfs:label "Make the list of stuff this module does more concise."; + ], [ + a doap-changeset:Removal; + rdfs:label "Drop support for `coerce => 1` because Moo 1.006000 supports this natively now."; + ], [ + a doap-changeset:Packaging; + rdfs:label "Depend on Type::Utils 1.000001."; + ], [ + a doap-changeset:Packaging; + rdfs:label "Depend on Moo 1.006000."; + ], [ + a doap-changeset:Tests; + rdfs:label "Improve test cases for class type constraints."; + ]; + ]; + doap-changeset:released-by <http://purl.org/NET/cpan-uri/person/tobyink>; + doap:file-release <http://backpan.cpan.org/authors/id/T/TO/TOBYINK/MooX-late-0.015.tar.gz>; + doap:revision "0.015"^^xsd:string. + +<http://purl.org/NET/cpan-uri/person/shlomif> + a foaf:Person; + foaf:nick "SHLOMIF"; + foaf:page <https://metacpan.org/author/SHLOMIF>. + +<http://purl.org/NET/cpan-uri/person/tobyink> + a foaf:Person; + foaf:mbox <mailto:tobyink@cpan.org>; + foaf:name "Toby Inkster"; + foaf:nick "TOBYINK"; + foaf:page <https://metacpan.org/author/TOBYINK>. + diff --git a/inc/Module/AutoInstall.pm b/inc/Module/AutoInstall.pm deleted file mode 100644 index aa7aa92..0000000 --- a/inc/Module/AutoInstall.pm +++ /dev/null @@ -1,930 +0,0 @@ -#line 1 -package Module::AutoInstall; - -use strict; -use Cwd (); -use File::Spec (); -use ExtUtils::MakeMaker (); - -use vars qw{$VERSION}; -BEGIN { - $VERSION = '1.06'; -} - -# special map on pre-defined feature sets -my %FeatureMap = ( - '' => 'Core Features', # XXX: deprecated - '-core' => 'Core Features', -); - -# various lexical flags -my ( @Missing, @Existing, %DisabledTests, $UnderCPAN, $InstallDepsTarget, $HasCPANPLUS ); -my ( - $Config, $CheckOnly, $SkipInstall, $AcceptDefault, $TestOnly, $AllDeps, - $UpgradeDeps -); -my ( $PostambleActions, $PostambleActionsNoTest, $PostambleActionsUpgradeDeps, - $PostambleActionsUpgradeDepsNoTest, $PostambleActionsListDeps, - $PostambleActionsListAllDeps, $PostambleUsed, $NoTest); - -# 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 _installdeps_target { - $InstallDepsTarget = 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 =~ /^--upgradedeps=(.*)$/ ) { - $UpgradeDeps = 1; - __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; - } - elsif ( $arg =~ /^--all(?:deps)?$/ ) { - $AllDeps = 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] - ); - - # We want to know if we're under CPAN early to avoid prompting, but - # if we aren't going to try and install anything anyway then skip the - # check entirely since we don't want to have to load (and configure) - # an old CPAN just for a cosmetic message - - $UnderCPAN = _check_lock(1) unless $SkipInstall || $InstallDepsTarget; - - 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. - my $cur = _version_of($mod); - if (_version_cmp ($cur, $arg) >= 0) - { - print "loaded. ($cur" . ( $arg ? " >= $arg" : '' ) . ")\n"; - push @Existing, $mod => $arg; - $DisabledTests{$_} = 1 for map { glob($_) } @skiptests; - } - else { - if (not defined $cur) # indeed missing - { - print "missing." . ( $arg ? " (would need $arg)" : '' ) . "\n"; - } - else - { - # no need to check $arg as _version_cmp ($cur, undef) would satisfy >= above - print "too old. ($cur < $arg)\n"; - } - - push @required, $mod => $arg; - } - } - - next unless @required; - - my $mandatory = ( $feature eq '-core' or $core_all ); - - if ( - !$SkipInstall - and ( - $CheckOnly - or ($mandatory and $UnderCPAN) - or $AllDeps - or $InstallDepsTarget - 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; - } - } - - if ( @Missing and not( $CheckOnly or $UnderCPAN) ) { - require Config; - my $make = $Config::Config{make}; - if ($InstallDepsTarget) { - print -"*** To install dependencies type '$make installdeps' or '$make installdeps_notest'.\n"; - } - else { - print -"*** Dependencies will be installed the next time you type '$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'; - - return (@Existing, @Missing); -} - -sub _running_under { - my $thing = shift; - print <<"END_MESSAGE"; -*** Since we're running under ${thing}, I'll just let it take care - of the dependency's installation later. -END_MESSAGE - return 1; -} - -# 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 or @_; - - if ($ENV{PERL5_CPANM_IS_RUNNING}) { - return _running_under('cpanminus'); - } - - my $cpan_env = $ENV{PERL5_CPAN_IS_RUNNING}; - - if ($ENV{PERL5_CPANPLUS_IS_RUNNING}) { - return _running_under($cpan_env ? 'CPAN' : 'CPANPLUS'); - } - - require CPAN; - - if ($CPAN::VERSION > '1.89') { - if ($cpan_env) { - return _running_under('CPAN'); - } - return; # CPAN.pm new enough, don't need to check further - } - - # last ditch attempt, this -will- configure CPAN, very sorry - - _load_cpan(1); # force initialize even though it's already loaded - - # 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 ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) { - push @installed, $pkg; - } - else { - push @modules, $pkg, $ver; - } - } - - if ($UpgradeDeps) { - push @modules, @installed; - @installed = (); - } - - 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() and not $ENV{PERL_AUTOINSTALL_PREFER_CPAN} ) { - _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 ( _version_cmp( _version_of($pkg), $ver ) >= 0 ) { - 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 _version_cmp( $obj->{version}, $ver ) >= 0 ) { - 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"; - } - push @config, 'prereqs', $value; - } elsif ( $key eq 'force' ) { - push @config, $key, $value; - } elsif ( $key eq 'notest' ) { - push @config, 'skiptest', $value; - } 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|notest)$/; # pseudo-option - $CPAN::Config->{$opt} = $arg; - } - - if ($args{notest} && (not CPAN::Shell->can('notest'))) { - die "Your version of CPAN is too old to support the 'notest' pragma"; - } - - 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 _version_cmp( $obj->cpan_version, $ver ) >= 0 ) { - my $pathname = $pkg; - $pathname =~ s/::/\\W/; - - foreach my $inc ( grep { m/$pathname.pm/i } keys(%INC) ) { - delete $INC{$inc}; - } - - my $rv = do { - if ($args{force}) { - CPAN::Shell->force( install => $pkg ) - } elsif ($args{notest}) { - CPAN::Shell->notest( install => $pkg ) - } else { - 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 _version_cmp( _version_of($class), $ver ) >= 0; # 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; # method/function doesn't matter - my $file = $mod; - $file =~ s|::|/|g; - $file .= '.pm'; - local $@; - return eval { require $file; $mod->VERSION } || ( $@ ? undef: 0 ); -} - -# report version without loading a module -sub _version_of { - my $mod = pop; # method/function doesn't matter - my $file = $mod; - $file =~ s|::|/|g; - $file .= '.pm'; - foreach my $dir ( @INC ) { - next if ref $dir; - my $path = File::Spec->catfile($dir, $file); - next unless -e $path; - require ExtUtils::MM_Unix; - return ExtUtils::MM_Unix->parse_version($path); - } - return undef; -} - -# Load CPAN.pm and it's configuration -sub _load_cpan { - return if $CPAN::VERSION and $CPAN::Config and not @_; - require CPAN; - - # CPAN-1.82+ adds CPAN::Config::AUTOLOAD to redirect to - # CPAN::HandleConfig->load. CPAN reports that the redirection - # is deprecated in a warning printed at the user. - - # CPAN-1.81 expects CPAN::HandleConfig->load, does not have - # $CPAN::HandleConfig::VERSION but cannot handle - # CPAN::Config->load - - # Which "versions expect CPAN::Config->load? - - if ( $CPAN::HandleConfig::VERSION - || CPAN::HandleConfig->can('load') - ) { - # 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 -# return values same as <=> -sub _version_cmp { - my ( $cur, $min ) = @_; - return -1 unless defined $cur; # if 0 keep comparing - return 1 unless $min; - - $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); - } - 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 ); - } - - 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; -} - -# 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 and not $UnderCPAN) - ? "\$(PERL) $0 --config=$config --installdeps=$missing" - : "\$(NOECHO) \$(NOOP)" - ); - - my $deps_list = join( ',', @Missing, @Existing ); - - $PostambleActionsUpgradeDeps = - "\$(PERL) $0 --config=$config --upgradedeps=$deps_list"; - - my $config_notest = - join( ',', (UNIVERSAL::isa( $Config, 'HASH' ) ? %{$Config} : @{$Config}), - 'notest', 1 ) - if $Config; - - $PostambleActionsNoTest = ( - ($missing and not $UnderCPAN) - ? "\$(PERL) $0 --config=$config_notest --installdeps=$missing" - : "\$(NOECHO) \$(NOOP)" - ); - - $PostambleActionsUpgradeDepsNoTest = - "\$(PERL) $0 --config=$config_notest --upgradedeps=$deps_list"; - - $PostambleActionsListDeps = - '@$(PERL) -le "print for @ARGV" ' - . join(' ', map $Missing[$_], grep $_ % 2 == 0, 0..$#Missing); - - my @all = (@Missing, @Existing); - - $PostambleActionsListAllDeps = - '@$(PERL) -le "print for @ARGV" ' - . join(' ', map $all[$_], grep $_ % 2 == 0, 0..$#all); - - 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; - my $fragment; - - $fragment .= <<"AUTO_INSTALL" if !$InstallDepsTarget; - -config :: installdeps -\t\$(NOECHO) \$(NOOP) -AUTO_INSTALL - - $fragment .= <<"END_MAKE"; - -checkdeps :: -\t\$(PERL) $0 --checkdeps - -installdeps :: -\t$PostambleActions - -installdeps_notest :: -\t$PostambleActionsNoTest - -upgradedeps :: -\t$PostambleActionsUpgradeDeps - -upgradedeps_notest :: -\t$PostambleActionsUpgradeDepsNoTest - -listdeps :: -\t$PostambleActionsListDeps - -listalldeps :: -\t$PostambleActionsListAllDeps - -END_MAKE - - return $fragment; -} - -1; - -__END__ - -#line 1193 diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm deleted file mode 100644 index 4ecf46b..0000000 --- a/inc/Module/Install.pm +++ /dev/null @@ -1,470 +0,0 @@ -#line 1 -package Module::Install; - -# For any maintainers: -# The load order for Module::Install is a bit magic. -# It goes something like this... -# -# IF ( host has Module::Install installed, creating author mode ) { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to installed version of inc::Module::Install -# 3. The installed version of inc::Module::Install loads -# 4. inc::Module::Install calls "require Module::Install" -# 5. The ./inc/ version of Module::Install loads -# } ELSE { -# 1. Makefile.PL calls "use inc::Module::Install" -# 2. $INC{inc/Module/Install.pm} set to ./inc/ version of Module::Install -# 3. The ./inc/ version of Module::Install loads -# } - -use 5.005; -use strict 'vars'; -use Cwd (); -use File::Find (); -use File::Path (); - -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 = '1.06'; - - # Storage for the pseudo-singleton - $MAIN = undef; - - *inc::Module::Install::VERSION = *VERSION; - @inc::Module::Install::ISA = __PACKAGE__; - -} - -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__}; - -not: - - use ${\__PACKAGE__}; - -END_DIE - - # 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 - } - - - # 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" } - -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 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; - } - 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 = 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) = @_; - - 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::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"; - $args{wrote} = 0; - - bless( \%args, $class ); -} - -sub call { - my ($self, $method) = @_; - my $obj = $self->load($method) or return; - splice(@_, 0, 2, $obj); - goto &{$obj->can($method)}; -} - -sub load { - my ($self, $method) = @_; - - $self->load_extensions( - "$self->{prefix}/$self->{path}", $self - ) unless $self->{extensions}; - - foreach my $obj (@{$self->{extensions}}) { - return $obj if $obj->can($method); - } - - 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; - - $obj; -} - -sub load_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) ) { - my $content = Module::Install::_read($subpath . '.pm'); - my $in_pod = 0; - foreach ( split //, $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; -} - -# 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; - -# Copyright 2008 - 2012 Adam Kennedy. diff --git a/inc/Module/Install/AutoInstall.pm b/inc/Module/Install/AutoInstall.pm deleted file mode 100644 index 6efe4fe..0000000 --- a/inc/Module/Install/AutoInstall.pm +++ /dev/null @@ -1,93 +0,0 @@ -#line 1 -package Module::Install::AutoInstall; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -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; - - my @features_require = Module::AutoInstall->import( - (@config ? (-config => \@config) : ()), - (@core ? (-core => \@core) : ()), - $self->features, - ); - - my %seen; - my @requires = map @$_, map @$_, grep ref, $self->requires; - while (my ($mod, $ver) = splice(@requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - my @build_requires = map @$_, map @$_, grep ref, $self->build_requires; - while (my ($mod, $ver) = splice(@build_requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires; - while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) { - $seen{$mod}{$ver}++; - } - - my @deduped; - while (my ($mod, $ver) = splice(@features_require, 0, 2)) { - push @deduped, $mod => $ver unless $seen{$mod}{$ver}++; - } - - $self->requires(@deduped); - - $self->makemaker_args( Module::AutoInstall::_make_args() ); - - my $class = ref($self); - $self->postamble( - "# --- $class section:\n" . - Module::AutoInstall::postamble() - ); -} - -sub installdeps_target { - my ($self, @args) = @_; - - $self->include('Module::AutoInstall'); - require Module::AutoInstall; - - Module::AutoInstall::_installdeps_target(1); - - $self->auto_install(@args); -} - -sub auto_install_now { - my $self = shift; - $self->auto_install(@_); - Module::AutoInstall::do_install(); -} - -1; diff --git a/inc/Module/Install/AutoManifest.pm b/inc/Module/Install/AutoManifest.pm deleted file mode 100644 index 2fa78ed..0000000 --- a/inc/Module/Install/AutoManifest.pm +++ /dev/null @@ -1,45 +0,0 @@ -#line 1 -use strict; -use warnings; - -package Module::Install::AutoManifest; - -use Module::Install::Base; - -BEGIN { - our $VERSION = '0.003'; - our $ISCORE = 1; - our @ISA = qw(Module::Install::Base); -} - -sub auto_manifest { - my ($self) = @_; - - return unless $Module::Install::AUTHOR; - - die "auto_manifest requested, but no MANIFEST.SKIP exists\n" - unless -e "MANIFEST.SKIP"; - - if (-e "MANIFEST") { - unlink('MANIFEST') or die "Can't remove MANIFEST: $!"; - } - - $self->postamble(<<"END"); -create_distdir: manifest_clean manifest - -distclean :: manifest_clean - -manifest_clean: -\t\$(RM_F) MANIFEST -END - -} - -1; -__END__ - -#line 48 - -#line 131 - -1; # End of Module::Install::AutoManifest diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm deleted file mode 100644 index 802844a..0000000 --- a/inc/Module/Install/Base.pm +++ /dev/null @@ -1,83 +0,0 @@ -#line 1 -package Module::Install::Base; - -use strict 'vars'; -use vars qw{$VERSION}; -BEGIN { - $VERSION = '1.06'; -} - -# Suspend handler for "redefined" warnings -BEGIN { - my $w = $SIG{__WARN__}; - $SIG{__WARN__} = sub { $w }; -} - -#line 42 - -sub new { - 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 { - local $@; - my $func = eval { shift->_top->autoload } or return; - goto &$func; -} - -#line 75 - -sub _top { - $_[0]->{_top}; -} - -#line 90 - -sub admin { - $_[0]->_top->{admin} - or - Module::Install::Base::FakeAdmin->new; -} - -#line 106 - -sub is_admin { - ! $_[0]->admin->isa('Module::Install::Base::FakeAdmin'); -} - -sub DESTROY {} - -package Module::Install::Base::FakeAdmin; - -use vars qw{$VERSION}; -BEGIN { - $VERSION = $Module::Install::Base::VERSION; -} - -my $fake; - -sub new { - $fake ||= bless(\@_, $_[0]); -} - -sub AUTOLOAD {} - -sub DESTROY {} - -# Restore warning handler -BEGIN { - $SIG{__WARN__} = $SIG{__WARN__}->(); -} - -1; - -#line 159 diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm deleted file mode 100644 index 22167b8..0000000 --- a/inc/Module/Install/Can.pm +++ /dev/null @@ -1,154 +0,0 @@ -#line 1 -package Module::Install::Can; - -use strict; -use Config (); -use ExtUtils::MakeMaker (); -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# check if we can load some module -### Upgrade this to not have to load the module if possible -sub can_use { - my ($self, $mod, $ver) = @_; - $mod =~ s{::|\\}{/}g; - $mod .= '.pm' unless $mod =~ /\.pm$/i; - - my $pkg = $mod; - $pkg =~ s{/}{::}g; - $pkg =~ s{\.pm$}{}i; - - local $@; - eval { require $mod; $pkg->VERSION($ver || 0); 1 }; -} - -# Check if we can run some command -sub can_run { - my ($self, $cmd) = @_; - - my $_cmd = $cmd; - return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd)); - - for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') { - 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 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; - - # $Config{cc} may contain args; try to find out the program part - while (@chunks) { - return $self->can_run("@chunks") || (pop(@chunks), next); - } - - return; -} - -# Fix Cygwin bug on maybe_command(); -if ( $^O eq 'cygwin' ) { - require ExtUtils::MM_Cygwin; - require ExtUtils::MM_Win32; - if ( ! defined(&ExtUtils::MM_Cygwin::maybe_command) ) { - *ExtUtils::MM_Cygwin::maybe_command = sub { - my ($self, $file) = @_; - if ($file =~ m{^/cygdrive/}i and ExtUtils::MM_Win32->can('maybe_command')) { - ExtUtils::MM_Win32->maybe_command($file); - } else { - ExtUtils::MM_Unix->maybe_command($file); - } - } - } -} - -1; - -__END__ - -#line 236 diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm deleted file mode 100644 index bee0c4f..0000000 --- a/inc/Module/Install/Fetch.pm +++ /dev/null @@ -1,93 +0,0 @@ -#line 1 -package Module::Install::Fetch; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub get_file { - my ($self, %args) = @_; - 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) = - $args{url} =~ m|^(\w+)://([^/]+)(.+)/(.+)| or return; - } - - $|++; - print "Fetching '$file' from $host... "; - - unless (eval { require Socket; Socket::inet_aton($host) }) { - warn "'$host' resolve failed!\n"; - return; - } - - return unless $scheme eq 'ftp' or $scheme eq 'http'; - - require Cwd; - my $dir = Cwd::getcwd(); - chdir $args{local_dir} or return if exists $args{local_dir}; - - if (eval { require LWP::Simple; 1 }) { - LWP::Simple::mirror($args{url}, $file); - } - elsif (eval { require Net::FTP; 1 }) { eval { - # use Net::FTP to get past firewall - my $ftp = Net::FTP->new($host, Passive => 1, Timeout => 600); - $ftp->login("anonymous", 'anonymous@example.com'); - $ftp->cwd($path); - $ftp->binary; - $ftp->get($file) or (warn("$!\n"), return); - $ftp->quit; - } } - elsif (my $ftp = $self->can_run('ftp')) { eval { - # no Net::FTP, fallback to ftp.exe - require FileHandle; - my $fh = FileHandle->new; - - local $SIG{CHLD} = 'IGNORE'; - unless ($fh->open("|$ftp -n")) { - warn "Couldn't open ftp: $!\n"; - chdir $dir; return; - } - - my @dialog = split(/\n/, <<"END_FTP"); -open $host -user anonymous anonymous\@example.com -cd $path -binary -get $file $file -quit -END_FTP - foreach (@dialog) { $fh->print("$_\n") } - $fh->close; - } } - else { - warn "No working 'ftp' program available!\n"; - chdir $dir; return; - } - - unless (-f $file) { - warn "Fetching failed: $@\n"; - chdir $dir; return; - } - - return if exists $args{size} and -s $file != $args{size}; - system($args{run}) if exists $args{run}; - unlink($file) if $args{remove}; - - print(((!exists $args{check_for} or -e $args{check_for}) - ? "done!" : "failed! ($!)"), "\n"); - chdir $dir; return !$?; -} - -1; diff --git a/inc/Module/Install/Include.pm b/inc/Module/Install/Include.pm deleted file mode 100644 index 8310e4c..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 @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -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 deleted file mode 100644 index 7052f36..0000000 --- a/inc/Module/Install/Makefile.pm +++ /dev/null @@ -1,418 +0,0 @@ -#line 1 -package Module::Install::Makefile; - -use strict 'vars'; -use ExtUtils::MakeMaker (); -use Module::Install::Base (); -use Fcntl qw/:flock :seek/; - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -sub Makefile { $_[0] } - -my %seen = (); - -sub prompt { - shift; - - # Infinite loop protection - my @c = caller(); - if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) { - die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])"; - } - - # 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 { - goto &ExtUtils::MakeMaker::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, %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, -# append an argument to the current list. -sub makemaker_append { - my $self = shift; - my $name = shift; - my $args = $self->makemaker_args; - $args->{$name} = defined $args->{$name} - ? join( ' ', $args->{$name}, @_ ) - : join( ' ', @_ ); -} - -sub build_subdirs { - my $self = shift; - my $subdirs = $self->makemaker_args->{DIR} ||= []; - for my $subdir (@_) { - push @$subdirs, $subdir; - } -} - -sub clean_files { - my $self = shift; - my $clean = $self->makemaker_args->{clean} ||= {}; - %$clean = ( - %$clean, - FILES => join ' ', grep { length $_ } ($clean->{FILES} || (), @_), - ); -} - -sub realclean_files { - my $self = shift; - my $realclean = $self->makemaker_args->{realclean} ||= {}; - %$realclean = ( - %$realclean, - FILES => join ' ', grep { length $_ } ($realclean->{FILES} || (), @_), - ); -} - -sub libs { - my $self = shift; - my $libs = ref $_[0] ? shift : [ shift ]; - $self->makemaker_args( LIBS => $libs ); -} - -sub inc { - my $self = shift; - $self->makemaker_args( INC => shift ); -} - -sub _wanted_t { -} - -sub tests_recursive { - my $self = shift; - 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; - 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; - $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 ) { - 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 ) { - $args->{ABSTRACT} = $self->abstract; - $args->{AUTHOR} = join ', ', @{$self->author || []}; - } - if ( $self->makemaker(6.10) ) { - $args->{NO_META} = 1; - #$args->{NO_MYMETA} = 1; - } - 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; - } - - 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->configure_requires, $self->build_requires) - ); - - # 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 ($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; - } - } - - 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 $user_preop = delete $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); - $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile'); -} - -sub fix_up_makefile { - my $self = shift; - my $makefile_name = shift; - my $top_class = ref($self->_top) || ''; - my $top_version = $self->_top->VERSION || ''; - - my $preamble = $self->preamble - ? "# Preamble by $top_class $top_version\n" - . $self->preamble - : ''; - my $postamble = "# Postamble by $top_class $top_version\n" - . ($self->postamble || ''); - - local *MAKEFILE; - open MAKEFILE, "+< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!"; - eval { flock MAKEFILE, LOCK_EX }; - my $makefile = do { local $/; <MAKEFILE> }; - - $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /; - $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g; - $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g; - $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m; - $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m; - - # Module::Install will never be used to build the Core Perl - # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks - # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist - $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m; - #$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; - - # XXX - This is currently unused; not sure if it breaks other MM-users - # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg; - - seek MAKEFILE, 0, SEEK_SET; - truncate MAKEFILE, 0; - print MAKEFILE "$preamble$makefile$postamble" or die $!; - close MAKEFILE or die $!; - - 1; -} - -sub preamble { - my ($self, $text) = @_; - $self->{preamble} = $text . $self->{preamble} if defined $text; - $self->{preamble}; -} - -sub postamble { - my ($self, $text) = @_; - $self->{postamble} ||= $self->admin->postamble; - $self->{postamble} .= $text if defined $text; - $self->{postamble} -} - -1; - -__END__ - -#line 544 diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm deleted file mode 100644 index 58430f3..0000000 --- a/inc/Module/Install/Metadata.pm +++ /dev/null @@ -1,722 +0,0 @@ -#line 1 -package Module::Install::Metadata; - -use strict 'vars'; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -my @boolean_keys = qw{ - sign -}; - -my @scalar_keys = qw{ - name - module_name - abstract - version - distribution_type - tests - installdirs -}; - -my @tuple_keys = qw{ - configure_requires - build_requires - requires - recommends - bundles - resources -}; - -my @resource_keys = qw{ - homepage - bugtracker - repository -}; - -my @array_keys = qw{ - keywords - author -}; - -*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(@_) } - -# 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 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; -} - -# Convenience command -sub static_config { - shift->dynamic_config(0); -} - -sub perl_version { - my $self = shift; - 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}->{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; - 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->{values}{all_from} = $file; - - # 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; - - return 1; -} - -sub 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 || {} } ); -} - -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 $count = 0; - push @$features, ( - $name => [ - map { - ref($_) ? ( ref($_) eq 'HASH' ) ? %$_ : @$_ : $_ - } @$mods - ] - ); - - 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} } - : (); -} - -sub 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::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; -} - -sub version_from { - 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 { - require ExtUtils::MM_Unix; - my ( $self, $file ) = @_; - $self->abstract( - bless( - { DISTNAME => $self->name }, - 'ExtUtils::MM_Unix' - )->parse_abstract($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"); - } -} - -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 = 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 = 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"; - } -} - -#Stolen from M::B -my %license_urls = ( - perl => 'http://dev.perl.org/licenses/', - apache => 'http://apache.org/licenses/LICENSE-2.0', - apache_1_1 => 'http://apache.org/licenses/LICENSE-1.1', - artistic => 'http://opensource.org/licenses/artistic-license.php', - artistic_2 => 'http://opensource.org/licenses/artistic-license-2.0.php', - lgpl => 'http://opensource.org/licenses/lgpl-license.php', - lgpl2 => 'http://opensource.org/licenses/lgpl-2.1.php', - lgpl3 => 'http://opensource.org/licenses/lgpl-3.0.html', - bsd => 'http://opensource.org/licenses/bsd-license.php', - gpl => 'http://opensource.org/licenses/gpl-license.php', - gpl2 => 'http://opensource.org/licenses/gpl-2.0.php', - gpl3 => 'http://opensource.org/licenses/gpl-3.0.html', - mit => 'http://opensource.org/licenses/mit-license.php', - mozilla => 'http://opensource.org/licenses/mozilla1.1.php', - open_source => undef, - unrestricted => undef, - restrictive => undef, - unknown => undef, -); - -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, - 'Artistic and GPL' => 'perl', 1, - 'GNU general public license' => 'gpl', 1, - 'GNU public license' => 'gpl', 1, - 'GNU lesser general public license' => 'lgpl', 1, - 'GNU lesser public license' => 'lgpl', 1, - 'GNU library general public license' => 'lgpl', 1, - 'GNU library public license' => 'lgpl', 1, - 'GNU Free Documentation license' => 'unrestricted', 1, - 'GNU Affero General Public License' => 'open_source', 1, - '(?:Free)?BSD license' => 'bsd', 1, - 'Artistic license 2\.0' => 'artistic_2', 1, - 'Artistic license' => 'artistic', 1, - 'Apache (?:Software )?license' => 'apache', 1, - 'GPL' => 'gpl', 1, - 'LGPL' => 'lgpl', 1, - 'BSD' => 'bsd', 1, - 'Artistic' => 'artistic', 1, - 'MIT' => 'mit', 1, - 'Mozilla Public License' => 'mozilla', 1, - 'Q Public License' => 'open_source', 1, - 'OpenSSL License' => 'unrestricted', 1, - 'SSLeay License' => 'unrestricted', 1, - 'zlib License' => 'open_source', 1, - 'proprietary' => 'proprietary', 0, - ); - while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) { - $pattern =~ s#\s+#\\s+#gs; - if ( $license_text =~ /\b$pattern\b/i ) { - return $license; - } - } - 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; - - # 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 hashs - 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; diff --git a/inc/Module/Install/Package.pm b/inc/Module/Install/Package.pm deleted file mode 100644 index 47d5178..0000000 --- a/inc/Module/Install/Package.pm +++ /dev/null @@ -1,323 +0,0 @@ -#line 1 -## -# name: Module::Install::Package -# abstract: Module::Install support for Module::Package -# author: Ingy döt Net <ingy@cpan.org> -# license: perl -# copyright: 2011 -# see: -# - Module::Package - -# This module contains the Module::Package logic that must be available to -# both the Author and the End User. Author-only logic goes in a -# Module::Package::Plugin subclass. -package Module::Install::Package; -use strict; -use Module::Install::Base; -use vars qw'@ISA $VERSION'; -@ISA = 'Module::Install::Base'; -$VERSION = '0.30'; - -#-----------------------------------------------------------------------------# -# XXX BOOTBUGHACK -# This is here to try to get us out of Module-Package-0.11 cpantesters hell... -# Remove this when the situation has blown over. -sub pkg { - *inc::Module::Package::VERSION = sub { $VERSION }; - my $self = shift; - $self->module_package_internals_init($@); -} - -#-----------------------------------------------------------------------------# -# We allow the author to specify key/value options after the plugin. These -# options need to be available both at author time and install time. -#-----------------------------------------------------------------------------# -# OO accessor for command line options: -sub package_options { - @_>1?($_[0]->{package_options}=$_[1]):$_[0]->{package_options}} - -my $default_options = { - deps_list => 1, - install_bin => 1, - install_share => 1, - manifest_skip => 1, - requires_from => 1, -}; - -#-----------------------------------------------------------------------------# -# Module::Install plugin directives. Use long, ugly names to not pollute the -# Module::Install plugin namespace. These are only intended to be called from -# Module::Package. -#-----------------------------------------------------------------------------# - -# Module::Package starts off life as a normal call to this Module::Install -# plugin directive: -my $module_install_plugin; -my $module_package_plugin; -my $module_package_dist_plugin; -# XXX ARGVHACK This @argv thing is a temporary fix for an ugly bug somewhere in the -# Wikitext module usage. -my @argv; -sub module_package_internals_init { - my $self = $module_install_plugin = shift; - my ($plugin_spec, %options) = @_; - $self->package_options({%$default_options, %options}); - - if ($module_install_plugin->is_admin) { - $module_package_plugin = $self->_load_plugin($plugin_spec); - $module_package_plugin->mi($module_install_plugin); - $module_package_plugin->version_check($VERSION); - } - else { - $module_package_dist_plugin = $self->_load_dist_plugin($plugin_spec); - $module_package_dist_plugin->mi($module_install_plugin) if ref $module_package_dist_plugin; - } - # NOTE - This is the point in time where the body of Makefile.PL runs... - return; - - sub INIT { - return unless $module_install_plugin; - return if $Module::Package::ERROR; - eval { - if ($module_install_plugin->is_admin) { - $module_package_plugin->initial(); - $module_package_plugin->main(); - } - else { - $module_install_plugin->_initial(); - $module_package_dist_plugin->_initial() if ref $module_package_dist_plugin; - $module_install_plugin->_main(); - $module_package_dist_plugin->_main() if ref $module_package_dist_plugin; - } - }; - if ($@) { - $Module::Package::ERROR = $@; - die $@; - } - @argv = @ARGV; # XXX ARGVHACK - } - - # If this Module::Install plugin was used (by Module::Package) then wrap - # up any loose ends. This will get called after Makefile.PL has completed. - sub END { - @ARGV = @argv; # XXX ARGVHACK - return unless $module_install_plugin; - return if $Module::Package::ERROR; - $module_package_plugin - ? do { - $module_package_plugin->final; - $module_package_plugin->replicate_module_package; - } - : do { - $module_install_plugin->_final; - $module_package_dist_plugin->_final() if ref $module_package_dist_plugin; - } - } -} - -# Module::Package, Module::Install::Package and Module::Package::Plugin -# must all have the same version. Seems wise. -sub module_package_internals_version_check { - my ($self, $version) = @_; - return if $version < 0.1800001; # XXX BOOTBUGHACK!! - die <<"..." unless $version == $VERSION; - -Error! Something has gone awry: - Module::Package version=$version is using - Module::Install::Package version=$VERSION -If you are the author of this module, try upgrading Module::Package. -Otherwise, please notify the author of this error. - -... -} - -# Find and load the author side plugin: -sub _load_plugin { - my ($self, $spec, $namespace) = @_; - $spec ||= ''; - $namespace ||= 'Module::Package'; - my $version = ''; - $Module::Package::plugin_version = 0; - if ($spec =~ s/\s+(\S+)\s*//) { - $version = $1; - $Module::Package::plugin_version = $version; - } - my ($module, $plugin) = - not($spec) ? ('Plugin', "Plugin::basic") : - ($spec =~ /^\w(\w|::)*$/) ? ($spec, $spec) : - ($spec =~ /^:(\w+)$/) ? ('Plugin', "Plugin::$1") : - ($spec =~ /^(\S*\w):(\w+)$/) ? ($1, "$1::$2") : - die "$spec is invalid"; - $module = "${namespace}::${module}"; - $plugin = "${namespace}::${plugin}"; - eval "use $module $version (); 1" or die $@; - return $plugin->new(); -} - -# Find and load the user side plugin: -sub _load_dist_plugin { - my ($self, $spec, $namespace) = @_; - $spec ||= ''; - $namespace ||= 'Module::Package::Dist'; - my $r = eval { $self->_load_plugin($spec, $namespace); }; - return $r if ref $r; - return; -} - -#-----------------------------------------------------------------------------# -# These are the user side analogs to the author side plugin API calls. -# Prefix with '_' to not pollute Module::Install plugin space. -#-----------------------------------------------------------------------------# -sub _initial { - my ($self) = @_; -} - -sub _main { - my ($self) = @_; -} - -# NOTE These must match Module::Package::Plugin::final. -sub _final { - my ($self) = @_; - $self->_all_from; - $self->_requires_from; - $self->_install_bin; - $self->_install_share; - $self->_WriteAll; -} - -#-----------------------------------------------------------------------------# -# This section is where all the useful code bits go. These bits are needed by -# both Author and User side runs. -#-----------------------------------------------------------------------------# - -my $all_from = 0; -sub _all_from { - my $self = shift; - return if $all_from++; - return if $self->name; - my $file = shift || "$main::PM" or die "all_from has no file"; - $self->all_from($file); -} - -my $requires_from = 0; -sub _requires_from { - my $self = shift; - return if $requires_from++; - return unless $self->package_options->{requires_from}; - my $file = shift || "$main::PM" or die "requires_from has no file"; - $self->requires_from($main::PM) -} - -my $install_bin = 0; -sub _install_bin { - my $self = shift; - return if $install_bin++; - return unless $self->package_options->{install_bin}; - return unless -d 'bin'; - my @bin; - File::Find::find(sub { - return unless -f $_; - push @bin, $File::Find::name; - }, 'bin'); - $self->install_script($_) for @bin; -} - -my $install_share = 0; -sub _install_share { - my $self = shift; - return if $install_share++; - return unless $self->package_options->{install_share}; - return unless -d 'share'; - $self->install_share; -} - -my $WriteAll = 0; -sub _WriteAll { - my $self = shift; - return if $WriteAll++; - $self->WriteAll(@_); -} - -# Base package for Module::Package plugin distributed components. -package Module::Package::Dist; - -sub new { - my ($class, %args) = @_; - bless \%args, $class; -} - -sub mi { - @_ > 1 ? ($_[0]->{mi}=$_[1]) : $_[0]->{mi}; -} - -sub _initial { - my ($self) = @_; -} - -sub _main { - my ($self) = @_; -} - -sub _final { - my ($self) = @_; -} - -1; - -#-----------------------------------------------------------------------------# -# Take a guess at the primary .pm and .pod files for 'all_from', and friends. -# Put them in global magical vars in the main:: namespace. -#-----------------------------------------------------------------------------# -package Module::Package::PM; -use overload '""' => sub { - $_[0]->guess_pm unless @{$_[0]}; - return $_[0]->[0]; -}; -sub set { $_[0]->[0] = $_[1] } -sub guess_pm { - my $pm = ''; - my $self = shift; - if (-e 'META.yml') { - open META, 'META.yml' or die "Can't open 'META.yml' for input:\n$!"; - my $meta = do { local $/; <META> }; - close META; - $meta =~ /^module_name: (\S+)$/m - or die "Can't get module_name from META.yml"; - $pm = $1; - $pm =~ s!::!/!g; - $pm = "lib/$pm.pm"; - } - else { - require File::Find; - my @array = (); - File::Find::find(sub { - return unless /\.pm$/; - my $name = $File::Find::name; - my $num = ($name =~ s!/+!/!g); - my $ary = $array[$num] ||= []; - push @$ary, $name; - }, 'lib'); - shift @array while @array and not defined $array[0]; - die "Can't guess main module" unless @array; - (($pm) = sort @{$array[0]}) or - die "Can't guess main module"; - } - my $pmc = $pm . 'c'; - $pm = $pmc if -e $pmc; - $self->set($pm); -} -$main::PM = bless [$main::PM ? ($main::PM) : ()], __PACKAGE__; - -package Module::Package::POD; -use overload '""' => sub { - return $_[0]->[0] if @{$_[0]}; - (my $pod = "$main::PM") =~ s/\.pm/.pod/ - or die "Module::Package's \$main::PM value should end in '.pm'"; - return -e $pod ? $pod : ''; -}; -sub set { $_[0][0] = $_[1] } -$main::POD = bless [$main::POD ? ($main::POD) : ()], __PACKAGE__; - -1; - diff --git a/inc/Module/Install/TrustMetaYml.pm b/inc/Module/Install/TrustMetaYml.pm deleted file mode 100644 index 5e9d70d..0000000 --- a/inc/Module/Install/TrustMetaYml.pm +++ /dev/null @@ -1,50 +0,0 @@ -#line 1 -package Module::Install::TrustMetaYml; - -use 5.005; -use strict; - -BEGIN { - $Module::Install::TrustMetaYml::AUTHORITY = 'cpan:TOBYINK'; - $Module::Install::TrustMetaYml::VERSION = '0.003'; -} - -use base qw(Module::Install::Base); - -sub trust_meta_yml -{ - my ($self, $where) = @_; - $where ||= 'META.yml'; - - $self->perl_version('5.005') unless defined $self->perl_version; - - $self->include('YAML::Tiny', 0); - return $self if $self->is_admin; - - require YAML::Tiny; - my $data = YAML::Tiny::LoadFile($where); - - $self->perl_version($data->{requires}{perl} || '5.005'); - - KEY: foreach my $key (qw(requires recommends build_requires)) - { - next KEY unless ref $data->{$key} eq 'HASH'; - my %deps = %{$data->{$key}}; - DEP: while (my ($pkg, $ver) = each %deps) - { - next if $pkg eq 'perl'; - $self->$key($pkg, $ver); - } - } - - return $self; -} - -*trust_meta_yaml = \&trust_meta_yml; - -1; - -__END__ - -=encoding utf8 - diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm deleted file mode 100644 index eeaa3fe..0000000 --- a/inc/Module/Install/Win32.pm +++ /dev/null @@ -1,64 +0,0 @@ -#line 1 -package Module::Install::Win32; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @ISA = 'Module::Install::Base'; - $ISCORE = 1; -} - -# determine if the user needs nmake, and download it if needed -sub check_nmake { - my $self = shift; - $self->load('can_run'); - $self->load('get_file'); - - require Config; - return unless ( - $^O eq 'MSWin32' and - $Config::Config{make} and - $Config::Config{make} =~ /^nmake\b/i and - ! $self->can_run('nmake') - ); - - print "The required 'nmake' executable not found, fetching it...\n"; - - require File::Basename; - my $rv = $self->get_file( - url => 'http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe', - ftp_url => 'ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe', - local_dir => File::Basename::dirname($^X), - size => 51928, - run => 'Nmake15.exe /o > nul', - check_for => 'Nmake.exe', - remove => 1, - ); - - die <<'END_MESSAGE' unless $rv; - -------------------------------------------------------------------------------- - -Since you are using Microsoft Windows, you will need the 'nmake' utility -before installation. It's available at: - - http://download.microsoft.com/download/vc15/Patch/1.52/W95/EN-US/Nmake15.exe - or - ftp://ftp.microsoft.com/Softlib/MSLFILES/Nmake15.exe - -Please download the file manually, save it to a directory in %PATH% (e.g. -C:\WINDOWS\COMMAND\), then launch the MS-DOS command line shell, "cd" to -that directory, and run "Nmake15.exe" from there; that will create the -'nmake.exe' file needed by this module. - -You may then resume the installation process described in README. - -------------------------------------------------------------------------------- -END_MESSAGE - -} - -1; diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm deleted file mode 100644 index 85d8018..0000000 --- a/inc/Module/Install/WriteAll.pm +++ /dev/null @@ -1,63 +0,0 @@ -#line 1 -package Module::Install::WriteAll; - -use strict; -use Module::Install::Base (); - -use vars qw{$VERSION @ISA $ISCORE}; -BEGIN { - $VERSION = '1.06'; - @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->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; diff --git a/inc/Module/Package.pm b/inc/Module/Package.pm deleted file mode 100644 index 7ea98a9..0000000 --- a/inc/Module/Package.pm +++ /dev/null @@ -1,71 +0,0 @@ -#line 1 -## -# name: Module::Package -# abstract: Postmodern Perl Module Packaging -# author: Ingy döt Net <ingy@cpan.org> -# license: perl -# copyright: 2011 -# see: -# - Module::Package::Plugin -# - Module::Install::Package -# - Module::Package::Tutorial - -package Module::Package; -use 5.005; -use strict; - -BEGIN { - $Module::Package::VERSION = '0.30'; - $inc::Module::Package::VERSION ||= $Module::Package::VERSION; - @inc::Module::Package::ISA = __PACKAGE__; -} - -sub import { - my $class = shift; - $INC{'inc/Module/Install.pm'} = __FILE__; - unshift @INC, 'inc' unless $INC[0] eq 'inc'; - eval "use Module::Install 1.01 (); 1" or $class->error($@); - - package main; - Module::Install->import(); - eval { - module_package_internals_version_check($Module::Package::VERSION); - module_package_internals_init(@_); - }; - if ($@) { - $Module::Package::ERROR = $@; - die $@; - } -} - -# XXX Remove this when things are stable. -sub error { - my ($class, $error) = @_; - if (-e 'inc' and not -e 'inc/.author') { - require Data::Dumper; - $Data::Dumper::Sortkeys = 1; - my $dump1 = Data::Dumper::Dumper(\%INC); - my $dump2 = Data::Dumper::Dumper(\@INC); - die <<"..."; -This should not have happened. Hopefully this dump will explain the problem: - -inc::Module::Package: $inc::Module::Package::VERSION -Module::Package: $Module::Package::VERSION -inc::Module::Install: $inc::Module::Install::VERSION -Module::Install: $Module::Install::VERSION - -Error: $error - -%INC: -$dump1 -\@INC: -$dump2 -... - } - else { - die $error; - } -} - -1; - diff --git a/inc/Module/Package/Dist/RDF.pm b/inc/Module/Package/Dist/RDF.pm deleted file mode 100644 index 7ff158b..0000000 --- a/inc/Module/Package/Dist/RDF.pm +++ /dev/null @@ -1,47 +0,0 @@ -#line 1 -package Module::Package::Dist::RDF; - -my $explanation = q< - This is the component of Module::Package::RDF which gets - bundled with the distribution. ->; - -use 5.005; -use strict; - -BEGIN { - $Module::Package::Dist::RDF::AUTHORITY = 'cpan:TOBYINK'; - $Module::Package::Dist::RDF::VERSION = '0.012'; - @Module::Package::Dist::RDF::ISA = 'Module::Package::Dist'; -} - -sub _main -{ - my ($self) = @_; - $self->mi->trust_meta_yml; - $self->mi->auto_install; -} - -{ - package Module::Package::Dist::RDF::standard; - use 5.005; - use strict; - BEGIN { - $Module::Package::Dist::RDF::standard::AUTHORITY = 'cpan:TOBYINK'; - $Module::Package::Dist::RDF::standard::VERSION = '0.012'; - @Module::Package::Dist::RDF::standard::ISA = 'Module::Package::Dist::RDF'; - } -} - -{ - package Module::Package::Dist::RDF::tobyink; - use 5.005; - use strict; - BEGIN { - $Module::Package::Dist::RDF::tobyink::AUTHORITY = 'cpan:TOBYINK'; - $Module::Package::Dist::RDF::tobyink::VERSION = '0.012'; - @Module::Package::Dist::RDF::tobyink::ISA = 'Module::Package::Dist::RDF'; - } -} - -1; diff --git a/inc/YAML/Tiny.pm b/inc/YAML/Tiny.pm deleted file mode 100644 index c0c2a22..0000000 --- a/inc/YAML/Tiny.pm +++ /dev/null @@ -1,643 +0,0 @@ -#line 1 -package YAML::Tiny; - -use strict; - -# UTF Support? -sub HAVE_UTF8 () { $] >= 5.007003 } -BEGIN { - if ( HAVE_UTF8 ) { - # The string eval helps hide this from Test::MinimumVersion - eval "require utf8;"; - die "Failed to load UTF-8 support" if $@; - } - - # Class structure - require 5.004; - require Exporter; - require Carp; - $YAML::Tiny::VERSION = '1.51'; - # $YAML::Tiny::VERSION = eval $YAML::Tiny::VERSION; - @YAML::Tiny::ISA = qw{ Exporter }; - @YAML::Tiny::EXPORT = qw{ Load Dump }; - @YAML::Tiny::EXPORT_OK = qw{ LoadFile DumpFile freeze thaw }; - - # Error storage - $YAML::Tiny::errstr = ''; -} - -# The character class of all characters we need to escape -# NOTE: Inlined, since it's only used once -# my $RE_ESCAPE = '[\\x00-\\x08\\x0b-\\x0d\\x0e-\\x1f\"\n]'; - -# Printed form of the unprintable characters in the lowest range -# of ASCII characters, listed by ASCII ordinal position. -my @UNPRINTABLE = qw( - z x01 x02 x03 x04 x05 x06 a - x08 t n v f r x0e x0f - x10 x11 x12 x13 x14 x15 x16 x17 - x18 x19 x1a e x1c x1d x1e x1f -); - -# Printable characters for escapes -my %UNESCAPES = ( - z => "\x00", a => "\x07", t => "\x09", - n => "\x0a", v => "\x0b", f => "\x0c", - r => "\x0d", e => "\x1b", '\\' => '\\', -); - -# Special magic boolean words -my %QUOTE = map { $_ => 1 } qw{ - null Null NULL - y Y yes Yes YES n N no No NO - true True TRUE false False FALSE - on On ON off Off OFF -}; - - - - - -##################################################################### -# Implementation - -# Create an empty YAML::Tiny object -sub new { - my $class = shift; - bless [ @_ ], $class; -} - -# Create an object from a file -sub read { - my $class = ref $_[0] ? ref shift : shift; - - # Check the file - my $file = shift or return $class->_error( 'You did not specify a file name' ); - return $class->_error( "File '$file' does not exist" ) unless -e $file; - return $class->_error( "'$file' is a directory, not a file" ) unless -f _; - return $class->_error( "Insufficient permissions to read '$file'" ) unless -r _; - - # Slurp in the file - local $/ = undef; - local *CFG; - unless ( open(CFG, $file) ) { - return $class->_error("Failed to open file '$file': $!"); - } - my $contents = <CFG>; - unless ( close(CFG) ) { - return $class->_error("Failed to close file '$file': $!"); - } - - $class->read_string( $contents ); -} - -# Create an object from a string -sub read_string { - my $class = ref $_[0] ? ref shift : shift; - my $self = bless [], $class; - my $string = $_[0]; - eval { - unless ( defined $string ) { - die \"Did not provide a string to load"; - } - - # Byte order marks - # NOTE: Keeping this here to educate maintainers - # my %BOM = ( - # "\357\273\277" => 'UTF-8', - # "\376\377" => 'UTF-16BE', - # "\377\376" => 'UTF-16LE', - # "\377\376\0\0" => 'UTF-32LE' - # "\0\0\376\377" => 'UTF-32BE', - # ); - if ( $string =~ /^(?:\376\377|\377\376|\377\376\0\0|\0\0\376\377)/ ) { - die \"Stream has a non UTF-8 BOM"; - } else { - # Strip UTF-8 bom if found, we'll just ignore it - $string =~ s/^\357\273\277//; - } - - # Try to decode as utf8 - utf8::decode($string) if HAVE_UTF8; - - # Check for some special cases - return $self unless length $string; - unless ( $string =~ /[\012\015]+\z/ ) { - die \"Stream does not end with newline character"; - } - - # Split the file into lines - my @lines = grep { ! /^\s*(?:\#.*)?\z/ } - split /(?:\015{1,2}\012|\015|\012)/, $string; - - # Strip the initial YAML header - @lines and $lines[0] =~ /^\%YAML[: ][\d\.]+.*\z/ and shift @lines; - - # A nibbling parser - while ( @lines ) { - # Do we have a document header? - if ( $lines[0] =~ /^---\s*(?:(.+)\s*)?\z/ ) { - # Handle scalar documents - shift @lines; - if ( defined $1 and $1 !~ /^(?:\#.+|\%YAML[: ][\d\.]+)\z/ ) { - push @$self, $self->_read_scalar( "$1", [ undef ], \@lines ); - next; - } - } - - if ( ! @lines or $lines[0] =~ /^(?:---|\.\.\.)/ ) { - # A naked document - push @$self, undef; - while ( @lines and $lines[0] !~ /^---/ ) { - shift @lines; - } - - } elsif ( $lines[0] =~ /^\s*\-/ ) { - # An array at the root - my $document = [ ]; - push @$self, $document; - $self->_read_array( $document, [ 0 ], \@lines ); - - } elsif ( $lines[0] =~ /^(\s*)\S/ ) { - # A hash at the root - my $document = { }; - push @$self, $document; - $self->_read_hash( $document, [ length($1) ], \@lines ); - - } else { - die \"YAML::Tiny failed to classify the line '$lines[0]'"; - } - } - }; - if ( ref $@ eq 'SCALAR' ) { - return $self->_error(${$@}); - } elsif ( $@ ) { - require Carp; - Carp::croak($@); - } - - return $self; -} - -# Deparse a scalar string to the actual scalar -sub _read_scalar { - my ($self, $string, $indent, $lines) = @_; - - # Trim trailing whitespace - $string =~ s/\s*\z//; - - # Explitic null/undef - return undef if $string eq '~'; - - # Single quote - if ( $string =~ /^\'(.*?)\'(?:\s+\#.*)?\z/ ) { - return '' unless defined $1; - $string = $1; - $string =~ s/\'\'/\'/g; - return $string; - } - - # Double quote. - # The commented out form is simpler, but overloaded the Perl regex - # engine due to recursion and backtracking problems on strings - # larger than 32,000ish characters. Keep it for reference purposes. - # if ( $string =~ /^\"((?:\\.|[^\"])*)\"\z/ ) { - if ( $string =~ /^\"([^\\"]*(?:\\.[^\\"]*)*)\"(?:\s+\#.*)?\z/ ) { - # Reusing the variable is a little ugly, - # but avoids a new variable and a string copy. - $string = $1; - $string =~ s/\\"/"/g; - $string =~ s/\\([never\\fartz]|x([0-9a-fA-F]{2}))/(length($1)>1)?pack("H2",$2):$UNESCAPES{$1}/gex; - return $string; - } - - # Special cases - if ( $string =~ /^[\'\"!&]/ ) { - die \"YAML::Tiny does not support a feature in line '$string'"; - } - return {} if $string =~ /^{}(?:\s+\#.*)?\z/; - return [] if $string =~ /^\[\](?:\s+\#.*)?\z/; - - # Regular unquoted string - if ( $string !~ /^[>|]/ ) { - if ( - $string =~ /^(?:-(?:\s|$)|[\@\%\`])/ - or - $string =~ /:(?:\s|$)/ - ) { - die \"YAML::Tiny found illegal characters in plain scalar: '$string'"; - } - $string =~ s/\s+#.*\z//; - return $string; - } - - # Error - die \"YAML::Tiny failed to find multi-line scalar content" unless @$lines; - - # Check the indent depth - $lines->[0] =~ /^(\s*)/; - $indent->[-1] = length("$1"); - if ( defined $indent->[-2] and $indent->[-1] <= $indent->[-2] ) { - die \"YAML::Tiny found bad indenting in line '$lines->[0]'"; - } - - # Pull the lines - my @multiline = (); - while ( @$lines ) { - $lines->[0] =~ /^(\s*)/; - last unless length($1) >= $indent->[-1]; - push @multiline, substr(shift(@$lines), length($1)); - } - - my $j = (substr($string, 0, 1) eq '>') ? ' ' : "\n"; - my $t = (substr($string, 1, 1) eq '-') ? '' : "\n"; - return join( $j, @multiline ) . $t; -} - -# Parse an array -sub _read_array { - my ($self, $array, $indent, $lines) = @_; - - while ( @$lines ) { - # Check for a new document - if ( $lines->[0] =~ /^(?:---|\.\.\.)/ ) { - while ( @$lines and $lines->[0] !~ /^---/ ) { - shift @$lines; - } - return 1; - } - - # Check the indent level - $lines->[0] =~ /^(\s*)/; - if ( length($1) < $indent->[-1] ) { - return 1; - } elsif ( length($1) > $indent->[-1] ) { - die \"YAML::Tiny found bad indenting in line '$lines->[0]'"; - } - - if ( $lines->[0] =~ /^(\s*\-\s+)[^\'\"]\S*\s*:(?:\s+|$)/ ) { - # Inline nested hash - my $indent2 = length("$1"); - $lines->[0] =~ s/-/ /; - push @$array, { }; - $self->_read_hash( $array->[-1], [ @$indent, $indent2 ], $lines ); - - } elsif ( $lines->[0] =~ /^\s*\-(\s*)(.+?)\s*\z/ ) { - # Array entry with a value - shift @$lines; - push @$array, $self->_read_scalar( "$2", [ @$indent, undef ], $lines ); - - } elsif ( $lines->[0] =~ /^\s*\-\s*\z/ ) { - shift @$lines; - unless ( @$lines ) { - push @$array, undef; - return 1; - } - if ( $lines->[0] =~ /^(\s*)\-/ ) { - my $indent2 = length("$1"); - if ( $indent->[-1] == $indent2 ) { - # Null array entry - push @$array, undef; - } else { - # Naked indenter - push @$array, [ ]; - $self->_read_array( $array->[-1], [ @$indent, $indent2 ], $lines ); - } - - } elsif ( $lines->[0] =~ /^(\s*)\S/ ) { - push @$array, { }; - $self->_read_hash( $array->[-1], [ @$indent, length("$1") ], $lines ); - - } else { - die \"YAML::Tiny failed to classify line '$lines->[0]'"; - } - - } elsif ( defined $indent->[-2] and $indent->[-1] == $indent->[-2] ) { - # This is probably a structure like the following... - # --- - # foo: - # - list - # bar: value - # - # ... so lets return and let the hash parser handle it - return 1; - - } else { - die \"YAML::Tiny failed to classify line '$lines->[0]'"; - } - } - - return 1; -} - -# Parse an array -sub _read_hash { - my ($self, $hash, $indent, $lines) = @_; - - while ( @$lines ) { - # Check for a new document - if ( $lines->[0] =~ /^(?:---|\.\.\.)/ ) { - while ( @$lines and $lines->[0] !~ /^---/ ) { - shift @$lines; - } - return 1; - } - - # Check the indent level - $lines->[0] =~ /^(\s*)/; - if ( length($1) < $indent->[-1] ) { - return 1; - } elsif ( length($1) > $indent->[-1] ) { - die \"YAML::Tiny found bad indenting in line '$lines->[0]'"; - } - - # Get the key - unless ( $lines->[0] =~ s/^\s*([^\'\" ][^\n]*?)\s*:(\s+(?:\#.*)?|$)// ) { - if ( $lines->[0] =~ /^\s*[?\'\"]/ ) { - die \"YAML::Tiny does not support a feature in line '$lines->[0]'"; - } - die \"YAML::Tiny failed to classify line '$lines->[0]'"; - } - my $key = $1; - - # Do we have a value? - if ( length $lines->[0] ) { - # Yes - $hash->{$key} = $self->_read_scalar( shift(@$lines), [ @$indent, undef ], $lines ); - } else { - # An indent - shift @$lines; - unless ( @$lines ) { - $hash->{$key} = undef; - return 1; - } - if ( $lines->[0] =~ /^(\s*)-/ ) { - $hash->{$key} = []; - $self->_read_array( $hash->{$key}, [ @$indent, length($1) ], $lines ); - } elsif ( $lines->[0] =~ /^(\s*)./ ) { - my $indent2 = length("$1"); - if ( $indent->[-1] >= $indent2 ) { - # Null hash entry - $hash->{$key} = undef; - } else { - $hash->{$key} = {}; - $self->_read_hash( $hash->{$key}, [ @$indent, length($1) ], $lines ); - } - } - } - } - - return 1; -} - -# Save an object to a file -sub write { - my $self = shift; - my $file = shift or return $self->_error('No file name provided'); - - # Write it to the file - open( CFG, '>' . $file ) or return $self->_error( - "Failed to open file '$file' for writing: $!" - ); - print CFG $self->write_string; - close CFG; - - return 1; -} - -# Save an object to a string -sub write_string { - my $self = shift; - return '' unless @$self; - - # Iterate over the documents - my $indent = 0; - my @lines = (); - foreach my $cursor ( @$self ) { - push @lines, '---'; - - # An empty document - if ( ! defined $cursor ) { - # Do nothing - - # A scalar document - } elsif ( ! ref $cursor ) { - $lines[-1] .= ' ' . $self->_write_scalar( $cursor, $indent ); - - # A list at the root - } elsif ( ref $cursor eq 'ARRAY' ) { - unless ( @$cursor ) { - $lines[-1] .= ' []'; - next; - } - push @lines, $self->_write_array( $cursor, $indent, {} ); - - # A hash at the root - } elsif ( ref $cursor eq 'HASH' ) { - unless ( %$cursor ) { - $lines[-1] .= ' {}'; - next; - } - push @lines, $self->_write_hash( $cursor, $indent, {} ); - - } else { - Carp::croak("Cannot serialize " . ref($cursor)); - } - } - - join '', map { "$_\n" } @lines; -} - -sub _write_scalar { - my $string = $_[1]; - return '~' unless defined $string; - return "''" unless length $string; - if ( $string =~ /[\x00-\x08\x0b-\x0d\x0e-\x1f\"\'\n]/ ) { - $string =~ s/\\/\\\\/g; - $string =~ s/"/\\"/g; - $string =~ s/\n/\\n/g; - $string =~ s/([\x00-\x1f])/\\$UNPRINTABLE[ord($1)]/g; - return qq|"$string"|; - } - if ( $string =~ /(?:^\W|\s|:\z)/ or $QUOTE{$string} ) { - return "'$string'"; - } - return $string; -} - -sub _write_array { - my ($self, $array, $indent, $seen) = @_; - if ( $seen->{refaddr($array)}++ ) { - die "YAML::Tiny does not support circular references"; - } - my @lines = (); - foreach my $el ( @$array ) { - my $line = (' ' x $indent) . '-'; - my $type = ref $el; - if ( ! $type ) { - $line .= ' ' . $self->_write_scalar( $el, $indent + 1 ); - push @lines, $line; - - } elsif ( $type eq 'ARRAY' ) { - if ( @$el ) { - push @lines, $line; - push @lines, $self->_write_array( $el, $indent + 1, $seen ); - } else { - $line .= ' []'; - push @lines, $line; - } - - } elsif ( $type eq 'HASH' ) { - if ( keys %$el ) { - push @lines, $line; - push @lines, $self->_write_hash( $el, $indent + 1, $seen ); - } else { - $line .= ' {}'; - push @lines, $line; - } - - } else { - die "YAML::Tiny does not support $type references"; - } - } - - @lines; -} - -sub _write_hash { - my ($self, $hash, $indent, $seen) = @_; - if ( $seen->{refaddr($hash)}++ ) { - die "YAML::Tiny does not support circular references"; - } - my @lines = (); - foreach my $name ( sort keys %$hash ) { - my $el = $hash->{$name}; - my $line = (' ' x $indent) . "$name:"; - my $type = ref $el; - if ( ! $type ) { - $line .= ' ' . $self->_write_scalar( $el, $indent + 1 ); - push @lines, $line; - - } elsif ( $type eq 'ARRAY' ) { - if ( @$el ) { - push @lines, $line; - push @lines, $self->_write_array( $el, $indent + 1, $seen ); - } else { - $line .= ' []'; - push @lines, $line; - } - - } elsif ( $type eq 'HASH' ) { - if ( keys %$el ) { - push @lines, $line; - push @lines, $self->_write_hash( $el, $indent + 1, $seen ); - } else { - $line .= ' {}'; - push @lines, $line; - } - - } else { - die "YAML::Tiny does not support $type references"; - } - } - - @lines; -} - -# Set error -sub _error { - $YAML::Tiny::errstr = $_[1]; - undef; -} - -# Retrieve error -sub errstr { - $YAML::Tiny::errstr; -} - - - - - -##################################################################### -# YAML Compatibility - -sub Dump { - YAML::Tiny->new(@_)->write_string; -} - -sub Load { - my $self = YAML::Tiny->read_string(@_); - unless ( $self ) { - Carp::croak("Failed to load YAML document from string"); - } - if ( wantarray ) { - return @$self; - } else { - # To match YAML.pm, return the last document - return $self->[-1]; - } -} - -BEGIN { - *freeze = *Dump; - *thaw = *Load; -} - -sub DumpFile { - my $file = shift; - YAML::Tiny->new(@_)->write($file); -} - -sub LoadFile { - my $self = YAML::Tiny->read($_[0]); - unless ( $self ) { - Carp::croak("Failed to load YAML document from '" . ($_[0] || '') . "'"); - } - if ( wantarray ) { - return @$self; - } else { - # Return only the last document to match YAML.pm, - return $self->[-1]; - } -} - - - - - -##################################################################### -# Use Scalar::Util if possible, otherwise emulate it - -BEGIN { - local $@; - eval { - require Scalar::Util; - }; - my $v = eval("$Scalar::Util::VERSION") || 0; - if ( $@ or $v < 1.18 ) { - eval <<'END_PERL'; -# Scalar::Util failed to load or too old -sub refaddr { - my $pkg = ref($_[0]) or return undef; - if ( !! UNIVERSAL::can($_[0], 'can') ) { - bless $_[0], 'Scalar::Util::Fake'; - } else { - $pkg = undef; - } - "$_[0]" =~ /0x(\w+)/; - my $i = do { local $^W; hex $1 }; - bless $_[0], $pkg if defined $pkg; - $i; -} -END_PERL - } else { - *refaddr = *Scalar::Util::refaddr; - } -} - -1; - -__END__ - -#line 1175 diff --git a/lib/MooX/late.pm b/lib/MooX/late.pm index 941168d..856385c 100644 --- a/lib/MooX/late.pm +++ b/lib/MooX/late.pm @@ -4,7 +4,7 @@ use warnings; package MooX::late; our $AUTHORITY = 'cpan:TOBYINK'; -our $VERSION = '0.014'; +our $VERSION = '0.015'; use Moo qw( ); use Carp qw( carp croak ); @@ -14,7 +14,7 @@ use Module::Runtime qw( is_module_name ); BEGIN { package MooX::late::DefinitionContext; our $AUTHORITY = 'cpan:TOBYINK'; - our $VERSION = '0.014'; + our $VERSION = '0.015'; use Moo; use overload ( @@ -61,7 +61,7 @@ BEGIN { # sub _handlers { - qw( isa coerce lazy_build traits ); + qw( isa does lazy_build traits ); } # SUBCLASSING @@ -157,7 +157,6 @@ sub _install_sugar $installer->($caller, confess => \&Carp::confess); } -my %registry; sub _handle_isa { my $me = shift; @@ -170,31 +169,15 @@ sub _handle_isa return; } -sub _handle_coerce +sub _handle_does { my $me = shift; my ($name, $spec, $context, $class) = @_; + return unless defined $spec->{does}; - my $c = $spec->{coerce}; - my $i = $spec->{isa}; + require Types::Standard; + $spec->{isa} = Types::Standard::ConsumerOf()->of($spec->{does}); - if (defined($c) and !ref($c) and $c == 1) - { - if (blessed($i) and $i->isa('Type::Tiny') and $i->has_coercion) - { - $spec->{coerce} = $i->coercion; - } - elsif (blessed($i) and $i->can('has_coercion') and $i->has_coercion and $i->can('coerce')) - { - $spec->{coerce} = sub { $i->coerce(@_) }; - } - } - - if (defined($c) and !ref($c) and $c eq 0) - { - delete($spec->{coerce}); - } - return; } @@ -350,22 +333,15 @@ MooX::late does the following: =item 1. -Allows C<< isa => $string >> to work when defining attributes for all -Moose's built-in type constraints (and assumes other strings are package -names). - -This feature requires L<Types::Standard>. +Supports C<< isa => $stringytype >>. =item 2. -B<< Retired feature: >> this is now built in to Moo. - -Allows C<< default => $non_reference_value >> to work when defining -attributes. +Supports C<< does => $rolename >> . =item 3. -Allows C<< lazy_build => 1 >> to work when defining attributes. +Supports C<< lazy_build => 1 >>. =item 4. @@ -381,11 +357,6 @@ supported because of internal implementation details of Moo. If you need another attribute trait to be supported, let me know and I will consider it. -=item 6. - -Supports C<< coerce => 1 >> if the type constraint is a blessed object -implementing L<Type::API::Constraint::Coercible>. - =back Five features. It is not the aim of C<MooX::late> to make every aspect of @@ -393,6 +364,10 @@ Moo behave exactly identically to Moose. It's just going after the low-hanging fruit. So it does five things right now, and I promise that future versions will never do more than seven. +Previous releases of MooX::late added support for C<< coerce => 1 >> and +C<< default => $nonref >>. These features have now been added to Moo itself, +so MooX::late no longer has to deal with them. + =head2 Use in Moo::Roles MooX::late should work in Moo::Roles, with no particular caveats. @@ -458,7 +433,7 @@ Toby Inkster E<lt>tobyink@cpan.orgE<gt>. =head1 COPYRIGHT AND LICENCE -This software is copyright (c) 2012-2013 by Toby Inkster. +This software is copyright (c) 2012-2014 by Toby Inkster. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. diff --git a/meta/changes.pret b/meta/changes.pret deleted file mode 100644 index 5188a57..0000000 --- a/meta/changes.pret +++ /dev/null @@ -1,113 +0,0 @@ -# This file acts as the project's changelog. - -`MooX-late 0.001 cpan:TOBYINK` - issued 2012-12-01; - label "Initial release". - -`MooX-late 0.002 cpan:TOBYINK` - issued 2012-12-02; - changeset [ - item "use re 'eval' on Perl 5.8 to fix regexp compilation problem"^^Bugfix; - ]. - -`MooX-late 0.003 cpan:TOBYINK` - issued 2012-12-02; - changeset [ - item "Inflation of type constraints to Moose."^^Addition; - item "Use MooX::Types::MooseLike::Base for type checks."^^Change; - item "General refactoring of type constraint code."^^Change; - ]. - -`MooX-late 0.004 cpan:TOBYINK` - issued 2012-12-03; - changeset [ - item "Issue warnings when type constraint cannot be interpreted correctly. Warning is not issued at the time the attribute is built, but the first time the type constraint is checked against. Don't attempt to inflate these type constraints when Moose is loaded."^^Addition; - ]. - -`MooX-late 0.005 cpan:TOBYINK` - issued 2012-12-09; - changeset [ - item "Bump required version of Moo to 1.000004."^^Packaging; - item "Document test suite."^^Documentation; - item "Cope with has \@attributes => (...)."^^Bugfix; - ]. - -`MooX-late 0.006 cpan:TOBYINK` - issued 2012-12-11; - changeset [ - item "Skip t/02inflation.t if no MooX::Types::MooseLike::Base."^^Bugfix; - ]. - -`MooX-late 0.007 cpan:TOBYINK` - issued 2012-12-26; - changeset [ - item [ - a dcs:Documentation; - label "Documentation for use with Moo::Role."; - dcs:thanks cpan:SHLOMIF; - seealso <https://bitbucket.org/tobyink/p5-moox-late/pull-request/1/-/diff>; - ]; - item "Link to MooX::HandlesVia on github."^^Documentation; - ]. - -`MooX-late 0.008 cpan:TOBYINK` - issued 2013-03-11; - changeset [ - item "Minor documentation updates."^^Documentation; - item "Make MooX::Types::MooseLike::Base a required dependency (was optional)."^^Packaging; - ]. - -`MooX-late 0.009 cpan:TOBYINK` - issued 2013-04-15; - changeset [ - item "Switch from MooX::Types::MooseLike::Base to Types::Standard."^^Update; - ]. - -`MooX-late 0.010 cpan:TOBYINK` - issued 2013-04-23; - changeset [ - item [ - a dcs:Bugfix; - label "Fix support for Maybe[`a] type constraint. (It was being interpreted as an object blessed into package 'Maybe'.)"; - dcs:fixes [ - dbug:reporter cpan:SHLOMIF; - dbug:affects `MooX-late 0.009 cpan:TOBYINK`; - ]; - dcs:thanks cpan:SHLOMIF; - ]; - ]. - -`MooX-late 0.011 cpan:TOBYINK` - issued 2013-04-27; - changeset [ - item [ - a dcs:Bugfix; - label "Fix support for class types."; - dcs:fixes [ - dbug:reporter cpan:SHLOMIF; - dbug:affects `MooX-late 0.009 cpan:TOBYINK`, `MooX-late 0.010 cpan:TOBYINK`; - ]; - dcs:thanks cpan:SHLOMIF; - ]; - ]. - -`MooX-late 0.012 cpan:TOBYINK` - issued 2013-06-28; - changeset [ - item "Use Type::Registry/Type::Parser to translate strings to type constraint expressions."^^Update; - ]. - -`MooX-late 0.013 cpan:TOBYINK` - issued 2013-07-16; - changeset [ - item "Use Type::Utils::dwim_type to translate strings to type constraint expressions."^^Update; - item "Support Moose attribute traits using MooX::HandlesVia."^^Addition; - item "Retire support for non-reference attribute defaults because Moo now does this natively."^^Removal; - ]. - -`MooX-late 0.014 cpan:TOBYINK` - issued 2013-07-16; - changeset [ - item "Support `coerce => 1` for Type::Tiny type constraints and those providing a similar API."^^Addition; - ]. - diff --git a/meta/doap.pret b/meta/doap.pret deleted file mode 100644 index 52d32b1..0000000 --- a/meta/doap.pret +++ /dev/null @@ -1,19 +0,0 @@ -# This file contains general metadata about the project. - -@prefix : <http://usefulinc.com/ns/doap#>. - -`MooX-late` - :programming-language "Perl" ; - :shortdesc "easily translate Moose code to Moo"; - :homepage <https://metacpan.org/release/MooX-late>; - :download-page <https://metacpan.org/release/MooX-late>; - :bug-database <http://rt.cpan.org/Dist/Display.html?Queue=MooX-late>; - :repository [ a :GitRepository; :browse <https://github.com/tobyink/p5-moox-late> ]; - :created 2012-11-30; - :license <http://dev.perl.org/licenses/>; - :maintainer cpan:TOBYINK; - :developer cpan:TOBYINK. - -<http://dev.perl.org/licenses/> - dc:title "the same terms as the perl 5 programming language system itself". - diff --git a/meta/makefile.pret b/meta/makefile.pret deleted file mode 100644 index 601a6b5..0000000 --- a/meta/makefile.pret +++ /dev/null @@ -1,15 +0,0 @@ -# This file provides instructions for packaging. - -`MooX-late` - perl_version_from m`MooX::late`; - version_from m`MooX::late`; - readme_from m`MooX::late`; - test_requires p`Test::More 0.96`; - test_requires p`Test::Requires 0.06`; - test_requires p`Test::Fatal 0.010`; - requires p`Moo 1.003000`; - requires p`Type::Utils 0.016`; - recommends p`MooX`; - recommends p`MooX::HandlesVia 0.001004`; -. - diff --git a/meta/people.pret b/meta/people.pret deleted file mode 100644 index 045097f..0000000 --- a/meta/people.pret +++ /dev/null @@ -1,8 +0,0 @@ -# This file contains data about the project developers. - -@prefix : <http://xmlns.com/foaf/0.1/>. - -cpan:TOBYINK - :name "Toby Inkster"; - :mbox <mailto:tobyink@cpan.org>. - diff --git a/t/05haveimissedanytypes.t b/t/05haveimissedanytypes.t index 53c5d20..963d6cb 100644 --- a/t/05haveimissedanytypes.t +++ b/t/05haveimissedanytypes.t @@ -64,7 +64,11 @@ my @class_types_to_check = qw( my $count = 0; sub constraint_for { - my $type = shift; + my $type = shift; + + # Note that this will cause Local::Test1 to exist. + # We later use that in a @class_types_to_check test. + # my $class = "Local::Test" . ++$count; eval qq{ @@ -73,7 +77,7 @@ sub constraint_for use MooX::late; has attr => (is => "ro", isa => "$type"); 1; - } or die $@; + } or diag($@); "Moo"->_constructor_maker_for($class)->all_attribute_specs->{attr}{isa}; } @@ -89,7 +93,18 @@ for my $type (@class_types_to_check) { my $got = constraint_for($type); isa_ok($got, "Type::Tiny::Class", "constraint_for('$type')"); - is($got->class, $type, "Type constraint returned for '$type' looks right."); + is($got && $got->class, $type, "Type constraint returned for '$type' looks right."); +} + +{ + my $type = 'ArrayRef[Local::Test1]'; + my $got = constraint_for($type); + isa_ok($got, "Type::Tiny", "constraint_for('$type')"); + is( + $got && $got->type_parameter && $got->type_parameter->class, + "Local::Test1", + "Type constraint returned for '$type' looks right" + ); } done_testing; diff --git a/t/07coerce1.t b/t/07coerce1.t index e8dad36..156c42b 100644 --- a/t/07coerce1.t +++ b/t/07coerce1.t @@ -35,13 +35,13 @@ is( 3, ); -like( - exception { - package Bar; - use Moo; use MooX::late; - has attr => (is => 'ro', isa => $Int->no_coercions, coerce => 1); - }, - qr{^Invalid coerce '1'}, -); +#like( +# exception { +# package Bar; +# use Moo; use MooX::late; +# has attr => (is => 'ro', isa => $Int->no_coercions, coerce => 1); +# }, +# qr{^Invalid coerce '1'}, +#); done_testing; diff --git a/t/08doesrole.t b/t/08doesrole.t new file mode 100644 index 0000000..a880531 --- /dev/null +++ b/t/08doesrole.t @@ -0,0 +1,60 @@ +=pod + +=encoding utf-8 + +=head1 PURPOSE + +See if C<< does => $rolename >> works. + +=head1 AUTHOR + +Toby Inkster E<lt>tobyink@cpan.orgE<gt>. + +=head1 COPYRIGHT AND LICENCE + +This software is copyright (c) 2013 by Toby Inkster. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +=cut + +use strict; +use warnings; +use Test::More; +use Test::Fatal; + +{ + package Bar; + use Moo::Role; +} + +{ + package Foo::Bar; + use Moo; + with 'Bar'; +} + +{ + package Foo::Baz; + use Moo; +} + +{ + package Quux; + use Moo; + use MooX::late; + has xxx => (is => 'ro', does => 'Bar'); +} + +is( + exception { Quux->new(xxx => Foo::Bar->new) }, + undef, +); + +like( + exception { Quux->new(xxx => Foo::Baz->new) }, + qr/did not pass type constraint/, +); + +done_testing; |