X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=769d8ada94f34c629c556d506f05e5c0ff3200e5;hb=c562f7dd840a40ede31a6535c49d317a5c90781e;hp=b46d7caf1ba46149d9a4d4060e587697d0eb0b11;hpb=4a4bb5705f225f086db39ef32f8fb7eeaa06e4e7;p=p5sagit%2FDistar.git diff --git a/lib/Distar.pm b/lib/Distar.pm index b46d7ca..769d8ad 100644 --- a/lib/Distar.pm +++ b/lib/Distar.pm @@ -4,9 +4,11 @@ use warnings FATAL => 'all'; use base qw(Exporter); use ExtUtils::MakeMaker (); use ExtUtils::MM (); +use File::Spec (); +use File::Basename (); -our $VERSION = '0.002000'; -$VERSION = eval $VERSION; +our $VERSION = '0.003000'; +$VERSION =~ tr/_//d; my $MM_VER = eval $ExtUtils::MakeMaker::VERSION; @@ -17,7 +19,11 @@ our @EXPORT = qw( sub import { strict->import; warnings->import(FATAL => 'all'); - shift->export_to_level(1,@_); + if (!(@MM::ISA == 1 && $MM::ISA[0] eq 'Distar::MM')) { + @Distar::MM::ISA = @MM::ISA; + @MM::ISA = qw(Distar::MM); + } + goto &Exporter::import; } sub author { @@ -71,18 +77,23 @@ sub write_manifest_skip { { package Distar::MM; - our @ISA = @MM::ISA; - @MM::ISA = (__PACKAGE__); sub new { my ($class, $args) = @_; + my %test = %{$args->{test}||{}}; + my $tests = $test{TESTS} || 't/*.t'; + $tests !~ /\b\Q$_\E\b/ and $tests .= " $_" + for 'xt/*.t', 'xt/*/*.t'; + $test{TESTS} = $tests; return $class->SUPER::new({ LICENSE => 'perl_5', MIN_PERL_VERSION => '5.006', - AUTHOR => ($MM_VER >= 6.5702 ? $Distar::Author : join(', ', @$Distar::Author)), - ABSTRACT_FROM => $args->{VERSION_FROM}, + ($Distar::Author ? ( + AUTHOR => ($MM_VER >= 6.5702 ? $Distar::Author : join(', ', @$Distar::Author)), + ) : ()), + (exists $args->{ABSTRACT} ? () : (ABSTRACT_FROM => $args->{VERSION_FROM})), %$args, - test => { TESTS => ($args->{test}{TESTS}||'t/*.t').' xt/*.t xt/*/*.t' }, + test => \%test, realclean => { FILES => ( ($args->{realclean}{FILES}||'') . ' Distar/ MANIFEST.SKIP MANIFEST MANIFEST.bak' @@ -92,79 +103,422 @@ sub write_manifest_skip { sub flush { my $self = shift; - Distar::write_manifest_skip($self); + `git ls-files --error-unmatch MANIFEST.SKIP 2>&1`; + my $maniskip_tracked = !$?; + + Distar::write_manifest_skip($self) + unless $maniskip_tracked; $self->SUPER::flush(@_); } sub special_targets { my $self = shift; my $targets = $self->SUPER::special_targets(@_); - $targets =~ s/^(\.PHONY\s*:.*)/$1 preflight releasetest release readmefile distmanicheck nextrelease refresh bump bumpmajor bumpminor/m; + my $phony_targets = join ' ', qw( + preflight + check-version + check-manifest + check-cpan-upload + releasetest + release + readmefile + distmanicheck + nextrelease + refresh + bump + bumpmajor + bumpminor + ); + $targets =~ s/^(\.PHONY *:.*)/$1 $phony_targets/m; $targets; } + sub init_dist { + my $self = shift; + my $out = $self->SUPER::init_dist(@_); + + my $dn = File::Spec->devnull; + my $tar = $self->{TAR}; + + my $tarflags = $self->{TARFLAGS}; + if (my ($flags) = $tarflags =~ /^-?([cvhlLf]+)$/) { + if ($flags =~ s/c// && $flags =~ s/f//) { + $tarflags = '--format=ustar -c'.$flags.'f'; + my $me = __FILE__; + for my $options ('--owner=0 --group=0', '--uid=0 --gid=0') { + my $try = `$tar -c $options "$me" 2>$dn`; + if (length $try) { + $tarflags = "$options $tarflags"; + last; + } + } + } + } + + $self->{TAR} = $tar; + $self->{TARFLAGS} = $tarflags; + + $out; + } + + sub tarfile_target { + my $self = shift; + my $out = $self->SUPER::tarfile_target(@_); + my $verify = <<'END_FRAG'; + $(ABSPERLRUN) $(HELPERS)/verify-tarball $(DISTVNAME).tar $(DISTVNAME)/MANIFEST --tar="$(TAR)" +END_FRAG + $out =~ s{(\$\(TAR\).*\n)}{$1$verify}; + $out; + } + sub dist_test { my $self = shift; - my $dist_test = $self->SUPER::dist_test(@_); - $dist_test .= <<"END"; + my $distar_lib = File::Basename::dirname(__FILE__); + my $helpers = File::Spec->catdir($distar_lib, File::Spec->updir, 'helpers'); -# --- Distar section: + my $licenses = $self->{LICENSE} || $self->{META_ADD}{license} || $self->{META_MERGE}{license}; + my $authors = $self->{AUTHOR}; + $_ = ref $_ ? $_ : [$_ || ()] + for $licenses, $authors; -REMAKE = \$(PERLRUN) Makefile.PL @{[ map { $self->quote_literal($_) } @ARGV ]} + my %vars = ( + DISTAR_LIB => $self->quote_literal($distar_lib), + HELPERS => $self->quote_literal($helpers), + REMAKE => join(' ', '$(PERLRUN)', '-I$(DISTAR_LIB)', '-MDistar', 'Makefile.PL', map { $self->quote_literal($_) } @ARGV), + BRANCH => $self->{BRANCH} ||= 'master', + CHANGELOG => $self->{CHANGELOG} ||= 'Changes', + DEV_NULL_STDOUT => ($self->{DEV_NULL} ? '>'.File::Spec->devnull : ''), + DISTTEST_MAKEFILE_PARAMS => '', + AUTHORS => $self->quote_literal(join(', ', @$authors)), + LICENSES => join(' ', map $self->quote_literal($_), @$licenses), + GET_CHANGELOG => '$(ABSPERLRUN) $(HELPERS)/get-changelog $(VERSION) $(CHANGELOG)', + UPDATE_DISTAR => ( + -e File::Spec->catdir($distar_lib, File::Spec->updir, '.git') + ? 'git -C $(DISTAR_LIB) pull' + : '$(ECHO) "Distar code is not in a git repo, unable to update!"' + ), + ); -END - $dist_test .= <<'END'; -preflight: - $(ABSPERLRUN) Distar/helpers/preflight $(VERSION) + my $dist_test = $self->SUPER::dist_test(@_); + $dist_test =~ s/(\bMakefile\.PL\b)/$1 \$(DISTTEST_MAKEFILE_PARAMS)/; + + my $include = ''; + if (open my $fh, '<', 'maint/Makefile.include') { + $include = do { local $/; <$fh> }; + $include =~ s/\n?\z/\n/; + } + + my @out; + + push @out, <<'END'; +preflight: check-version check-manifest check-cpan-upload + $(ABSPERLRUN) $(HELPERS)/preflight $(VERSION) --changelog=$(CHANGELOG) --branch=$(BRANCH) +check-version: + $(ABSPERLRUN) $(HELPERS)/check-version $(VERSION) $(TO_INST_PM) $(EXE_FILES) +check-manifest: + $(ABSPERLRUN) $(HELPERS)/check-manifest +check-cpan-upload: + $(NOECHO) cpan-upload -h $(DEV_NULL_STDOUT) releasetest: - $(MAKE) disttest RELEASE_TESTING=1 TEST_FILES="$(TEST_FILES)" -release: preflight releasetest + $(MAKE) disttest RELEASE_TESTING=1 DISTTEST_MAKEFILE_PARAMS="PREREQ_FATAL=1" PASTHRU="$(PASTHRU) TEST_FILES=\"$(TEST_FILES)\"" + $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(ECHO) "Failed to generate $(DISTVNAME)/LICENSE!" >&2 + $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE +release: preflight + $(MAKE) releasetest + $(GET_CHANGELOG) -p"Release commit for $(VERSION)" | git commit -a -F - + $(GET_CHANGELOG) -p"release v$(VERSION)" | git tag -a -F - "v$(VERSION)" $(RM_RF) $(DISTVNAME) $(MAKE) $(DISTVNAME).tar$(SUFFIX) - git commit -a -m "Release commit for $(VERSION)" - git tag v$(VERSION) -m "release v$(VERSION)" + $(NOECHO) $(MAKE) pushrelease FAKE_RELEASE=$(FAKE_RELEASE) +pushrelease :: + $(NOECHO) $(NOOP) +pushrelease$(FAKE_RELEASE) :: cpan-upload $(DISTVNAME).tar$(SUFFIX) git push origin v$(VERSION) HEAD -distdir: readmefile -readmefile: create_distdir $(DISTVNAME)/README - $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) ../Distar/helpers/add-to-manifest README +distdir: readmefile licensefile +readmefile: create_distdir + $(NOECHO) $(TEST_F) $(DISTVNAME)/README || $(MAKE) $(DISTVNAME)/README $(DISTVNAME)/README: $(VERSION_FROM) $(NOECHO) $(MKPATH) $(DISTVNAME) pod2text $(VERSION_FROM) >$(DISTVNAME)/README + $(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) README +distsignature: readmefile licensefile +licensefile: create_distdir + $(NOECHO) $(TEST_F) $(DISTVNAME)/LICENSE || $(MAKE) $(DISTVNAME)/LICENSE || $(TRUE) +$(DISTVNAME)/LICENSE: Makefile.PL + $(NOECHO) $(MKPATH) $(DISTVNAME) + $(ABSPERLRUN) $(HELPERS)/generate-license -o $(DISTVNAME)/LICENSE $(AUTHORS) $(LICENSES) + $(NOECHO) $(ABSPERLRUN) $(HELPERS)/add-to-manifest -d $(DISTVNAME) LICENSE disttest: distmanicheck distmanicheck: create_distdir cd $(DISTVNAME) && $(ABSPERLRUN) "-MExtUtils::Manifest=manicheck" -e "exit manicheck" nextrelease: - $(ABSPERLRUN) Distar/helpers/add-changelog-heading $(VERSION) Changes - GIT_DIFF_OPTS=-u`$(ABSPERLRUN) Distar/helpers/changelog-context $(VERSION) Changes` git add -p Changes + $(ABSPERLRUN) $(HELPERS)/add-changelog-heading --git $(VERSION) $(CHANGELOG) refresh: - cd Distar && git pull - rm Makefile + $(UPDATE_DISTAR) + $(RM_F) $(FIRST_MAKEFILE) $(REMAKE) END + my @bump_targets = + grep { $include !~ /^bump$_(?: +\w+)*:/m } ('', 'minor', 'major'); - my $include = ''; - if (open my $fh, '<', 'maint/Makefile.include') { - $include = "\n# --- Makefile.include:\n" . do { local $/; <$fh> }; - } - - for my $type ('', 'minor', 'major') { - if ($include !~ /^bump$type:/m) { - my $arg = $type || '$(V)'; - $dist_test .= <<"END" -bump$type: - \$(ABSPERLRUN) Distar/helpers/bump-version --git \$(VERSION) $arg - \$(RM_F) \$(FIRST_MAKEFILE) - \$(REMAKE) + for my $target (@bump_targets) { + push @out, sprintf <<'END', "bump$target", ($target || '$(V)'); +%s: + $(ABSPERLRUN) $(HELPERS)/bump-version --git $(VERSION) %s + $(RM_F) $(FIRST_MAKEFILE) + $(REMAKE) END - } } - $dist_test .= $include . "\n"; - - return $dist_test; + join('', + $dist_test, + "\n\n# --- Distar section:\n\n", + (map "$_ = $vars{$_}\n", sort keys %vars), + "\n", + @out, + ($include ? ( + "\n", + "# --- Makefile.include:\n", + "\n", + $include, + "\n" + ) : ()), + "\n", + ); } } 1; +__END__ + +=head1 NAME + +Distar - Additions to ExtUtils::MakeMaker for dist authors + +=head1 SYNOPSIS + +F: + + use ExtUtils::MakeMaker; + (do './maint/Makefile.PL.include' or die $@) unless -f 'META.yml'; + + WriteMakefile(...); + +F: + + BEGIN { -e 'Distar' or system("git clone git://git.shadowcat.co.uk/p5sagit/Distar.git") } + use lib 'Distar/lib'; + use Distar 0.001; + + author 'A. U. Thor '; + + manifest_include t => 'test-helper.pl'; + manifest_include corpus => '.txt'; + +make commmands: + + $ perl Makefile.PL + $ make bump # bump version + $ make bump V=2.000000 # bump to specific version + $ make bumpminor # bump minor version component + $ make bumpmajor # bump major version component + $ make nextrelease # add version heading to Changes file + $ make releasetest # build dist and test (with xt/ and RELEASE_TESTING=1) + $ make preflight # check that repo and file state is release ready + $ make release # check releasetest and preflight, commits and tags, + # builds and uploads to CPAN, and pushes commits and + # tag + $ make release FAKE_RELEASE=1 + # builds a release INCLUDING committing and tagging, + # but does not upload to cpan or push anything to git + +=head1 DESCRIPTION + +L works well enough as development tool for +builting and testing, but using it to release is annoying and error prone. +Distar adds just enough to L for it to be a usable dist +author tool. This includes extra commands for releasing and safety checks, and +automatic generation of some files. It doesn't require any non-core modules and +is compatible with old versions of perl. + +=head1 FUNCTIONS + +=head2 author( $author ) + +Set the author to include in generated META files. Can be a single entry, or +an arrayref. + +=head2 manifest_include( $dir, $pattern ) + +Add a pattern to include files in the MANIFEST file, and thus in the generated +dist files. + +The pattern can be either a regex, or a path suffix. It will be applied to the +full path past the directory specified. + +The default files that are always included are: F<.pm> and F<.pod> files in +F, F<.t> files in F and F, F<.pm> files in F and F, +F, F, F, F, F, and F<.PL> files in +the dist root, and all files in F. + +=head1 AUTOGENERATED FILES + +=over 4 + +=item F + +The F will be automatically generated to exclude any files not +explicitly allowed via C or the included defaults. It will be +created (or updated) at C time. + +=item F + +The F file will be generated at dist generation time, inside the built +dist. It will be generated using C on the main module. + +If a F file exists in the repo, it will be used directly instead of +generating the file. + +=back + +=head1 MAKE COMMMANDS + +=head2 test + +test will be adjusted to include F tests by default. This will only apply +for authors, not users installing from CPAN. + +=head2 release + +Releases the dist. Before releasing, checks will be done on the dist using the +C and C commands. + +Releasing will generate a dist tarball and upload it to CPAN using cpan-upload. +It will also create a git tag for the release, and push the tag and branch. + +=head3 FAKE_RELEASE + +If release is run with FAKE_RELEASE=1 set, it will skip uploading to CPAN and +pushing to git. A release commit will still be created and tagged locally. + +=head2 preflight + +Performs a number of checks on the files and repository, ensuring it is in a +sane state to do a release. The checks are: + +=over 4 + +=item * All version numbers match + +=item * The F file is up to date + +=item * The branch is correct + +=item * There is no existing tag for the version + +=item * There are no unmerged upstream changes + +=item * There are no outstanding local changes + +=item * There is an appropriate staged Changes heading + +=item * cpan-upload is available + +=back + +=head2 releasetest + +Test the dist preparing for a release. This generates a dist dir and runs the +tests from inside it. This ensures all appropriate files are included inside +the dist. C will be set in the environment. + +=head2 nextrelease + +Adds an appropriate changelog heading for the release, and prompts to stage the +change. + +=head2 bump + +Bumps the version number. This will try to preserve the length and format of +the version number. The least significant digit will be incremented. Versions +with underscores will preserve the underscore in the same position. + +Optionally accepts a C option to set the version to a specific value. + +The version changes will automatically be committed. Unstaged modifications to +the files will be left untouched. + +=head3 V + +The V option will be passed along to the version bumping script. It can accept +a space separated list of options, including an explicit version number. + +Options: + +=over 4 + +=item --force + +Updates version numbers even if they do not match the current expected version +number. + +=item --stable + +Attempts to convert the updated version to a stable version, removing any +underscore. + +=item --alpha + +Attempts to convert the updated version to an alpha version, adding an +underscore in an appropriate place. + +=back + +=head2 bumpminor + +Like bump, but increments the minor segment of the version. This will treat +numeric versions as x.yyyzzz format, incrementing the yyy segment. + +=head2 bumpmajor + +Like bumpminor, but bumping the major segment. + +=head2 refresh + +Updates Distar and re-runs C + +=head1 SUPPORT + +IRC: #web-simple on irc.perl.org + +Git repository: L + +Git browser: L + +=head1 AUTHOR + +mst - Matt S. Trout (cpan:MSTROUT) + +=head1 CONTRIBUTORS + +haarg - Graham Knop (cpan:HAARG) + +ether - Karen Etheridge (cpan:ETHER) + +frew - Arthur Axel "fREW" Schmidt (cpan:FREW) + +Mithaldu - Christian Walde (cpan:MITHALDU) + +=head1 COPYRIGHT + +Copyright (c) 2011-2015 the Distar L and L +as listed above. + +=head1 LICENSE + +This library is free software and may be distributed under the same terms +as perl itself. See L. + +=cut