From 79f8cd40f816827dbdde3979a94f404bf660fd28 Mon Sep 17 00:00:00 2001 From: Charles McGarvey Date: Fri, 25 Nov 2016 22:13:19 -0700 Subject: [PATCH] Version 0.002 --- Changes | 8 ++++ MANIFEST | 20 +++++----- META.json | 13 ++++--- META.yml | 9 +++-- Makefile.PL | 8 ++-- README | 10 ++--- cpanfile | 3 +- lib/Dist/Zilla/PluginBundle/Author/CCM.pm | 27 ++++++++------ lib/Pod/Weaver/PluginBundle/Author/CCM.pm | 4 +- t/00-report-prereqs.dd | 7 +++- t/author-no-tabs.t | 37 ------------------- t/release-distmeta.t | 14 ------- .../author/clean-namespaces.t | 8 ---- t/author-critic.t => xt/author/critic.t | 8 ---- t/author-eol.t => xt/author/eol.t | 28 +++++--------- xt/author/no-tabs.t | 29 +++++++++++++++ .../author/pod-coverage.t | 8 ---- .../author/pod-no404s.t | 8 ---- .../author/pod-syntax.t | 8 ---- .../author/portability.t | 8 ---- .../release/cpan-changes.t | 8 ---- xt/release/distmeta.t | 6 +++ 22 files changed, 110 insertions(+), 169 deletions(-) delete mode 100644 t/author-no-tabs.t delete mode 100644 t/release-distmeta.t rename t/author-clean-namespaces.t => xt/author/clean-namespaces.t (64%) rename t/author-critic.t => xt/author/critic.t (68%) rename t/author-eol.t => xt/author/eol.t (50%) create mode 100644 xt/author/no-tabs.t rename t/author-pod-coverage.t => xt/author/pod-coverage.t (62%) rename t/author-pod-no404s.t => xt/author/pod-no404s.t (72%) rename t/author-pod-syntax.t => xt/author/pod-syntax.t (56%) rename t/author-portability.t => xt/author/portability.t (58%) rename t/release-cpan-changes.t => xt/release/cpan-changes.t (62%) create mode 100644 xt/release/distmeta.t diff --git a/Changes b/Changes index 2fda8b5..82b35ad 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,13 @@ Revision history for Dist-Zilla-PluginBundle-Author-CCM. +0.002 2016-11-25 22:12:27-07:00 MST7MDT + + * Add DZIL_NO_UPLOAD to enable no_upload mode + * Only rewrite repo README on release + * Use RunExtraTests instead of ExtraTests + * Use Bootstrap::lib + * Require Dist::Zilla 5.038 (for :ExtraTestFiles) + 0.001 2016-11-25 18:28:13-07:00 MST7MDT * Initial version diff --git a/MANIFEST b/MANIFEST index 4ff05e8..607e709 100644 --- a/MANIFEST +++ b/MANIFEST @@ -14,13 +14,13 @@ t/00-compile.t t/00-report-prereqs.dd t/00-report-prereqs.t t/01-basic.t -t/author-clean-namespaces.t -t/author-critic.t -t/author-eol.t -t/author-no-tabs.t -t/author-pod-coverage.t -t/author-pod-no404s.t -t/author-pod-syntax.t -t/author-portability.t -t/release-cpan-changes.t -t/release-distmeta.t +xt/author/clean-namespaces.t +xt/author/critic.t +xt/author/eol.t +xt/author/no-tabs.t +xt/author/pod-coverage.t +xt/author/pod-no404s.t +xt/author/pod-syntax.t +xt/author/portability.t +xt/release/cpan-changes.t +xt/release/distmeta.t diff --git a/META.json b/META.json index 699eaf7..ea2a3e6 100644 --- a/META.json +++ b/META.json @@ -38,14 +38,16 @@ "develop" : { "requires" : { "Dist::Zilla" : "5", + "Dist::Zilla::Plugin::Bootstrap::lib" : "0", "Dist::Zilla::PluginBundle::Author::CCM" : "0", + "English" : "0", "Pod::Coverage::TrustPod" : "0", "Software::License::Perl_5" : "0", "Test::CPAN::Changes" : "0.19", "Test::CPAN::Meta" : "0", "Test::CleanNamespaces" : "0.15", "Test::EOL" : "0", - "Test::More" : "0.88", + "Test::More" : "0.96", "Test::NoTabs" : "0", "Test::Pod" : "1.41", "Test::Pod::Coverage" : "1.08", @@ -55,6 +57,7 @@ }, "runtime" : { "requires" : { + "Dist::Zilla" : "5.038", "Dist::Zilla::Plugin::Authority" : "0", "Dist::Zilla::Plugin::AutoPrereqs" : "0", "Dist::Zilla::Plugin::BlockRelease" : "0", @@ -63,7 +66,6 @@ "Dist::Zilla::Plugin::CopyFilesFromBuild" : "0", "Dist::Zilla::Plugin::Encoding" : "0", "Dist::Zilla::Plugin::ExecDir" : "0", - "Dist::Zilla::Plugin::ExtraTests" : "0", "Dist::Zilla::Plugin::FakeRelease" : "0", "Dist::Zilla::Plugin::Git::Check" : "0", "Dist::Zilla::Plugin::Git::Commit" : "0", @@ -95,6 +97,7 @@ "Dist::Zilla::Plugin::PruneFiles" : "0", "Dist::Zilla::Plugin::ReadmeAnyFromPod" : "0", "Dist::Zilla::Plugin::ReversionOnRelease" : "0", + "Dist::Zilla::Plugin::RunExtraTests" : "0", "Dist::Zilla::Plugin::Test::CPAN::Changes" : "0", "Dist::Zilla::Plugin::Test::CleanNamespaces" : "0", "Dist::Zilla::Plugin::Test::Compile" : "0", @@ -151,11 +154,11 @@ "provides" : { "Dist::Zilla::PluginBundle::Author::CCM" : { "file" : "lib/Dist/Zilla/PluginBundle/Author/CCM.pm", - "version" : "0.001" + "version" : "0.002" }, "Pod::Weaver::PluginBundle::Author::CCM" : { "file" : "lib/Pod/Weaver/PluginBundle/Author/CCM.pm", - "version" : "0.001" + "version" : "0.002" } }, "release_status" : "stable", @@ -170,7 +173,7 @@ "web" : "https://github.com/chazmcgarvey/Dist-Zilla-PluginBundle-Author-CCM" } }, - "version" : "0.001", + "version" : "0.002", "x_authority" : "cpan:CCM", "x_serialization_backend" : "Cpanel::JSON::XS version 3.0224" } diff --git a/META.yml b/META.yml index 7187bcf..00f55f3 100644 --- a/META.yml +++ b/META.yml @@ -35,11 +35,12 @@ no_index: provides: Dist::Zilla::PluginBundle::Author::CCM: file: lib/Dist/Zilla/PluginBundle/Author/CCM.pm - version: '0.001' + version: '0.002' Pod::Weaver::PluginBundle::Author::CCM: file: lib/Pod/Weaver/PluginBundle/Author/CCM.pm - version: '0.001' + version: '0.002' requires: + Dist::Zilla: '5.038' Dist::Zilla::Plugin::Authority: '0' Dist::Zilla::Plugin::AutoPrereqs: '0' Dist::Zilla::Plugin::BlockRelease: '0' @@ -48,7 +49,6 @@ requires: Dist::Zilla::Plugin::CopyFilesFromBuild: '0' Dist::Zilla::Plugin::Encoding: '0' Dist::Zilla::Plugin::ExecDir: '0' - Dist::Zilla::Plugin::ExtraTests: '0' Dist::Zilla::Plugin::FakeRelease: '0' Dist::Zilla::Plugin::Git::Check: '0' Dist::Zilla::Plugin::Git::Commit: '0' @@ -80,6 +80,7 @@ requires: Dist::Zilla::Plugin::PruneFiles: '0' Dist::Zilla::Plugin::ReadmeAnyFromPod: '0' Dist::Zilla::Plugin::ReversionOnRelease: '0' + Dist::Zilla::Plugin::RunExtraTests: '0' Dist::Zilla::Plugin::Test::CPAN::Changes: '0' Dist::Zilla::Plugin::Test::CleanNamespaces: '0' Dist::Zilla::Plugin::Test::Compile: '0' @@ -120,6 +121,6 @@ resources: bugtracker: https://github.com/chazmcgarvey/Dist-Zilla-PluginBundle-Author-CCM/issues homepage: https://github.com/chazmcgarvey/Dist-Zilla-PluginBundle-Author-CCM repository: https://github.com/chazmcgarvey/Dist-Zilla-PluginBundle-Author-CCM.git -version: '0.001' +version: '0.002' x_authority: cpan:CCM x_serialization_backend: 'YAML::Tiny version 1.69' diff --git a/Makefile.PL b/Makefile.PL index 485fbd2..4e001c5 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -17,6 +17,7 @@ my %WriteMakefileArgs = ( "MIN_PERL_VERSION" => "5.006", "NAME" => "Dist::Zilla::PluginBundle::Author::CCM", "PREREQ_PM" => { + "Dist::Zilla" => "5.038", "Dist::Zilla::Plugin::Authority" => 0, "Dist::Zilla::Plugin::AutoPrereqs" => 0, "Dist::Zilla::Plugin::BlockRelease" => 0, @@ -25,7 +26,6 @@ my %WriteMakefileArgs = ( "Dist::Zilla::Plugin::CopyFilesFromBuild" => 0, "Dist::Zilla::Plugin::Encoding" => 0, "Dist::Zilla::Plugin::ExecDir" => 0, - "Dist::Zilla::Plugin::ExtraTests" => 0, "Dist::Zilla::Plugin::FakeRelease" => 0, "Dist::Zilla::Plugin::Git::Check" => 0, "Dist::Zilla::Plugin::Git::Commit" => 0, @@ -57,6 +57,7 @@ my %WriteMakefileArgs = ( "Dist::Zilla::Plugin::PruneFiles" => 0, "Dist::Zilla::Plugin::ReadmeAnyFromPod" => 0, "Dist::Zilla::Plugin::ReversionOnRelease" => 0, + "Dist::Zilla::Plugin::RunExtraTests" => 0, "Dist::Zilla::Plugin::Test::CPAN::Changes" => 0, "Dist::Zilla::Plugin::Test::CleanNamespaces" => 0, "Dist::Zilla::Plugin::Test::Compile" => 0, @@ -102,7 +103,7 @@ my %WriteMakefileArgs = ( "Test::More" => 0, "blib" => "1.01" }, - "VERSION" => "0.001", + "VERSION" => "0.002", "test" => { "TESTS" => "t/*.t" } @@ -110,6 +111,7 @@ my %WriteMakefileArgs = ( my %FallbackPrereqs = ( + "Dist::Zilla" => "5.038", "Dist::Zilla::Plugin::Authority" => 0, "Dist::Zilla::Plugin::AutoPrereqs" => 0, "Dist::Zilla::Plugin::BlockRelease" => 0, @@ -118,7 +120,6 @@ my %FallbackPrereqs = ( "Dist::Zilla::Plugin::CopyFilesFromBuild" => 0, "Dist::Zilla::Plugin::Encoding" => 0, "Dist::Zilla::Plugin::ExecDir" => 0, - "Dist::Zilla::Plugin::ExtraTests" => 0, "Dist::Zilla::Plugin::FakeRelease" => 0, "Dist::Zilla::Plugin::Git::Check" => 0, "Dist::Zilla::Plugin::Git::Commit" => 0, @@ -150,6 +151,7 @@ my %FallbackPrereqs = ( "Dist::Zilla::Plugin::PruneFiles" => 0, "Dist::Zilla::Plugin::ReadmeAnyFromPod" => 0, "Dist::Zilla::Plugin::ReversionOnRelease" => 0, + "Dist::Zilla::Plugin::RunExtraTests" => 0, "Dist::Zilla::Plugin::Test::CPAN::Changes" => 0, "Dist::Zilla::Plugin::Test::CleanNamespaces" => 0, "Dist::Zilla::Plugin::Test::Compile" => 0, diff --git a/README b/README index 91eed14..5c5a8ce 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ NAME VERSION - version 0.001 + version 0.002 SYNOPSIS @@ -22,9 +22,6 @@ DESCRIPTION [ReversionOnRelease] prompt = 1 - [ExecDir] - [ExtraTests] - ; GATHER [Git::GatherDir] exclude_filename = LICENSE @@ -35,6 +32,7 @@ DESCRIPTION [CopyFilesFromBuild] copy = LICENSE + [ExecDir] ; PREREQS [AutoPrereqs] @@ -84,6 +82,7 @@ DESCRIPTION filename = README.md locaton = root type = markdown + phase = release [ReadmeAnyFromPod] filename = README location = build @@ -97,6 +96,7 @@ DESCRIPTION ; RELEASE [CheckChangesHasContent] [Git::Check] + [RunExtraTests] [TestRelease] [ConfirmRelease] [UploadToCPAN] ; disable with the "no_upload" attribute @@ -128,7 +128,7 @@ ATTRIBUTES no_upload - Do not upload to CPAN. + Do not upload to CPAN or git push. METHODS diff --git a/cpanfile b/cpanfile index bde24eb..ba07b62 100644 --- a/cpanfile +++ b/cpanfile @@ -2,6 +2,7 @@ # requires 'Badge::Depot::Plugin::Perl'; # requires 'Badge::Depot::Plugin::Travis'; # requires 'Pod::Weaver::Section::Badges'; +requires 'Dist::Zilla', '5.038'; requires 'Dist::Zilla::Plugin::Authority'; requires 'Dist::Zilla::Plugin::AutoPrereqs'; requires 'Dist::Zilla::Plugin::BlockRelease'; @@ -10,7 +11,6 @@ requires 'Dist::Zilla::Plugin::ConfirmRelease'; requires 'Dist::Zilla::Plugin::CopyFilesFromBuild'; requires 'Dist::Zilla::Plugin::Encoding'; requires 'Dist::Zilla::Plugin::ExecDir'; -requires 'Dist::Zilla::Plugin::ExtraTests'; requires 'Dist::Zilla::Plugin::FakeRelease'; requires 'Dist::Zilla::Plugin::Git::Check'; requires 'Dist::Zilla::Plugin::Git::Commit'; @@ -42,6 +42,7 @@ requires 'Dist::Zilla::Plugin::PruneCruft'; requires 'Dist::Zilla::Plugin::PruneFiles'; requires 'Dist::Zilla::Plugin::ReadmeAnyFromPod'; requires 'Dist::Zilla::Plugin::ReversionOnRelease'; +requires 'Dist::Zilla::Plugin::RunExtraTests'; requires 'Dist::Zilla::Plugin::Test::CPAN::Changes'; requires 'Dist::Zilla::Plugin::Test::CleanNamespaces'; requires 'Dist::Zilla::Plugin::Test::Compile'; diff --git a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm index 3fc159c..411f4ac 100644 --- a/lib/Dist/Zilla/PluginBundle/Author/CCM.pm +++ b/lib/Dist/Zilla/PluginBundle/Author/CCM.pm @@ -6,7 +6,7 @@ package Dist::Zilla::PluginBundle::Author::CCM; use warnings; use strict; -our $VERSION = '0.001'; # VERSION +our $VERSION = '0.002'; # VERSION use Dist::Zilla::Util; use Moose; @@ -33,13 +33,17 @@ has no_upload => ( is => 'ro', isa => 'Bool', lazy => 1, - default => 0, + default => sub { $ENV{DZIL_NO_UPLOAD} // shift->payload->{no_upload} // 0 }, ); sub configure { my $self = shift; + if ($self->no_upload) { + print '[@Author::CCM] WARNING! WARNING! WARNING! *** You are in no_upload mode!! ***', "\n"; + } + my @copy_from_build = qw(LICENSE); my @network_plugins = qw(Git::Push Test::Pod::No404s UploadToCPAN); my @gather_exclude = (@copy_from_build, qw(README.md)); @@ -56,15 +60,13 @@ sub configure { ['NextRelease'], ['ReversionOnRelease' => {prompt => 1}], - ['ExecDir'], - ['ExtraTests'], - # GATHER ['Git::GatherDir' => {exclude_filename => [@gather_exclude]}], ['PruneCruft'], ['PruneFiles' => {filename => [@gather_prune]}], ['CopyFilesFromBuild' => {copy => [@copy_from_build]}], + ['ExecDir'], # PREREQS ['AutoPrereqs'], @@ -101,7 +103,7 @@ sub configure { # GENERATE FILES ['License'], - ['ReadmeAnyFromPod' => 'repo readme' => {filename => 'README.md', location => 'root', type => 'markdown'}], + ['ReadmeAnyFromPod' => 'repo readme' => {filename => 'README.md', location => 'root', type => 'markdown', phase => 'release'}], ['ReadmeAnyFromPod' => 'dist readme' => {filename => 'README', location => 'build', type => 'text'}], ['TravisYML'], ['Manifest'], @@ -112,13 +114,14 @@ sub configure { # RELEASE ['CheckChangesHasContent'], ['Git::Check' => {allow_dirty => [@allow_dirty], untracked_files => 'ignore'}], + ['RunExtraTests'], ['TestRelease'], # ['ConfirmRelease'], $self->no_upload ? ['FakeRelease'] : ['UploadToCPAN'], ['Git::Commit' => {allow_dirty => [@allow_dirty], commit_msg => 'Release %N %v%t%n%n%c'}], ['Git::CommitBuild' => {branch => '', release_branch => 'dist', release_message => 'Version %v%t'}], ['Git::Tag' => {tag_message => 'Version %v%t%n%n%c'}], - ['Git::Push' => {push_to => 'origin master +master:refs/heads/release +dist', remotes_must_exist => 0}], + $self->no_upload ? () : ['Git::Push' => {push_to => 'origin master +master:refs/heads/release +dist', remotes_must_exist => 0}], ); @@ -153,7 +156,7 @@ Dist::Zilla::PluginBundle::Author::CCM - A plugin bundle for distributions built =head1 VERSION -version 0.001 +version 0.002 =head1 SYNOPSIS @@ -170,9 +173,6 @@ You probably don't want to use this. [ReversionOnRelease] prompt = 1 - [ExecDir] - [ExtraTests] - ; GATHER [Git::GatherDir] exclude_filename = LICENSE @@ -183,6 +183,7 @@ You probably don't want to use this. [CopyFilesFromBuild] copy = LICENSE + [ExecDir] ; PREREQS [AutoPrereqs] @@ -232,6 +233,7 @@ You probably don't want to use this. filename = README.md locaton = root type = markdown + phase = release [ReadmeAnyFromPod] filename = README location = build @@ -245,6 +247,7 @@ You probably don't want to use this. ; RELEASE [CheckChangesHasContent] [Git::Check] + [RunExtraTests] [TestRelease] [ConfirmRelease] [UploadToCPAN] ; disable with the "no_upload" attribute @@ -284,7 +287,7 @@ Disable plugins that use the network, and prevent releasing. =head2 no_upload -Do not upload to CPAN. +Do not upload to CPAN or git push. =head1 METHODS diff --git a/lib/Pod/Weaver/PluginBundle/Author/CCM.pm b/lib/Pod/Weaver/PluginBundle/Author/CCM.pm index f7ccf73..0b8d002 100644 --- a/lib/Pod/Weaver/PluginBundle/Author/CCM.pm +++ b/lib/Pod/Weaver/PluginBundle/Author/CCM.pm @@ -5,7 +5,7 @@ package Pod::Weaver::PluginBundle::Author::CCM; use warnings; use strict; -our $VERSION = '0.001'; # VERSION +our $VERSION = '0.002'; # VERSION use Pod::Weaver::Config::Assembler; use namespace::autoclean; @@ -104,7 +104,7 @@ Pod::Weaver::PluginBundle::Author::CCM - A plugin bundle for pod woven by CCM =head1 VERSION -version 0.001 +version 0.002 =head1 SYNOPSIS diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd index 687022e..887ad61 100644 --- a/t/00-report-prereqs.dd +++ b/t/00-report-prereqs.dd @@ -7,14 +7,16 @@ do { my $x = { 'develop' => { 'requires' => { 'Dist::Zilla' => '5', + 'Dist::Zilla::Plugin::Bootstrap::lib' => '0', 'Dist::Zilla::PluginBundle::Author::CCM' => '0', + 'English' => '0', 'Pod::Coverage::TrustPod' => '0', 'Software::License::Perl_5' => '0', 'Test::CPAN::Changes' => '0.19', 'Test::CPAN::Meta' => '0', 'Test::CleanNamespaces' => '0.15', 'Test::EOL' => '0', - 'Test::More' => '0.88', + 'Test::More' => '0.96', 'Test::NoTabs' => '0', 'Test::Pod' => '1.41', 'Test::Pod::Coverage' => '1.08', @@ -24,6 +26,7 @@ do { my $x = { }, 'runtime' => { 'requires' => { + 'Dist::Zilla' => '5.038', 'Dist::Zilla::Plugin::Authority' => '0', 'Dist::Zilla::Plugin::AutoPrereqs' => '0', 'Dist::Zilla::Plugin::BlockRelease' => '0', @@ -32,7 +35,6 @@ do { my $x = { 'Dist::Zilla::Plugin::CopyFilesFromBuild' => '0', 'Dist::Zilla::Plugin::Encoding' => '0', 'Dist::Zilla::Plugin::ExecDir' => '0', - 'Dist::Zilla::Plugin::ExtraTests' => '0', 'Dist::Zilla::Plugin::FakeRelease' => '0', 'Dist::Zilla::Plugin::Git::Check' => '0', 'Dist::Zilla::Plugin::Git::Commit' => '0', @@ -64,6 +66,7 @@ do { my $x = { 'Dist::Zilla::Plugin::PruneFiles' => '0', 'Dist::Zilla::Plugin::ReadmeAnyFromPod' => '0', 'Dist::Zilla::Plugin::ReversionOnRelease' => '0', + 'Dist::Zilla::Plugin::RunExtraTests' => '0', 'Dist::Zilla::Plugin::Test::CPAN::Changes' => '0', 'Dist::Zilla::Plugin::Test::CleanNamespaces' => '0', 'Dist::Zilla::Plugin::Test::Compile' => '0', diff --git a/t/author-no-tabs.t b/t/author-no-tabs.t deleted file mode 100644 index aad38ac..0000000 --- a/t/author-no-tabs.t +++ /dev/null @@ -1,37 +0,0 @@ - -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - print qq{1..0 # SKIP these tests are for testing by the author\n}; - exit - } -} - -use strict; -use warnings; - -# this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.15 - -use Test::More 0.88; -use Test::NoTabs; - -my @files = ( - 'lib/Dist/Zilla/PluginBundle/Author/CCM.pm', - 'lib/Pod/Weaver/PluginBundle/Author/CCM.pm', - 't/00-compile.t', - 't/00-report-prereqs.dd', - 't/00-report-prereqs.t', - 't/01-basic.t', - 't/author-clean-namespaces.t', - 't/author-critic.t', - 't/author-eol.t', - 't/author-no-tabs.t', - 't/author-pod-coverage.t', - 't/author-pod-no404s.t', - 't/author-pod-syntax.t', - 't/author-portability.t', - 't/release-cpan-changes.t', - 't/release-distmeta.t' -); - -notabs_ok($_) foreach @files; -done_testing; diff --git a/t/release-distmeta.t b/t/release-distmeta.t deleted file mode 100644 index ff0d696..0000000 --- a/t/release-distmeta.t +++ /dev/null @@ -1,14 +0,0 @@ -#!perl - -BEGIN { - unless ($ENV{RELEASE_TESTING}) { - print qq{1..0 # SKIP these tests are for release candidate testing\n}; - exit - } -} - -# This file was automatically generated by Dist::Zilla::Plugin::MetaTests. - -use Test::CPAN::Meta; - -meta_yaml_ok(); diff --git a/t/author-clean-namespaces.t b/xt/author/clean-namespaces.t similarity index 64% rename from t/author-clean-namespaces.t rename to xt/author/clean-namespaces.t index a5531c3..36387da 100644 --- a/t/author-clean-namespaces.t +++ b/xt/author/clean-namespaces.t @@ -1,11 +1,3 @@ - -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - print qq{1..0 # SKIP these tests are for testing by the author\n}; - exit - } -} - use strict; use warnings; diff --git a/t/author-critic.t b/xt/author/critic.t similarity index 68% rename from t/author-critic.t rename to xt/author/critic.t index 30b99d8..d5b4c96 100644 --- a/t/author-critic.t +++ b/xt/author/critic.t @@ -1,13 +1,5 @@ #!perl -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - print qq{1..0 # SKIP these tests are for testing by the author\n}; - exit - } -} - - use strict; use warnings; diff --git a/t/author-eol.t b/xt/author/eol.t similarity index 50% rename from t/author-eol.t rename to xt/author/eol.t index 38c9765..fc70079 100644 --- a/t/author-eol.t +++ b/xt/author/eol.t @@ -1,11 +1,3 @@ - -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - print qq{1..0 # SKIP these tests are for testing by the author\n}; - exit - } -} - use strict; use warnings; @@ -21,16 +13,16 @@ my @files = ( 't/00-report-prereqs.dd', 't/00-report-prereqs.t', 't/01-basic.t', - 't/author-clean-namespaces.t', - 't/author-critic.t', - 't/author-eol.t', - 't/author-no-tabs.t', - 't/author-pod-coverage.t', - 't/author-pod-no404s.t', - 't/author-pod-syntax.t', - 't/author-portability.t', - 't/release-cpan-changes.t', - 't/release-distmeta.t' + 'xt/author/clean-namespaces.t', + 'xt/author/critic.t', + 'xt/author/eol.t', + 'xt/author/no-tabs.t', + 'xt/author/pod-coverage.t', + 'xt/author/pod-no404s.t', + 'xt/author/pod-syntax.t', + 'xt/author/portability.t', + 'xt/release/cpan-changes.t', + 'xt/release/distmeta.t' ); eol_unix_ok($_, { trailing_whitespace => 1 }) foreach @files; diff --git a/xt/author/no-tabs.t b/xt/author/no-tabs.t new file mode 100644 index 0000000..aec7153 --- /dev/null +++ b/xt/author/no-tabs.t @@ -0,0 +1,29 @@ +use strict; +use warnings; + +# this test was generated with Dist::Zilla::Plugin::Test::NoTabs 0.15 + +use Test::More 0.88; +use Test::NoTabs; + +my @files = ( + 'lib/Dist/Zilla/PluginBundle/Author/CCM.pm', + 'lib/Pod/Weaver/PluginBundle/Author/CCM.pm', + 't/00-compile.t', + 't/00-report-prereqs.dd', + 't/00-report-prereqs.t', + 't/01-basic.t', + 'xt/author/clean-namespaces.t', + 'xt/author/critic.t', + 'xt/author/eol.t', + 'xt/author/no-tabs.t', + 'xt/author/pod-coverage.t', + 'xt/author/pod-no404s.t', + 'xt/author/pod-syntax.t', + 'xt/author/portability.t', + 'xt/release/cpan-changes.t', + 'xt/release/distmeta.t' +); + +notabs_ok($_) foreach @files; +done_testing; diff --git a/t/author-pod-coverage.t b/xt/author/pod-coverage.t similarity index 62% rename from t/author-pod-coverage.t rename to xt/author/pod-coverage.t index 243340f..66b3b64 100644 --- a/t/author-pod-coverage.t +++ b/xt/author/pod-coverage.t @@ -1,12 +1,4 @@ #!perl - -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - print qq{1..0 # SKIP these tests are for testing by the author\n}; - exit - } -} - # This file was automatically generated by Dist::Zilla::Plugin::PodCoverageTests. use Test::Pod::Coverage 1.08; diff --git a/t/author-pod-no404s.t b/xt/author/pod-no404s.t similarity index 72% rename from t/author-pod-no404s.t rename to xt/author/pod-no404s.t index 74e6531..eb9760c 100644 --- a/t/author-pod-no404s.t +++ b/xt/author/pod-no404s.t @@ -1,13 +1,5 @@ #!perl -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - print qq{1..0 # SKIP these tests are for testing by the author\n}; - exit - } -} - - use strict; use warnings; use Test::More; diff --git a/t/author-pod-syntax.t b/xt/author/pod-syntax.t similarity index 56% rename from t/author-pod-syntax.t rename to xt/author/pod-syntax.t index 2233af0..e563e5d 100644 --- a/t/author-pod-syntax.t +++ b/xt/author/pod-syntax.t @@ -1,12 +1,4 @@ #!perl - -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - print qq{1..0 # SKIP these tests are for testing by the author\n}; - exit - } -} - # This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests. use strict; use warnings; use Test::More; diff --git a/t/author-portability.t b/xt/author/portability.t similarity index 58% rename from t/author-portability.t rename to xt/author/portability.t index b6c3147..c531252 100644 --- a/t/author-portability.t +++ b/xt/author/portability.t @@ -1,11 +1,3 @@ - -BEGIN { - unless ($ENV{AUTHOR_TESTING}) { - print qq{1..0 # SKIP these tests are for testing by the author\n}; - exit - } -} - use strict; use warnings; diff --git a/t/release-cpan-changes.t b/xt/release/cpan-changes.t similarity index 62% rename from t/release-cpan-changes.t rename to xt/release/cpan-changes.t index 08331d3..286005a 100644 --- a/t/release-cpan-changes.t +++ b/xt/release/cpan-changes.t @@ -1,11 +1,3 @@ - -BEGIN { - unless ($ENV{RELEASE_TESTING}) { - print qq{1..0 # SKIP these tests are for release candidate testing\n}; - exit - } -} - use strict; use warnings; 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(); -- 2.45.2