This is an automated email from the git hooks/post-receive script. abe pushed a commit to annotated tag 1.001002 in repository libdist-zilla-role-bootstrap-perl.
commit 26e3928564f1cabb7f6625ba20a7ab6f2c08bb5f Author: Kent Fredric <kentfred...@gmail.com> Date: Wed Jul 1 16:20:57 2015 +1200 Build results of 3001a58 (on master) --- .gitignore | 6 +++++ Changes | 9 +++++++ INSTALL.SKIP | 1 + MANIFEST | 1 + META.json | 36 ++++++++++++++++++++----- META.yml | 4 +-- Makefile.PL | 2 +- dist.ini | 15 ++++++++++- dist.ini.meta | 1 - lib/Dist/Zilla/Role/Bootstrap.pm | 4 +-- misc/Changes.deps | 4 ++- misc/Changes.deps.all | 10 ++++++- misc/Changes.deps.dev | 10 ++++++- misc/Changes.deps.opt | 4 ++- misc/built_with.json | 4 ++- t/00-report-prereqs.dd | 4 ++- t/02-try-built-mtime.t | 58 +++++++++++++++++++++++++++++++--------- 17 files changed, 141 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 62fd55d..d30b2ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ .build Dist-Zilla-Role-Bootstrap-* +MYMETA.json +MYMETA.yml +Makefile +Makefile.old +blib +pm_to_blib diff --git a/Changes b/Changes index 799f14c..57558cb 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,14 @@ Release history for Dist-Zilla-Role-Bootstrap +1.001002 2015-07-01T04:05:24Z 66d4baf + [Bugfix] + - Bodge around testers with broken mtime implementations by agressively trying to make files with seperate mtimes and + then skipping all the tests if that isnt possible, with a grace window of up to 5 seconds to get it right. + + [Dependencies::Stats] + - Dependencies changed since 1.001001, see misc/*.deps* for details + - develop: +2 (suggests: ↑1) + 1.001001 2015-06-29T09:03:38Z ab79bd2 [Bugfix] - Add diagnostics on mtime test to see why it failed. diff --git a/INSTALL.SKIP b/INSTALL.SKIP new file mode 100644 index 0000000..31cdaea --- /dev/null +++ b/INSTALL.SKIP @@ -0,0 +1 @@ +CONTRIBUTING.pod$ diff --git a/MANIFEST b/MANIFEST index 8a18e80..eeaca61 100644 --- a/MANIFEST +++ b/MANIFEST @@ -4,6 +4,7 @@ .perltidyrc .travis.yml Changes +INSTALL.SKIP LICENSE MANIFEST META.json diff --git a/META.json b/META.json index cb38e7f..33ab885 100644 --- a/META.json +++ b/META.json @@ -29,6 +29,7 @@ }, "requires" : { "Dist::Zilla" : "5", + "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : "0.001002", "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.004002", "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001002", "Dist::Zilla::Plugin::Authority" : "1.006", @@ -64,6 +65,7 @@ "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0", "Dist::Zilla::Plugin::Readme::Brief" : "0", "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0", + "Dist::Zilla::Plugin::RemovePrereqs::Provided" : "0", "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0", "Dist::Zilla::Plugin::RunExtraTests" : "0", "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0", @@ -87,7 +89,7 @@ }, "suggests" : { "Dist::Zilla::App::Command::bakeini" : "0.002005", - "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.024002" + "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025000" } }, "runtime" : { @@ -133,7 +135,7 @@ "provides" : { "Dist::Zilla::Role::Bootstrap" : { "file" : "lib/Dist/Zilla/Role/Bootstrap.pm", - "version" : "1.001001" + "version" : "1.001002" } }, "release_status" : "stable", @@ -148,7 +150,7 @@ "web" : "https://github.com/kentnl/Dist-Zilla-Role-Bootstrap" } }, - "version" : "1.001001", + "version" : "1.001002", "x_BuiltWith" : { "external_file" : "misc/built_with.json" }, @@ -233,7 +235,9 @@ "README", "README.mkdn", "README.pod", - "LICENSE" + "CONTRIBUTING.mkdn", + "LICENSE", + "Makefile.PL" ], "exclude_match" : [], "follow_symlinks" : "0", @@ -281,6 +285,16 @@ "version" : "0.001002" }, { + "class" : "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING", + "config" : { + "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : { + "document_version" : "0.1" + } + }, + "name" : "@Author::KENTNL/Author::KENTNL::CONTRIBUTING", + "version" : "0.001004" + }, + { "class" : "Dist::Zilla::Plugin::CopyFilesFromBuild", "name" : "@Author::KENTNL/CopyXBuild", "version" : "0.151680" @@ -626,7 +640,7 @@ "Dist::Zilla::Plugin::Git::Tag" : { "branch" : null, "signed" : 0, - "tag" : "1.001001-source", + "tag" : "1.001002-source", "tag_format" : "%v-source", "tag_message" : "v%v", "time_zone" : "local" @@ -640,6 +654,11 @@ }, { "class" : "Dist::Zilla::Plugin::Git::NextRelease", + "config" : { + "Dist::Zilla::Plugin::Git::NextRelease" : { + "default_branch" : "master" + } + }, "name" : "@Author::KENTNL/Git::NextRelease", "version" : "0.004000" }, @@ -697,7 +716,7 @@ "Dist::Zilla::Plugin::Git::Tag" : { "branch" : "releases", "signed" : 0, - "tag" : "1.001001", + "tag" : "1.001002", "tag_format" : "%v", "tag_message" : "v%v", "time_zone" : "local" @@ -761,6 +780,11 @@ "version" : "0.003001" }, { + "class" : "Dist::Zilla::Plugin::RemovePrereqs::Provided", + "name" : "@Author::KENTNL/RemovePrereqs::Provided", + "version" : "0.001000" + }, + { "class" : "Dist::Zilla::Plugin::Prereqs", "config" : { "Dist::Zilla::Plugin::Prereqs" : { diff --git a/META.yml b/META.yml index aafd464..dc3fd9a 100644 --- a/META.yml +++ b/META.yml @@ -27,7 +27,7 @@ name: Dist-Zilla-Role-Bootstrap provides: Dist::Zilla::Role::Bootstrap: file: lib/Dist/Zilla/Role/Bootstrap.pm - version: '1.001001' + version: '1.001002' recommends: Path::Tiny: '0.058' requires: @@ -46,4 +46,4 @@ resources: bugtracker: https://github.com/kentnl/Dist-Zilla-Role-Bootstrap/issues homepage: https://github.com/kentnl/Dist-Zilla-Role-Bootstrap repository: https://github.com/kentnl/Dist-Zilla-Role-Bootstrap.git -version: '1.001001' +version: '1.001002' diff --git a/Makefile.PL b/Makefile.PL index 573e310..1ec08ba 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -41,7 +41,7 @@ my %WriteMakefileArgs = ( "Moose" => 0, "Test::More" => "0.89" }, - "VERSION" => "1.001001", + "VERSION" => "1.001002", "test" => { "TESTS" => "t/*.t t/00-compile/*.t" } diff --git a/dist.ini b/dist.ini index 8babc60..3b63822 100644 --- a/dist.ini +++ b/dist.ini @@ -35,7 +35,9 @@ order_by = name exclude_filename = README exclude_filename = README.mkdn exclude_filename = README.pod +exclude_filename = CONTRIBUTING.mkdn exclude_filename = LICENSE +exclude_filename = Makefile.PL include_dotfiles = 1 [License / @Author::KENTNL/License] @@ -49,8 +51,14 @@ include_dotfiles = 1 [Author::KENTNL::TravisCI / @Author::KENTNL/Author::KENTNL::TravisCI] :version = 0.001002 +[Author::KENTNL::CONTRIBUTING / @Author::KENTNL/Author::KENTNL::CONTRIBUTING] +:version = 0.001002 +document_version = 0.1 +format = mkdn + [CopyFilesFromBuild / @Author::KENTNL/CopyXBuild] copy = LICENSE +copy = Makefile.PL [MetaTests / @Author::KENTNL/MetaTests] @@ -86,7 +94,7 @@ replacer = replace_with_blank -phase = develop -type = suggests Dist::Zilla::App::Command::bakeini = 0.001000 -Dist::Zilla::PluginBundle::Author::KENTNL = 2.024002 +Dist::Zilla::PluginBundle::Author::KENTNL = 2.025000 [Prereqs::AuthorDeps / @Author::KENTNL/Prereqs::AuthorDeps] @@ -130,6 +138,7 @@ tag_format = %v-source [Git::NextRelease / @Author::KENTNL/Git::NextRelease] :version = 0.004000 +default_branch = master format = %v %{yyyy-MM-dd'T'HH:mm:ss}dZ %h time_zone = UTC @@ -170,6 +179,8 @@ applyto_phase = develop modules = Dist::Zilla::PluginBundle::Author::KENTNL modules = Dist::Zilla::App::Command::bakeini +[RemovePrereqs::Provided / @Author::KENTNL/RemovePrereqs::Provided] + [Prereqs / @Author::KENTNL/::Role::BundleDeps] ; version_major = 0 ; version_minor = 1 @@ -182,6 +193,7 @@ modules = Dist::Zilla::App::Command::bakeini ; auto_prereqs_skip = File::Find -phase = develop -relationship = requires +Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING = 0.001002 Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes = 0.004002 Dist::Zilla::Plugin::Author::KENTNL::TravisCI = 0.001002 Dist::Zilla::Plugin::Authority = 1.006 @@ -217,6 +229,7 @@ Dist::Zilla::Plugin::Prereqs::Recommend::MatchInstalled = 0 Dist::Zilla::Plugin::Prereqs::Upgrade = 0 Dist::Zilla::Plugin::Readme::Brief = 0 Dist::Zilla::Plugin::ReadmeAnyFromPod = 0 +Dist::Zilla::Plugin::RemovePrereqs::Provided = 0 Dist::Zilla::Plugin::RewriteVersion::Sanitized = 0 Dist::Zilla::Plugin::RunExtraTests = 0 Dist::Zilla::Plugin::Test::CPAN::Changes = 0 diff --git a/dist.ini.meta b/dist.ini.meta index 60a4cfd..bb6e026 100644 --- a/dist.ini.meta +++ b/dist.ini.meta @@ -16,7 +16,6 @@ mantissa = 6 toolkit = eumm toolkit_hardness = soft bumpversions = 1 -copyfiles = LICENSE srcreadme = mkdn twitter_extra_hash_tags = #distzilla diff --git a/lib/Dist/Zilla/Role/Bootstrap.pm b/lib/Dist/Zilla/Role/Bootstrap.pm index d43f93a..476792d 100644 --- a/lib/Dist/Zilla/Role/Bootstrap.pm +++ b/lib/Dist/Zilla/Role/Bootstrap.pm @@ -5,7 +5,7 @@ use utf8; package Dist::Zilla::Role::Bootstrap; -our $VERSION = '1.001001'; +our $VERSION = '1.001002'; # ABSTRACT: Shared logic for bootstrap things. @@ -303,7 +303,7 @@ Dist::Zilla::Role::Bootstrap - Shared logic for bootstrap things. =head1 VERSION -version 1.001001 +version 1.001002 =head1 SYNOPSIS diff --git a/misc/Changes.deps b/misc/Changes.deps index 101e61f..fd30f42 100644 --- a/misc/Changes.deps +++ b/misc/Changes.deps @@ -1,6 +1,8 @@ This file contains changes in REQUIRED dependencies for standard CPAN phases (configure/build/runtime/test) -1.001001 +1.001002 + +1.001001 2015-06-29T09:03:38Z 1.001000 2015-01-20T20:29:54Z [Added / configure requires] diff --git a/misc/Changes.deps.all b/misc/Changes.deps.all index ee8bfa8..65d1ede 100644 --- a/misc/Changes.deps.all +++ b/misc/Changes.deps.all @@ -1,6 +1,14 @@ This file contains ALL changes in dependencies in both REQUIRED / OPTIONAL dependencies for all phases (configure/build/runtime/test/develop) -1.001001 +1.001002 + [Added / develop requires] + - Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING 0.001002 + - Dist::Zilla::Plugin::RemovePrereqs::Provided + + [Changed / develop suggests] + - Dist::Zilla::PluginBundle::Author::KENTNL 2.024002 → 2.025000 + +1.001001 2015-06-29T09:03:38Z [Added / develop requires] - Dist::Zilla::Plugin::MetaYAML::Minimal diff --git a/misc/Changes.deps.dev b/misc/Changes.deps.dev index fe01b09..c025b29 100644 --- a/misc/Changes.deps.dev +++ b/misc/Changes.deps.dev @@ -1,6 +1,14 @@ This file contains changes to DEVELOPMENT dependencies only ( both REQUIRED and OPTIONAL ) -1.001001 +1.001002 + [Added / develop requires] + - Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING 0.001002 + - Dist::Zilla::Plugin::RemovePrereqs::Provided + + [Changed / develop suggests] + - Dist::Zilla::PluginBundle::Author::KENTNL 2.024002 → 2.025000 + +1.001001 2015-06-29T09:03:38Z [Added / develop requires] - Dist::Zilla::Plugin::MetaYAML::Minimal diff --git a/misc/Changes.deps.opt b/misc/Changes.deps.opt index 3242d1b..9a49e34 100644 --- a/misc/Changes.deps.opt +++ b/misc/Changes.deps.opt @@ -1,6 +1,8 @@ This file contains changes in OPTIONAL dependencies for standard CPAN phases (configure/build/runtime/test) -1.001001 +1.001002 + +1.001001 2015-06-29T09:03:38Z 1.001000 2015-01-20T20:29:54Z [Added / runtime recommends] diff --git a/misc/built_with.json b/misc/built_with.json index 6f4805a..f48d074 100644 --- a/misc/built_with.json +++ b/misc/built_with.json @@ -8,6 +8,7 @@ "Dist::Zilla::Dist::Builder" : "5.037", "Dist::Zilla::MVP::Assembler::Zilla" : "5.037", "Dist::Zilla::MVP::Section" : "5.037", + "Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING" : "0.001004", "Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes" : "0.004003", "Dist::Zilla::Plugin::Author::KENTNL::TravisCI" : "0.001002", "Dist::Zilla::Plugin::Authority" : "1.009", @@ -43,6 +44,7 @@ "Dist::Zilla::Plugin::Prereqs::Upgrade" : "0.001000", "Dist::Zilla::Plugin::Readme::Brief" : "0.002005", "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0.150250", + "Dist::Zilla::Plugin::RemovePrereqs::Provided" : "0.001000", "Dist::Zilla::Plugin::RewriteVersion::Sanitized" : "0.001005", "Dist::Zilla::Plugin::RunExtraTests" : "0.027", "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0.009", @@ -55,7 +57,7 @@ "Dist::Zilla::Plugin::TestRelease" : "5.037", "Dist::Zilla::Plugin::Twitter" : "0.026", "Dist::Zilla::Plugin::UploadToCPAN" : "5.037", - "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.024002", + "Dist::Zilla::PluginBundle::Author::KENTNL" : "2.025000", "Dist::Zilla::Role::Plugin" : "5.037", "ExtUtils::MakeMaker" : "7.04_01", "File::Copy::Recursive" : "0.38", diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd index a1feb9d..6e13ac2 100644 --- a/t/00-report-prereqs.dd +++ b/t/00-report-prereqs.dd @@ -14,6 +14,7 @@ do { my $x = { }, 'requires' => { 'Dist::Zilla' => '5', + 'Dist::Zilla::Plugin::Author::KENTNL::CONTRIBUTING' => '0.001002', 'Dist::Zilla::Plugin::Author::KENTNL::RecommendFixes' => '0.004002', 'Dist::Zilla::Plugin::Author::KENTNL::TravisCI' => '0.001002', 'Dist::Zilla::Plugin::Authority' => '1.006', @@ -49,6 +50,7 @@ do { my $x = { 'Dist::Zilla::Plugin::Prereqs::Upgrade' => '0', 'Dist::Zilla::Plugin::Readme::Brief' => '0', 'Dist::Zilla::Plugin::ReadmeAnyFromPod' => '0', + 'Dist::Zilla::Plugin::RemovePrereqs::Provided' => '0', 'Dist::Zilla::Plugin::RewriteVersion::Sanitized' => '0', 'Dist::Zilla::Plugin::RunExtraTests' => '0', 'Dist::Zilla::Plugin::Test::CPAN::Changes' => '0', @@ -72,7 +74,7 @@ do { my $x = { }, 'suggests' => { 'Dist::Zilla::App::Command::bakeini' => '0.002005', - 'Dist::Zilla::PluginBundle::Author::KENTNL' => '2.024002' + 'Dist::Zilla::PluginBundle::Author::KENTNL' => '2.025000' } }, 'runtime' => { diff --git a/t/02-try-built-mtime.t b/t/02-try-built-mtime.t index 024c838..7b242be 100644 --- a/t/02-try-built-mtime.t +++ b/t/02-try-built-mtime.t @@ -42,12 +42,41 @@ use File::Copy::Recursive qw(rcopy); rcopy "$source", "$scratch"; -$scratch->child("Example-0.01")->child('lib')->mkpath; -sleep 2; -$scratch->child("Example-0.10")->child('lib')->mkpath; -sleep 2; -$scratch->child("Example-0.05")->child('lib')->mkpath; +my (@scratches) = map { $scratch->child( 'Example-' . $_ ) } qw( 0.01 0.10 0.05 ); +for my $scratch_id ( 0 .. $#scratches ) { + my $scratch = $scratches[$scratch_id]; + if ( $scratch_id == 0 ) { + $scratch->child('lib')->mkpath; + next; + } + my $tries = 0; + my $sleep_step = 0.3; # Start intentionally slow to hopefully hit a subsecond transition. + my $elapsed = 0.0; + + while ( not -e $scratch or $scratch->stat->mtime <= $scratches[ $scratch_id - 1 ]->stat->mtime ) { + $tries++; + if ( $elapsed > 5 ) { + diag "Your system has a broken clock/filesystem and mtime based tests cant work"; + SKIP: { + skip "Broken MTime", 8; + } + done_testing; + exit 0; + } + if ( $elapsed > 2 ) { + diag "mtime looks a bit wonky :/, this test will seem slow"; + } + + select( undef, undef, undef, $sleep_step ); + $elapsed += $sleep_step; + note "Attempt " . ($tries) . " at creating " . $scratch . " @" . (gmtime) . "( elapsed: $elapsed )"; + $scratch->remove_tree() if -e $scratch; + $scratch->child('lib')->mkpath; + $sleep_step = $sleep_step * 2; # Exponentially larger steps to find clock slew as fast as possible + } + note "Succcess @" . (gmtime) . "( elapsed: $elapsed )"; +} chdir $scratch->stringify; $section->current_section->payload->{chrome} = $chrome; @@ -81,14 +110,17 @@ is_deeply( 'dump_config is expected' ); -is( $instance->distname, 'Example', 'distname is Example' ); -is( $instance->_cwd->realpath, $scratch->realpath, 'cwd is project root/' ); -is( $instance->try_built, 1, 'try_built is on' ); -is( $instance->try_built_method, 'mtime', 'try_built_method is mtime' ); -is( $instance->fallback, 1, 'fallback is on' ); -is( $instance->_bootstrap_root->realpath, $scratch->child('Example-0.05')->realpath, '_bootstrap_root == _cwd' ) or diag explain [ - map { { $_->stringify => $_->stat->mtime } } map { $scratch->child("Example-$_") } qw( 0.01 0.10 0.05 ) -]; +is( $instance->distname, 'Example', 'distname is Example' ); +is( $instance->_cwd->realpath, $scratch->realpath, 'cwd is project root/' ); +is( $instance->try_built, 1, 'try_built is on' ); +is( $instance->try_built_method, 'mtime', 'try_built_method is mtime' ); +is( $instance->fallback, 1, 'fallback is on' ); +is( $instance->_bootstrap_root->realpath, $scratch->child('Example-0.05')->realpath, '_bootstrap_root == _cwd' ) + or diag explain [ + map { + { $_->stringify => $_->stat->mtime } + } @scratches + ]; ok( $instance->can('_add_inc'), '_add_inc method exists' ); chdir $cwd->stringify; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdist-zilla-role-bootstrap-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list Pkg-perl-cvs-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits