Skip to content

Commit

Permalink
Update tooling to avoid bugs with -Ddefault_inc_excludes_dot
Browse files Browse the repository at this point in the history
Closes #3
  • Loading branch information
kentfredric committed Mar 4, 2017
1 parent 1547e72 commit d66d358
Show file tree
Hide file tree
Showing 11 changed files with 76 additions and 53 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ branches:
- releases
install:
- time perl ./maint-travis-ci/install_deps_early.pl
- time perl ./maint-travis-ci/install_deps.pl
- time perl ./maint-travis-ci/autoinstall_dzil.pl
- time perl ./maint-travis-ci/install_deps_2.pl
language: perl
matrix:
allow_failures:
Expand Down
12 changes: 12 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
Release history for Dist-Zilla-Util-ExpandINI

{{$NEXT}}
[Bugfix]
- Avoid test failures on 5.26 w/ -Ddefault_inc_excludes_dot
- Closes https://github.com/kentnl/Dist-Zilla-Util-ExpandINI/issues/3

[Dependencies::Stats]
- Dependencies changed since 0.003002, see misc/*.deps* for details
- configure: ↑1 -2 (recommends: -1)
- develop: +1 ↑1 -1 (suggests: ↑1)
- test: ↓1

[Misc]
- Use newer EUMM w/ ranged versions instead of DynamicPrereqs magic

0.003002 2015-10-19T10:20:25Z 5d62f99
[Dependencies::Stats]
Expand Down
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This software is copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.

This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
Expand All @@ -12,7 +12,7 @@ b) the "Artistic License"

--- The GNU General Public License, Version 1, February 1989 ---

This software is Copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
This software is Copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.

This is free software, licensed under:

Expand Down Expand Up @@ -272,7 +272,7 @@ That's all there is to it!

--- The Artistic License 1.0 ---

This software is Copyright (c) 2015 by Kent Fredric <kentfredric@gmail.com>.
This software is Copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.

This is free software, licensed under:

Expand Down
41 changes: 5 additions & 36 deletions Makefile.PL
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v5.039.
# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.008.
use strict;
use warnings;

use 5.006;

use ExtUtils::MakeMaker;
use ExtUtils::MakeMaker 7.1101;

my %WriteMakefileArgs = (
"ABSTRACT" => "Read an INI file and expand bundles as you go.",
"AUTHOR" => "Kent Fredric <kentnl\@cpan.org>",
"CONFIGURE_REQUIRES" => {
"CPAN::Meta::Requirements" => "2.120620",
"ExtUtils::MakeMaker" => 0,
"Module::Metadata" => 0
"ExtUtils::MakeMaker" => "7.1101"
},
"DISTNAME" => "Dist-Zilla-Util-ExpandINI",
"LICENSE" => "perl",
Expand All @@ -36,7 +34,7 @@ my %WriteMakefileArgs = (
"ExtUtils::MakeMaker" => 0,
"File::Spec" => 0,
"Test::Differences" => 0,
"Test::More" => "0.89"
"Test::More" => 0
},
"VERSION" => "0.003003",
"test" => {
Expand All @@ -58,15 +56,12 @@ my %FallbackPrereqs = (
"Moo" => "1.000008",
"Scalar::Util" => 0,
"Test::Differences" => 0,
"Test::More" => "0.89",
"Test::More" => 0,
"parent" => 0,
"strict" => 0,
"warnings" => 0
);

# inserted by Dist::Zilla::Plugin::DynamicPrereqs 0.016
requires('Mixin::Linewise', '0.108') if has_module('Mixin::Linewise', '0.107');


unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
delete $WriteMakefileArgs{TEST_REQUIRES};
Expand All @@ -78,29 +73,3 @@ delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
unless eval { ExtUtils::MakeMaker->VERSION(6.52) };

WriteMakefile(%WriteMakefileArgs);

# inserted by Dist::Zilla::Plugin::DynamicPrereqs 0.016
sub has_module {
my ($module, $version_or_range) = @_;
require Module::Metadata;
my $mmd = Module::Metadata->new_from_module($module);
return undef if not $mmd;
return $mmd->version($module) if not defined $version_or_range;

require CPAN::Meta::Requirements;
my $req = CPAN::Meta::Requirements->new;
$req->add_string_requirement($module => $version_or_range);
return 1 if $req->accepts_module($module => $mmd->version($module));
return 0;
}

sub requires {
goto &runtime_requires;
}

sub runtime_requires {
my ($module, $version_or_range) = @_;
$version_or_range = '0' if not $version_or_range;
$WriteMakefileArgs{PREREQ_PM}{$module} = $FallbackPrereqs{$module} = $version_or_range;
return;
}
4 changes: 2 additions & 2 deletions README.mkdn
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ And also note, at this time, only whole-line comments are preserved. Suffix comm

# AUTHOR

Kent Fredric &lt;kentnl@cpan.org>
Kent Fredric <kentnl@cpan.org>

# COPYRIGHT AND LICENSE

This software is copyright (c) 2015 by Kent Fredric &lt;kentfredric@gmail.com>.
This software is copyright (c) 2017 by Kent Fredric <kentfredric@gmail.com>.

This is free software; you can redistribute it and/or modify it under
the same terms as the Perl 5 programming language system itself.
11 changes: 5 additions & 6 deletions dist.ini
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ trailing_whitespace = 1
[Test::MinimumVersion / @Author::KENTNL/Test::MinimumVersion]

[Test::Compile::PerFile / @Author::KENTNL/Test::Compile::PerFile]
:version = 0.003902
test_template = 02-raw-require.t.tpl

[Test::Perl::Critic / @Author::KENTNL/Test::Perl::Critic]

Expand All @@ -95,7 +97,7 @@ replacer = replace_with_blank
-phase = develop
-type = suggests
Dist::Zilla::App::Command::bakeini = 0.001000
Dist::Zilla::PluginBundle::Author::KENTNL = 2.025002
Dist::Zilla::PluginBundle::Author::KENTNL = 2.025021

[Prereqs::AuthorDeps / @Author::KENTNL/Prereqs::AuthorDeps]

Expand All @@ -109,6 +111,7 @@ locate_comment = 1

[MakeMaker / @Author::KENTNL/MakeMaker]
default_jobs = 10
eumm_version = 7.1101

[Author::KENTNL::RecommendFixes / @Author::KENTNL/Author::KENTNL::RecommendFixes]
:version = 0.004002
Expand Down Expand Up @@ -226,7 +229,7 @@ Dist::Zilla::Plugin::RemovePrereqs::Provided = 0
Dist::Zilla::Plugin::RewriteVersion::Sanitized = 0
Dist::Zilla::Plugin::RunExtraTests = 0
Dist::Zilla::Plugin::Test::CPAN::Changes = 0
Dist::Zilla::Plugin::Test::Compile::PerFile = 0
Dist::Zilla::Plugin::Test::Compile::PerFile = 0.003902
Dist::Zilla::Plugin::Test::EOL = 0
Dist::Zilla::Plugin::Test::Kwalitee = 0
Dist::Zilla::Plugin::Test::MinimumVersion = 0
Expand All @@ -239,7 +242,3 @@ Dist::Zilla::Plugin::UploadToCPAN = 0
[Prereqs]
; authordep Pod::Elemental::Transformer::List
Mixin::Linewise = != 0.107

[DynamicPrereqs]
:version = 0.016
-raw = requires('Mixin::Linewise', '0.108') if has_module('Mixin::Linewise', '0.107');
6 changes: 1 addition & 5 deletions dist.ini.meta
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@ toolkit_hardness = soft
twitter_extra_hash_tags = #distzilla
bumpversions = 1
srcreadme = mkdn
MakeMaker.eumm_version = 7.1101
; auto_prereqs_skip = File::Find


[Prereqs]
; authordep Pod::Elemental::Transformer::List
Mixin::Linewise = != 0.107 ; not understood except on very new EUMM

[DynamicPrereqs]
:version = 0.016
-raw = requires('Mixin::Linewise', '0.108') if has_module('Mixin::Linewise', '0.107');
9 changes: 9 additions & 0 deletions misc/Changes.deps
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
This file contains changes in REQUIRED dependencies for standard CPAN phases (configure/build/runtime/test)

0.003003
[Changed / configure requires]
- ExtUtils::MakeMaker 0 → 7.1101

[Changed / test requires]
- Test::More 0.89 → 0

[Removed / configure requires]
- CPAN::Meta::Requirements 2.120620
- Module::Metadata

0.003002 2015-10-19T10:20:25Z
[Added / configure requires]
Expand Down
24 changes: 24 additions & 0 deletions misc/Changes.deps.all
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL dependencies for all phases (configure/build/runtime/test/develop)

0.003003
[Added / develop requires]
- Test::MinimumVersion

[Changed / configure requires]
- ExtUtils::MakeMaker 0 → 7.1101

[Changed / develop requires]
- Dist::Zilla::Plugin::Test::Compile::PerFile 0 → 0.003902

[Changed / develop suggests]
- Dist::Zilla::PluginBundle::Author::KENTNL 2.025002 → 2.025021

[Changed / test requires]
- Test::More 0.89 → 0

[Removed / configure recommends]
- ExtUtils::MakeMaker 7.00

[Removed / configure requires]
- CPAN::Meta::Requirements 2.120620
- Module::Metadata

[Removed / develop requires]
- Dist::Zilla::Plugin::DynamicPrereqs 0.016

0.003002 2015-10-19T10:20:25Z
[Added / configure requires]
Expand Down
11 changes: 11 additions & 0 deletions misc/Changes.deps.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and OPTIONAL )

0.003003
[Added / develop requires]
- Test::MinimumVersion

[Changed / develop requires]
- Dist::Zilla::Plugin::Test::Compile::PerFile 0 → 0.003902

[Changed / develop suggests]
- Dist::Zilla::PluginBundle::Author::KENTNL 2.025002 → 2.025021

[Removed / develop requires]
- Dist::Zilla::Plugin::DynamicPrereqs 0.016

0.003002 2015-10-19T10:20:25Z
[Added / develop requires]
Expand Down
2 changes: 2 additions & 0 deletions misc/Changes.deps.opt
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
This file contains changes in OPTIONAL dependencies for standard CPAN phases (configure/build/runtime/test)

0.003003
[Removed / configure recommends]
- ExtUtils::MakeMaker 7.00

0.003002 2015-10-19T10:20:25Z

Expand Down

0 comments on commit d66d358

Please sign in to comment.