diff options
author | Lucas Kanashiro <kanashiro@debian.org> | 2016-11-29 14:41:10 -0200 |
---|---|---|
committer | Lucas Kanashiro <kanashiro@debian.org> | 2016-11-29 14:41:10 -0200 |
commit | 1829b2062158aa78cf06e51329187c6cc33142ff (patch) | |
tree | 2a5d7c6959e16bfd194d567afb62f696bb209cc1 | |
parent | acb90604e9f4ec24e133173b0f01b92d56a8125f (diff) | |
parent | 3a337679bd10da4153fa12de14b0bc087a0aebe0 (diff) |
Merge tag 'upstream/0.0019'
Upstream version 0.0019
# gpg: Signature made Tue 29 Nov 2016 02:41:10 PM BRST
# gpg: using RSA key 8ED6C3F8BAC9DB7FC130A870F823A2729883C97C
# gpg: Good signature from "Lucas Kanashiro <kanashiro@debian.org>" [ultimate]
# gpg: aka "Lucas Kanashiro <kanashiro.duarte@gmail.com>" [ultimate]
-rw-r--r-- | CONTRIBUTING.mkdn | 100 | ||||
-rw-r--r-- | Changes | 13 | ||||
-rw-r--r-- | LICENSE | 379 | ||||
-rw-r--r-- | MANIFEST | 19 | ||||
-rw-r--r-- | META.json | 115 | ||||
-rw-r--r-- | META.yml | 53 | ||||
-rw-r--r-- | Makefile.PL | 36 | ||||
-rw-r--r-- | README | 38 | ||||
-rw-r--r-- | cpanfile | 47 | ||||
-rw-r--r-- | dist.ini | 25 | ||||
-rw-r--r-- | lib/Config/Identity.pm | 84 | ||||
-rw-r--r-- | lib/Config/Identity/GitHub.pm | 6 | ||||
-rw-r--r-- | lib/Config/Identity/PAUSE.pm | 6 | ||||
-rw-r--r-- | perlcritic.rc | 26 | ||||
-rw-r--r-- | t/.01-basic.t.swp | bin | 12288 -> 0 bytes | |||
-rw-r--r-- | t/00-report-prereqs.dd | 57 | ||||
-rw-r--r-- | t/00-report-prereqs.t | 183 | ||||
-rw-r--r-- | t/01-basic.t | 50 | ||||
-rw-r--r-- | t/assets/gpg/random_seed | bin | 600 -> 0 bytes | |||
-rw-r--r-- | t/assets/pause/.pause-alternate | 1 | ||||
-rw-r--r-- | xt/author/00-compile.t | 65 | ||||
-rw-r--r-- | xt/author/critic.t | 12 | ||||
-rw-r--r-- | xt/author/pod-spell.t | 26 | ||||
-rw-r--r-- | xt/author/pod-syntax.t | 7 | ||||
-rw-r--r-- | xt/author/test-version.t | 23 | ||||
-rw-r--r-- | xt/release/distmeta.t | 6 | ||||
-rw-r--r-- | xt/release/minimum-version.t | 8 |
27 files changed, 1333 insertions, 52 deletions
diff --git a/CONTRIBUTING.mkdn b/CONTRIBUTING.mkdn new file mode 100644 index 0000000..c58ea70 --- /dev/null +++ b/CONTRIBUTING.mkdn @@ -0,0 +1,100 @@ +## HOW TO CONTRIBUTE + +Thank you for considering contributing to this distribution. This file +contains instructions that will help you work with the source code. + +The distribution is managed with Dist::Zilla. This means that many of the +usual files you might expect are not in the repository, but are generated at +release time, as is much of the documentation. Some generated files are +kept in the repository as a convenience (e.g. Makefile.PL or cpanfile). + +Generally, **you do not need Dist::Zilla to contribute patches**. You do need +Dist::Zilla to create a tarball. See below for guidance. + +### Getting dependencies + +If you have App::cpanminus 1.6 or later installed, you can use `cpanm` to +satisfy dependencies like this: + + $ cpanm --installdeps . + +Otherwise, look for either a `Makefile.PL` or `cpanfile` file for +a list of dependencies to satisfy. + +### Running tests + +You can run tests directly using the `prove` tool: + + $ prove -l + $ prove -lv t/some_test_file.t + +For most of my distributions, `prove` is entirely sufficient for you to test any +patches you have. I use `prove` for 99% of my testing during development. + +### Code style and tidying + +Please try to match any existing coding style. If there is a `.perltidyrc` +file, please install Perl::Tidy and use perltidy before submitting patches. + +If there is a `tidyall.ini` file, you can also install Code::TidyAll and run +`tidyall` on a file or `tidyall -a` to tidy all files. + +### Patching documentation + +Much of the documentation Pod is generated at release time. Some is +generated boilerplate; other documentation is built from pseudo-POD +directives in the source like C<=method> or C<=func>. + +If you would like to submit a documentation edit, please limit yourself to +the documentation you see. + +If you see typos or documentation issues in the generated docs, please +email or open a bug ticket instead of patching. + +### Where to send patches and pull requests + +If you found this distribution on Github, sending a pull-request is the +best way to contribute. + +If a pull-request isn't possible, a bug ticket with a patch file is the +next best option. + +As a last resort, an email to the author(s) is acceptable. + +## Installing and using Dist::Zilla + +Dist::Zilla is not required for contributing, but if you'd like to learn +more, this section will get you up to speed. + +Dist::Zilla is a very powerful authoring tool, optimized for maintaining a +large number of distributions with a high degree of automation, but it has a +large dependency chain, a bit of a learning curve and requires a number of +author-specific plugins. + +To install it from CPAN, I recommend one of the following approaches for +the quickest installation: + + # using CPAN.pm, but bypassing non-functional pod tests + $ cpan TAP::Harness::Restricted + $ PERL_MM_USE_DEFAULT=1 HARNESS_CLASS=TAP::Harness::Restricted cpan Dist::Zilla + + # using cpanm, bypassing *all* tests + $ cpanm -n Dist::Zilla + +In either case, it's probably going to take about 10 minutes. Go for a walk, +go get a cup of your favorite beverage, take a bathroom break, or whatever. +When you get back, Dist::Zilla should be ready for you. + +Then you need to install any plugins specific to this distribution: + + $ cpan `dzil authordeps` + $ dzil authordeps | cpanm + +Once installed, here are some dzil commands you might try: + + $ dzil build + $ dzil test + $ dzil xtest + +You can learn more about Dist::Zilla at http://dzil.org/ + @@ -1,9 +1,16 @@ -TODO: - - Trying GPG on empty file +Revision history for Config-Identity + +0.0019 2016-11-19 22:55:59-05:00 America/New_York + - DAGOLDEN joined as maintainer + - Attemped test bug fix for rt.cpan.org#112569 (fails with newer gpg) + - SYNOPSIS fixed + - Added a generic "load_check" method to Config::Identity for simple + use cases that don't really need subclassing + - Replaces a die() call with croak() for consistency 0.0018 Saturday March 01 13:40:31 PST 2014: - Be more sane with how we interact with gpg - + 0.0017 Saturday March 01 11:12:09 PST 2014: - Use IPC::Run instead of IPC::Open3 @@ -0,0 +1,379 @@ +This software is copyright (c) 2010 by Robert Krimen. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +Terms of the Perl programming language system itself + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" + +--- The GNU General Public License, Version 1, February 1989 --- + +This software is Copyright (c) 2010 by Robert Krimen. + +This is free software, licensed under: + + The GNU General Public License, Version 1, February 1989 + + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 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. + + Preamble + + The license agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. The +General Public License applies to the Free Software Foundation's +software and to any other program whose authors commit to using it. +You can use it for your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public License is designed to make +sure that you have the freedom to give away or sell copies of free +software, that you receive source code or can get it if you want it, +that you can change the software or use pieces of it in new free +programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of a such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any program or other work which +contains a notice placed by the copyright holder saying it may be +distributed under the terms of this General Public License. The +"Program", below, refers to any such program or work, and a "work based +on the Program" means either the Program or any work containing the +Program or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this +General Public License and to the absence of any warranty; and give any +other recipients of the Program a copy of this General Public License +along with the Program. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Program or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Program or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public License (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual way, to print or display an + announcement including an appropriate copyright notice and a notice + that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program under these + conditions, and telling the user how to view a copy of this General + Public License. + + d) You may charge a fee for the physical act of transferring a + copy, and you may at your option offer warranty protection in + exchange for a fee. + +Mere aggregation of another independent work with the Program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Program except as expressly provided under this General Public License. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Program is void, and will automatically terminate your rights to use +the Program under this License. However, parties who have received +copies, or rights to use copies, from you under this General Public +License will not have their licenses terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying the Program (or any work based +on the Program) you indicate your acceptance of this license to do so, +and all its terms and conditions. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these +terms and conditions. You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. + + 7. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of the license which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +the license, you may choose any version ever published by the Free Software +Foundation. + + 8. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to humanity, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the program. It is safest to +attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! + + +--- The Artistic License 1.0 --- + +This software is Copyright (c) 2010 by Robert Krimen. + +This is free software, licensed under: + + The Artistic License 1.0 + +The Artistic License + +Preamble + +The intent of this document is to state the conditions under which a Package +may be copied, such that the Copyright Holder maintains some semblance of +artistic control over the development of the package, while giving the users of +the package the right to use and distribute the Package in a more-or-less +customary fashion, plus the right to make reasonable modifications. + +Definitions: + + - "Package" refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created through + textual modification. + - "Standard Version" refers to such a Package if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder. + - "Copyright Holder" is whoever is named in the copyright or copyrights for + the package. + - "You" is you, if you're thinking about copying or distributing this Package. + - "Reasonable copying fee" is whatever you can justify on the basis of media + cost, duplication charges, time of people involved, and so on. (You will + not be required to justify it to the Copyright Holder, but only to the + computing community at large as a market that must bear the fee.) + - "Freely Available" means that no fee is charged for the item itself, though + there may be fees involved in handling the item. It also means that + recipients of the item may redistribute it under the same conditions they + received it. + +1. You may make and give away verbatim copies of the source form of the +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes and other modifications derived +from the Public Domain or from the Copyright Holder. A Package modified in such +a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided that +you insert a prominent notice in each changed file stating how and when you +changed that file, and provided that you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided, and provide a separate + manual page for each non-standard executable that clearly documents how it + differs from the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or executable +form, provided that you do at least ONE of the following: + + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where to + get the Standard Version. + + b) accompany the distribution with the machine-readable source of the Package + with your modifications. + + c) accompany any non-standard executables with their corresponding Standard + Version executables, giving the non-standard executables non-standard + names, and clearly documenting the differences in manual pages (or + equivalent), together with instructions on where to get the Standard + Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this Package. You +may not charge a fee for this Package itself. However, you may distribute this +Package in aggregate with other (possibly commercial) programs as part of a +larger (possibly commercial) software distribution provided that you do not +advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as output +from the programs of this Package do not automatically fall under the copyright +of this Package, but belong to whomever generated them, and may be sold +commercially, and may be aggregated with this Package. + +7. C or perl subroutines supplied by you and linked into this Package shall not +be considered part of this Package. + +8. The name of the Copyright Holder may not be used to endorse or promote +products derived from this software without specific prior written permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +The End + @@ -1,17 +1,23 @@ -# This file was automatically generated by Dist::Zilla::Plugin::Manifest v5.013. +# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.008. +CONTRIBUTING.mkdn Changes +LICENSE MANIFEST +META.json META.yml Makefile.PL README +cpanfile +dist.ini lib/Config/Identity.pm lib/Config/Identity/GitHub.pm lib/Config/Identity/PAUSE.pm -t/.01-basic.t.swp +perlcritic.rc +t/00-report-prereqs.dd +t/00-report-prereqs.t t/01-basic.t t/assets/github/.github t/assets/gpg/pubring.gpg -t/assets/gpg/random_seed t/assets/gpg/secring.gpg t/assets/gpg/trustdb.gpg t/assets/h0/.test @@ -22,3 +28,10 @@ t/assets/pause/.pause-alternate t/assets/pause/.pause-identity t/assets/test.asc t/assets/test.gpg +xt/author/00-compile.t +xt/author/critic.t +xt/author/pod-spell.t +xt/author/pod-syntax.t +xt/author/test-version.t +xt/release/distmeta.t +xt/release/minimum-version.t diff --git a/META.json b/META.json new file mode 100644 index 0000000..ff02eb4 --- /dev/null +++ b/META.json @@ -0,0 +1,115 @@ +{ + "abstract" : "Load (and optionally decrypt via GnuPG) user/pass identity information ", + "author" : [ + "Robert Krimen <robertkrimen@gmail.com>" + ], + "dynamic_config" : 0, + "generated_by" : "Dist::Zilla version 6.008, CPAN::Meta::Converter version 2.150010", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : 2 + }, + "name" : "Config-Identity", + "no_index" : { + "directory" : [ + "corpus", + "examples", + "t", + "xt" + ], + "package" : [ + "DB" + ] + }, + "prereqs" : { + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "6.17", + "perl" : "5.006" + } + }, + "develop" : { + "requires" : { + "Dist::Zilla" : "5", + "Dist::Zilla::Plugin::Encoding" : "0", + "Dist::Zilla::Plugin::Git::GatherDir" : "0", + "Dist::Zilla::PluginBundle::DAGOLDEN" : "0.072", + "English" : "0", + "File::Spec" : "0", + "File::Temp" : "0", + "IO::Handle" : "0", + "IPC::Open3" : "0", + "Pod::Wordlist" : "0", + "Software::License::Perl_5" : "0", + "Test::CPAN::Meta" : "0", + "Test::MinimumVersion" : "0", + "Test::More" : "0", + "Test::Pod" : "1.41", + "Test::Spelling" : "0.12", + "Test::Version" : "1", + "blib" : "1.01", + "perl" : "5.006" + } + }, + "runtime" : { + "requires" : { + "Carp" : "0", + "File::HomeDir" : "0", + "File::Spec" : "0", + "File::Which" : "0", + "IPC::Run" : "0", + "perl" : "5.006", + "strict" : "0", + "warnings" : "0" + } + }, + "test" : { + "recommends" : { + "CPAN::Meta" : "2.120900" + }, + "requires" : { + "ExtUtils::MakeMaker" : "0", + "File::Spec" : "0", + "Test::Deep" : "0", + "Test::More" : "0", + "perl" : "5.006" + } + } + }, + "provides" : { + "Config::Identity" : { + "file" : "lib/Config/Identity.pm", + "version" : "0.0019" + }, + "Config::Identity::GitHub" : { + "file" : "lib/Config/Identity/GitHub.pm", + "version" : "0.0019" + }, + "Config::Identity::PAUSE" : { + "file" : "lib/Config/Identity/PAUSE.pm", + "version" : "0.0019" + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "web" : "http://rt.cpan.org/Public/Dist/Display.html?Name=Config-Identity" + }, + "homepage" : "https://github.com/dagolden/Config-Identity", + "repository" : { + "type" : "git", + "url" : "https://github.com/dagolden/Config-Identity.git", + "web" : "https://github.com/dagolden/Config-Identity" + } + }, + "version" : "0.0019", + "x_authority" : "cpan:DAGOLDEN", + "x_contributors" : [ + "David Golden <dagolden@cpan.org>" + ], + "x_serialization_backend" : "Cpanel::JSON::XS version 3.0213" +} + @@ -3,19 +3,54 @@ abstract: 'Load (and optionally decrypt via GnuPG) user/pass identity informatio author: - 'Robert Krimen <robertkrimen@gmail.com>' build_requires: - Test::Most: 0 + ExtUtils::MakeMaker: '0' + File::Spec: '0' + Test::Deep: '0' + Test::More: '0' + perl: '5.006' configure_requires: - ExtUtils::MakeMaker: 6.30 + ExtUtils::MakeMaker: '6.17' + perl: '5.006' dynamic_config: 0 -generated_by: 'Dist::Zilla version 5.013, CPAN::Meta::Converter version 2.130880' +generated_by: 'Dist::Zilla version 6.008, CPAN::Meta::Converter version 2.150010' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Config-Identity +no_index: + directory: + - corpus + - examples + - t + - xt + package: + - DB +provides: + Config::Identity: + file: lib/Config/Identity.pm + version: '0.0019' + Config::Identity::GitHub: + file: lib/Config/Identity/GitHub.pm + version: '0.0019' + Config::Identity::PAUSE: + file: lib/Config/Identity/PAUSE.pm + version: '0.0019' requires: - File::HomeDir: 0 - File::Spec: 0 - File::Which: 0 - IPC::Run: 0 -version: 0.0018 + Carp: '0' + File::HomeDir: '0' + File::Spec: '0' + File::Which: '0' + IPC::Run: '0' + perl: '5.006' + strict: '0' + warnings: '0' +resources: + bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Config-Identity + homepage: https://github.com/dagolden/Config-Identity + repository: https://github.com/dagolden/Config-Identity.git +version: '0.0019' +x_authority: cpan:DAGOLDEN +x_contributors: + - 'David Golden <dagolden@cpan.org>' +x_serialization_backend: 'YAML::Tiny version 1.69' diff --git a/Makefile.PL b/Makefile.PL index e081493..68cef3c 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,35 +1,37 @@ - -# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.013. +# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.008. use strict; use warnings; +use 5.006; - -use ExtUtils::MakeMaker 6.30; - - +use ExtUtils::MakeMaker 6.17; my %WriteMakefileArgs = ( "ABSTRACT" => "Load (and optionally decrypt via GnuPG) user/pass identity information ", "AUTHOR" => "Robert Krimen <robertkrimen\@gmail.com>", - "BUILD_REQUIRES" => {}, "CONFIGURE_REQUIRES" => { - "ExtUtils::MakeMaker" => "6.30" + "ExtUtils::MakeMaker" => "6.17" }, "DISTNAME" => "Config-Identity", - "EXE_FILES" => [], "LICENSE" => "perl", + "MIN_PERL_VERSION" => "5.006", "NAME" => "Config::Identity", "PREREQ_PM" => { + "Carp" => 0, "File::HomeDir" => 0, "File::Spec" => 0, "File::Which" => 0, - "IPC::Run" => 0 + "IPC::Run" => 0, + "strict" => 0, + "warnings" => 0 }, "TEST_REQUIRES" => { - "Test::Most" => 0 + "ExtUtils::MakeMaker" => 0, + "File::Spec" => 0, + "Test::Deep" => 0, + "Test::More" => 0 }, - "VERSION" => "0.0018", + "VERSION" => "0.0019", "test" => { "TESTS" => "t/*.t" } @@ -37,11 +39,16 @@ my %WriteMakefileArgs = ( my %FallbackPrereqs = ( + "Carp" => 0, + "ExtUtils::MakeMaker" => 0, "File::HomeDir" => 0, "File::Spec" => 0, "File::Which" => 0, "IPC::Run" => 0, - "Test::Most" => 0 + "Test::Deep" => 0, + "Test::More" => 0, + "strict" => 0, + "warnings" => 0 ); @@ -55,6 +62,3 @@ delete $WriteMakefileArgs{CONFIGURE_REQUIRES} unless eval { ExtUtils::MakeMaker->VERSION(6.52) }; WriteMakefile(%WriteMakefileArgs); - - - @@ -3,7 +3,7 @@ NAME identity information VERSION - version 0.0018 + version 0.0019 SYNOPSIS PAUSE: @@ -14,7 +14,7 @@ SYNOPSIS # 2. Decrypt the found file (if necessary), read, and parse it # 3. Throw an exception unless %identity has 'user' and 'password' defined - my %identity = Config::Identity::PAUSE->load; + my %identity = Config::Identity::PAUSE->load_check; print "user: $identity{user} password: $identity{password}\n"; GitHub API: @@ -25,11 +25,11 @@ SYNOPSIS # 2. Decrypt the found file (if necessary) read, and parse it # 3. Throw an exception unless %identity has 'login' and 'token' defined - my %identity = Config::Identity::PAUSE->load; + my %identity = Config::Identity::PAUSE->load_check; print "login: $identity{login} token: $identity{token}\n"; DESCRIPTION - Config::Identity is a tool for loadiing (and optionally decrypting via + Config::Identity is a tool for loading (and optionally decrypting via GnuPG) user/pass identity information For GitHub API access, an identity is a "login"/"token" pair @@ -54,6 +54,17 @@ USAGE username alice password hunter2 + If an identity file can't be found or read, the method croaks. + + %identity = Config::Identity->load_check( <stub>, <checker> ) + Works like "load_best" but also checks for required keys. The "checker" + argument must be an array reference of required keys or a code reference + that takes a hashref of key/value pairs from the identity file and + returns a list of missing keys. For convenience, the hashref will also + be placed in $_. + + If any keys are found missing, the method croaks. + Using a custom "gpg" or passing custom arguments You can specify a custom "gpg" executable by setting the CI_GPG environment variable @@ -103,11 +114,28 @@ GitHub identity format login <login> token <token> +SUPPORT + Bugs / Feature Requests + Please report any bugs or feature requests through the issue tracker at + <http://rt.cpan.org/Public/Dist/Display.html?Name=Config-Identity>. You + will be notified automatically of any progress on your issue. + + Source Code + This is open source software. The code repository is available for + public review and contribution under the terms of the license. + + <https://github.com/dagolden/Config-Identity> + + git clone https://github.com/dagolden/Config-Identity.git + AUTHOR Robert Krimen <robertkrimen@gmail.com> +CONTRIBUTOR + David Golden <dagolden@cpan.org> + COPYRIGHT AND LICENSE - This software is copyright (c) 2014 by Robert Krimen. + This software is copyright (c) 2010 by Robert Krimen. 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/cpanfile b/cpanfile new file mode 100644 index 0000000..3e9e8b7 --- /dev/null +++ b/cpanfile @@ -0,0 +1,47 @@ +requires "Carp" => "0"; +requires "File::HomeDir" => "0"; +requires "File::Spec" => "0"; +requires "File::Which" => "0"; +requires "IPC::Run" => "0"; +requires "perl" => "5.006"; +requires "strict" => "0"; +requires "warnings" => "0"; + +on 'test' => sub { + requires "ExtUtils::MakeMaker" => "0"; + requires "File::Spec" => "0"; + requires "Test::Deep" => "0"; + requires "Test::More" => "0"; + requires "perl" => "5.006"; +}; + +on 'test' => sub { + recommends "CPAN::Meta" => "2.120900"; +}; + +on 'configure' => sub { + requires "ExtUtils::MakeMaker" => "6.17"; + requires "perl" => "5.006"; +}; + +on 'develop' => sub { + requires "Dist::Zilla" => "5"; + requires "Dist::Zilla::Plugin::Encoding" => "0"; + requires "Dist::Zilla::Plugin::Git::GatherDir" => "0"; + requires "Dist::Zilla::PluginBundle::DAGOLDEN" => "0.072"; + requires "English" => "0"; + requires "File::Spec" => "0"; + requires "File::Temp" => "0"; + requires "IO::Handle" => "0"; + requires "IPC::Open3" => "0"; + requires "Pod::Wordlist" => "0"; + requires "Software::License::Perl_5" => "0"; + requires "Test::CPAN::Meta" => "0"; + requires "Test::MinimumVersion" => "0"; + requires "Test::More" => "0"; + requires "Test::Pod" => "1.41"; + requires "Test::Spelling" => "0.12"; + requires "Test::Version" => "1"; + requires "blib" => "1.01"; + requires "perl" => "5.006"; +}; diff --git a/dist.ini b/dist.ini new file mode 100644 index 0000000..b1d6283 --- /dev/null +++ b/dist.ini @@ -0,0 +1,25 @@ +name = Config-Identity +author = Robert Krimen <robertkrimen@gmail.com> +license = Perl_5 +copyright_holder = Robert Krimen +copyright_year = 2010 + +[Encoding] +encoding = bytes +match = ^t/assets/ + +[@DAGOLDEN] +:version = 0.072 +github_issues = 0 +no_coverage = 1 +-remove = Test::Portability +Git::GatherDir.exclude_match = ^t/assets +stopwords = GnuPG +stopwords = decrypt +stopwords = gpg + +; Assets must be gathered with dotfiles +[Git::GatherDir / GatherAssets] +root = t/assets +prefix = t/assets +include_dotfiles = 1 diff --git a/lib/Config/Identity.pm b/lib/Config/Identity.pm index 527069a..87377ce 100644 --- a/lib/Config/Identity.pm +++ b/lib/Config/Identity.pm @@ -1,9 +1,10 @@ +use strict; +use warnings; + package Config::Identity; # ABSTRACT: Load (and optionally decrypt via GnuPG) user/pass identity information -$Config::Identity::VERSION = '0.0018'; -use strict; -use warnings; +our $VERSION = '0.0019'; use Carp; use IPC::Run qw/ start finish /; @@ -106,7 +107,7 @@ sub load_best { my $self = shift; my $stub = shift; - die "Unable to find .$stub-identity or .$stub" unless my $path = $self->best( $stub ); + croak "Unable to find .$stub-identity or .$stub" unless my $path = $self->best( $stub ); return $self->load( $path ); } @@ -125,19 +126,47 @@ sub load { return $self->parse( $self->read( $file ) ); } +sub load_check { + my $self = shift; + my $stub = shift; + my $required = shift || []; + + my %identity = $self->load_best($stub); + my @missing; + if ( ref $required eq 'ARRAY' ) { + @missing = grep { ! defined $identity{$_} } @$required; + } + elsif ( ref $required eq 'CODE' ) { + local $_ = \%identity; + @missing = $required->(\%identity); + } + else { + croak "Argument to check keys must be an arrayref or coderef"; + } + + if ( @missing ) { + my $inflect = @missing > 1 ? "fields" : "field"; + croak "Missing required ${inflect}: @missing" + } + + return %identity; +} + 1; __END__ =pod +=encoding UTF-8 + =head1 NAME Config::Identity - Load (and optionally decrypt via GnuPG) user/pass identity information =head1 VERSION -version 0.0018 +version 0.0019 =head1 SYNOPSIS @@ -149,7 +178,7 @@ PAUSE: # 2. Decrypt the found file (if necessary), read, and parse it # 3. Throw an exception unless %identity has 'user' and 'password' defined - my %identity = Config::Identity::PAUSE->load; + my %identity = Config::Identity::PAUSE->load_check; print "user: $identity{user} password: $identity{password}\n"; GitHub API: @@ -160,12 +189,12 @@ GitHub API: # 2. Decrypt the found file (if necessary) read, and parse it # 3. Throw an exception unless %identity has 'login' and 'token' defined - my %identity = Config::Identity::PAUSE->load; + my %identity = Config::Identity::PAUSE->load_check; print "login: $identity{login} token: $identity{token}\n"; =head1 DESCRIPTION -Config::Identity is a tool for loadiing (and optionally decrypting via GnuPG) user/pass identity information +Config::Identity is a tool for loading (and optionally decrypting via GnuPG) user/pass identity information For GitHub API access, an identity is a C<login>/C<token> pair @@ -190,6 +219,18 @@ For example: username alice password hunter2 +If an identity file can't be found or read, the method croaks. + +=head2 %identity = Config::Identity->load_check( <stub>, <checker> ) + +Works like C<load_best> but also checks for required keys. The C<checker> +argument must be an array reference of B<required> keys or a code reference +that takes a hashref of key/value pairs from the identity file and returns +a list of B<missing> keys. For convenience, the hashref will also be +placed in C<$_>. + +If any keys are found missing, the method croaks. + =head1 Using a custom C<gpg> or passing custom arguments You can specify a custom C<gpg> executable by setting the CI_GPG environment variable @@ -242,13 +283,38 @@ C<username> can also be used as alias for C<user> login <login> token <token> +=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan + +=head1 SUPPORT + +=head2 Bugs / Feature Requests + +Please report any bugs or feature requests through the issue tracker +at L<http://rt.cpan.org/Public/Dist/Display.html?Name=Config-Identity>. +You will be notified automatically of any progress on your issue. + +=head2 Source Code + +This is open source software. The code repository is available for +public review and contribution under the terms of the license. + +L<https://github.com/dagolden/Config-Identity> + + git clone https://github.com/dagolden/Config-Identity.git + =head1 AUTHOR Robert Krimen <robertkrimen@gmail.com> +=head1 CONTRIBUTOR + +=for stopwords David Golden + +David Golden <dagolden@cpan.org> + =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2014 by Robert Krimen. +This software is copyright (c) 2010 by Robert Krimen. 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/lib/Config/Identity/GitHub.pm b/lib/Config/Identity/GitHub.pm index eeff91d..7fd7895 100644 --- a/lib/Config/Identity/GitHub.pm +++ b/lib/Config/Identity/GitHub.pm @@ -1,8 +1,10 @@ -package Config::Identity::GitHub; - use strict; use warnings; +package Config::Identity::GitHub; + +our $VERSION = '0.0019'; + use Config::Identity; use Carp; diff --git a/lib/Config/Identity/PAUSE.pm b/lib/Config/Identity/PAUSE.pm index e3e762d..61a1631 100644 --- a/lib/Config/Identity/PAUSE.pm +++ b/lib/Config/Identity/PAUSE.pm @@ -1,8 +1,10 @@ -package Config::Identity::PAUSE; - use strict; use warnings; +package Config::Identity::PAUSE; + +our $VERSION = '0.0019'; + use Config::Identity; use Carp; diff --git a/perlcritic.rc b/perlcritic.rc new file mode 100644 index 0000000..bcbbb45 --- /dev/null +++ b/perlcritic.rc @@ -0,0 +1,26 @@ +severity = 5 +verbose = 8 + +[Variables::ProhibitPunctuationVars] +allow = $@ $! + +[TestingAndDebugging::ProhibitNoStrict] +allow = refs + +[Variables::ProhibitEvilVariables] +variables = $DB::single + +# Turn these off +[-BuiltinFunctions::ProhibitStringyEval] +[-ControlStructures::ProhibitPostfixControls] +[-ControlStructures::ProhibitUnlessBlocks] +[-Documentation::RequirePodSections] +[-InputOutput::ProhibitInteractiveTest] +[-References::ProhibitDoubleSigils] +[-RegularExpressions::RequireExtendedFormatting] +[-InputOutput::ProhibitTwoArgOpen] +[-Modules::ProhibitEvilModules] + +# Turn this on +[Lax::ProhibitStringyEval::ExceptForRequire] + diff --git a/t/.01-basic.t.swp b/t/.01-basic.t.swp Binary files differdeleted file mode 100644 index b4d8a9f..0000000 --- a/t/.01-basic.t.swp +++ /dev/null diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd new file mode 100644 index 0000000..94384a7 --- /dev/null +++ b/t/00-report-prereqs.dd @@ -0,0 +1,57 @@ +do { my $x = { + 'configure' => { + 'requires' => { + 'ExtUtils::MakeMaker' => '6.17', + 'perl' => '5.006' + } + }, + 'develop' => { + 'requires' => { + 'Dist::Zilla' => '5', + 'Dist::Zilla::Plugin::Encoding' => '0', + 'Dist::Zilla::Plugin::Git::GatherDir' => '0', + 'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.072', + 'English' => '0', + 'File::Spec' => '0', + 'File::Temp' => '0', + 'IO::Handle' => '0', + 'IPC::Open3' => '0', + 'Pod::Wordlist' => '0', + 'Software::License::Perl_5' => '0', + 'Test::CPAN::Meta' => '0', + 'Test::MinimumVersion' => '0', + 'Test::More' => '0', + 'Test::Pod' => '1.41', + 'Test::Spelling' => '0.12', + 'Test::Version' => '1', + 'blib' => '1.01', + 'perl' => '5.006' + } + }, + 'runtime' => { + 'requires' => { + 'Carp' => '0', + 'File::HomeDir' => '0', + 'File::Spec' => '0', + 'File::Which' => '0', + 'IPC::Run' => '0', + 'perl' => '5.006', + 'strict' => '0', + 'warnings' => '0' + } + }, + 'test' => { + 'recommends' => { + 'CPAN::Meta' => '2.120900' + }, + 'requires' => { + 'ExtUtils::MakeMaker' => '0', + 'File::Spec' => '0', + 'Test::Deep' => '0', + 'Test::More' => '0', + 'perl' => '5.006' + } + } + }; + $x; + }
\ No newline at end of file diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t new file mode 100644 index 0000000..e338372 --- /dev/null +++ b/t/00-report-prereqs.t @@ -0,0 +1,183 @@ +#!perl + +use strict; +use warnings; + +# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.025 + +use Test::More tests => 1; + +use ExtUtils::MakeMaker; +use File::Spec; + +# from $version::LAX +my $lax_version_re = + qr/(?: undef | (?: (?:[0-9]+) (?: \. | (?:\.[0-9]+) (?:_[0-9]+)? )? + | + (?:\.[0-9]+) (?:_[0-9]+)? + ) | (?: + v (?:[0-9]+) (?: (?:\.[0-9]+)+ (?:_[0-9]+)? )? + | + (?:[0-9]+)? (?:\.[0-9]+){2,} (?:_[0-9]+)? + ) + )/x; + +# hide optional CPAN::Meta modules from prereq scanner +# and check if they are available +my $cpan_meta = "CPAN::Meta"; +my $cpan_meta_pre = "CPAN::Meta::Prereqs"; +my $HAS_CPAN_META = eval "require $cpan_meta; $cpan_meta->VERSION('2.120900')" && eval "require $cpan_meta_pre"; ## no critic + +# Verify requirements? +my $DO_VERIFY_PREREQS = 1; + +sub _max { + my $max = shift; + $max = ( $_ > $max ) ? $_ : $max for @_; + return $max; +} + +sub _merge_prereqs { + my ($collector, $prereqs) = @_; + + # CPAN::Meta::Prereqs object + if (ref $collector eq $cpan_meta_pre) { + return $collector->with_merged_prereqs( + CPAN::Meta::Prereqs->new( $prereqs ) + ); + } + + # Raw hashrefs + for my $phase ( keys %$prereqs ) { + for my $type ( keys %{ $prereqs->{$phase} } ) { + for my $module ( keys %{ $prereqs->{$phase}{$type} } ) { + $collector->{$phase}{$type}{$module} = $prereqs->{$phase}{$type}{$module}; + } + } + } + + return $collector; +} + +my @include = qw( + +); + +my @exclude = qw( + +); + +# Add static prereqs to the included modules list +my $static_prereqs = do 't/00-report-prereqs.dd'; + +# Merge all prereqs (either with ::Prereqs or a hashref) +my $full_prereqs = _merge_prereqs( + ( $HAS_CPAN_META ? $cpan_meta_pre->new : {} ), + $static_prereqs +); + +# Add dynamic prereqs to the included modules list (if we can) +my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml'; +if ( $source && $HAS_CPAN_META + && (my $meta = eval { CPAN::Meta->load_file($source) } ) +) { + $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs); +} +else { + $source = 'static metadata'; +} + +my @full_reports; +my @dep_errors; +my $req_hash = $HAS_CPAN_META ? $full_prereqs->as_string_hash : $full_prereqs; + +# Add static includes into a fake section +for my $mod (@include) { + $req_hash->{other}{modules}{$mod} = 0; +} + +for my $phase ( qw(configure build test runtime develop other) ) { + next unless $req_hash->{$phase}; + next if ($phase eq 'develop' and not $ENV{AUTHOR_TESTING}); + + for my $type ( qw(requires recommends suggests conflicts modules) ) { + next unless $req_hash->{$phase}{$type}; + + my $title = ucfirst($phase).' '.ucfirst($type); + my @reports = [qw/Module Want Have/]; + + for my $mod ( sort keys %{ $req_hash->{$phase}{$type} } ) { + next if $mod eq 'perl'; + next if grep { $_ eq $mod } @exclude; + + my $file = $mod; + $file =~ s{::}{/}g; + $file .= ".pm"; + my ($prefix) = grep { -e File::Spec->catfile($_, $file) } @INC; + + my $want = $req_hash->{$phase}{$type}{$mod}; + $want = "undef" unless defined $want; + $want = "any" if !$want && $want == 0; + + my $req_string = $want eq 'any' ? 'any version required' : "version '$want' required"; + + if ($prefix) { + my $have = MM->parse_version( File::Spec->catfile($prefix, $file) ); + $have = "undef" unless defined $have; + push @reports, [$mod, $want, $have]; + + if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META && $type eq 'requires' ) { + if ( $have !~ /\A$lax_version_re\z/ ) { + push @dep_errors, "$mod version '$have' cannot be parsed ($req_string)"; + } + elsif ( ! $full_prereqs->requirements_for( $phase, $type )->accepts_module( $mod => $have ) ) { + push @dep_errors, "$mod version '$have' is not in required range '$want'"; + } + } + } + else { + push @reports, [$mod, $want, "missing"]; + + if ( $DO_VERIFY_PREREQS && $type eq 'requires' ) { + push @dep_errors, "$mod is not installed ($req_string)"; + } + } + } + + if ( @reports ) { + push @full_reports, "=== $title ===\n\n"; + + my $ml = _max( map { length $_->[0] } @reports ); + my $wl = _max( map { length $_->[1] } @reports ); + my $hl = _max( map { length $_->[2] } @reports ); + + if ($type eq 'modules') { + splice @reports, 1, 0, ["-" x $ml, "", "-" x $hl]; + push @full_reports, map { sprintf(" %*s %*s\n", -$ml, $_->[0], $hl, $_->[2]) } @reports; + } + else { + splice @reports, 1, 0, ["-" x $ml, "-" x $wl, "-" x $hl]; + push @full_reports, map { sprintf(" %*s %*s %*s\n", -$ml, $_->[0], $wl, $_->[1], $hl, $_->[2]) } @reports; + } + + push @full_reports, "\n"; + } + } +} + +if ( @full_reports ) { + diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports; +} + +if ( @dep_errors ) { + diag join("\n", + "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n", + "The following REQUIRED prerequisites were not satisfied:\n", + @dep_errors, + "\n" + ); +} + +pass; + +# vim: ts=4 sts=4 sw=4 et: diff --git a/t/01-basic.t b/t/01-basic.t index 63c570d..3543f95 100644 --- a/t/01-basic.t +++ b/t/01-basic.t @@ -3,7 +3,8 @@ use strict; use warnings; -use Test::Most; +use Test::More; +use Test::Deep; plan 'no_plan'; use Config::Identity; @@ -36,13 +37,56 @@ cmp_deeply( \%cfg, {qw/ apple a1 banana b2 /} ); cmp_deeply( \%identity, {qw/ username alternate user alternate password xyzzy /} ); } +{ + local $Config::Identity::home = File::Spec->catfile(qw/ t assets pause /); + my $expected = {qw/ username alternate password xyzzy /}; + my %got; + + %got = Config::Identity->load_check('pause-alternate',[qw/username password/]); + cmp_deeply( \%got, $expected, "load_check with arrayref" ); + + my %identity = Config::Identity->load_check('pause-alternate',sub {}); + cmp_deeply( \%identity, $expected, "load_check with coderef" ); + + eval { Config::Identity->load_check('pause-alternate', "notfound1") }; + like( $@, qr/^Argument to check keys must be an arrayref or coderef/, "load_check croaks on bad argument" ); + + eval { Config::Identity->load_check('pause-alternate',[qw/notfound1 password/]) }; + like( $@, qr/^Missing required field: notfound1/, "load_check detected missing field" ); + + eval { Config::Identity->load_check('pause-alternate',[qw/notfound1 notfound2 password/]) }; + like( $@, qr/^Missing required fields: notfound1 notfound2/, "load_check detected missing fields" ); + + my $checker = sub { + is( "$_", "$_[0]", "checker sub has same \$_ and \$[0]" ); + cmp_deeply( $_, $expected, "checker sub has expected fields in \$_" ); + return "notfound1"; # fake error + }; + + eval { Config::Identity->load_check('pause-alternate', $checker) }; + like( $@, qr/^Missing required field: notfound1/, "load_check detected missing field (from checker sub)" ); + +} + SKIP: { - skip 'GnuPG not available' unless Config::Identity->GPG; + skip 'GnuPG not available' unless my $gpg = Config::Identity->GPG; + + my $homedir = File::Spec->catfile(qw/ t assets gpg /); + + # Per https://rt.cpan.org/Public/Bug/Display.html?id=112569 gpg 2.1.x + # needs a key format migration run on test data before tests + { + my $gpg_v = qx/$gpg --version/; + my ($first,$second) = $gpg_v =~ /^gpg \s+ \([^)]+\) \s+ (\d+) \. (\d+)/mx; + if ( $first && $second && ($first > 2 || ($first == 2 && $second > 0))) { + qx/$gpg --homedir $homedir --list-secret-keys/; + } + } $ENV{CI_GPG_ARGUMENTS} = '--no-secmem-warning ' . '--no-permission-warning ' . - '--homedir ' . File::Spec->catfile(qw/ t assets gpg /) + '--homedir ' . $homedir ; is( Config::Identity->read( File::Spec->catfile(qw/ t assets test.asc /) ), <<_END_ ); diff --git a/t/assets/gpg/random_seed b/t/assets/gpg/random_seed Binary files differdeleted file mode 100644 index 13bad1e..0000000 --- a/t/assets/gpg/random_seed +++ /dev/null diff --git a/t/assets/pause/.pause-alternate b/t/assets/pause/.pause-alternate index 88d760d..a3ddf3b 100644 --- a/t/assets/pause/.pause-alternate +++ b/t/assets/pause/.pause-alternate @@ -1,2 +1,3 @@ username alternate password xyzzy +wont_parse_empty diff --git a/xt/author/00-compile.t b/xt/author/00-compile.t new file mode 100644 index 0000000..bc89ccb --- /dev/null +++ b/xt/author/00-compile.t @@ -0,0 +1,65 @@ +use 5.006; +use strict; +use warnings; + +# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.056 + +use Test::More; + +plan tests => 4; + +my @module_files = ( + 'Config/Identity.pm', + 'Config/Identity/GitHub.pm', + 'Config/Identity/PAUSE.pm' +); + + + +# fake home for cpan-testers +use File::Temp; +local $ENV{HOME} = File::Temp::tempdir( CLEANUP => 1 ); + + +my @switches = ( + -d 'blib' ? '-Mblib' : '-Ilib', +); + +use File::Spec; +use IPC::Open3; +use IO::Handle; + +open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!"; + +my @warnings; +for my $lib (@module_files) +{ + # see L<perlfaq8/How can I capture STDERR from an external command?> + my $stderr = IO::Handle->new; + + diag('Running: ', join(', ', map { my $str = $_; $str =~ s/'/\\'/g; q{'} . $str . q{'} } + $^X, @switches, '-e', "require q[$lib]")) + if $ENV{PERL_COMPILE_TEST_DEBUG}; + + my $pid = open3($stdin, '>&STDERR', $stderr, $^X, @switches, '-e', "require q[$lib]"); + binmode $stderr, ':crlf' if $^O eq 'MSWin32'; + my @_warnings = <$stderr>; + waitpid($pid, 0); + is($?, 0, "$lib loaded ok"); + + shift @_warnings if @_warnings and $_warnings[0] =~ /^Using .*\bblib/ + and not eval { require blib; blib->VERSION('1.01') }; + + if (@_warnings) + { + warn @_warnings; + push @warnings, @_warnings; + } +} + + + +is(scalar(@warnings), 0, 'no warnings found') + or diag 'got warnings: ', ( Test::More->can('explain') ? Test::More::explain(\@warnings) : join("\n", '', @warnings) ); + + diff --git a/xt/author/critic.t b/xt/author/critic.t new file mode 100644 index 0000000..d5b4c96 --- /dev/null +++ b/xt/author/critic.t @@ -0,0 +1,12 @@ +#!perl + +use strict; +use warnings; + +use Test::More; +use English qw(-no_match_vars); + +eval "use Test::Perl::Critic"; +plan skip_all => 'Test::Perl::Critic required to criticise code' if $@; +Test::Perl::Critic->import( -profile => "perlcritic.rc" ) if -e "perlcritic.rc"; +all_critic_ok(); diff --git a/xt/author/pod-spell.t b/xt/author/pod-spell.t new file mode 100644 index 0000000..de5eb81 --- /dev/null +++ b/xt/author/pod-spell.t @@ -0,0 +1,26 @@ +use strict; +use warnings; +use Test::More; + +# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.007004 +use Test::Spelling 0.12; +use Pod::Wordlist; + + +add_stopwords(<DATA>); +all_pod_files_spelling_ok( qw( bin lib ) ); +__DATA__ +Config +David +GitHub +GnuPG +Golden +Identity +Krimen +PAUSE +Robert +dagolden +decrypt +gpg +lib +robertkrimen diff --git a/xt/author/pod-syntax.t b/xt/author/pod-syntax.t new file mode 100644 index 0000000..e563e5d --- /dev/null +++ b/xt/author/pod-syntax.t @@ -0,0 +1,7 @@ +#!perl +# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. +use strict; use warnings; +use Test::More; +use Test::Pod 1.41; + +all_pod_files_ok(); diff --git a/xt/author/test-version.t b/xt/author/test-version.t new file mode 100644 index 0000000..247ba9a --- /dev/null +++ b/xt/author/test-version.t @@ -0,0 +1,23 @@ +use strict; +use warnings; +use Test::More; + +# generated by Dist::Zilla::Plugin::Test::Version 1.09 +use Test::Version; + +my @imports = qw( version_all_ok ); + +my $params = { + is_strict => 0, + has_version => 1, + multiple => 0, + +}; + +push @imports, $params + if version->parse( $Test::Version::VERSION ) >= version->parse('1.002'); + +Test::Version->import(@imports); + +version_all_ok; +done_testing; diff --git a/xt/release/distmeta.t b/xt/release/distmeta.t new file mode 100644 index 0000000..c2280dc --- /dev/null +++ b/xt/release/distmeta.t @@ -0,0 +1,6 @@ +#!perl +# This file was automatically generated by Dist::Zilla::Plugin::MetaTests. + +use Test::CPAN::Meta; + +meta_yaml_ok(); diff --git a/xt/release/minimum-version.t b/xt/release/minimum-version.t new file mode 100644 index 0000000..708ba15 --- /dev/null +++ b/xt/release/minimum-version.t @@ -0,0 +1,8 @@ +#!perl + +use Test::More; + +eval "use Test::MinimumVersion"; +plan skip_all => "Test::MinimumVersion required for testing minimum versions" + if $@; +all_minimum_version_ok( qq{5.010} ); |