X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=72b8c2ddbbb7c26257fbec4617ecc94d2c657dbf;hb=9af7ff2e588277fe294352d7acae45a35b2a6698;hp=4d41b285d94efb1c119252fd085fd47ada42258d;hpb=4477708bbe375c7d19369152dc96213999271f54;p=p5sagit%2FDistar.git diff --git a/lib/Distar.pm b/lib/Distar.pm index 4d41b28..72b8c2d 100644 --- a/lib/Distar.pm +++ b/lib/Distar.pm @@ -1,26 +1,38 @@ package Distar; -use strictures 1; +use strict; +use warnings FATAL => 'all'; use base qw(Exporter); +use ExtUtils::MakeMaker (); +use ExtUtils::MM (); use Config; use File::Spec; +our $VERSION = '0.001000'; +$VERSION = eval $VERSION; + +my $MM_VER = eval $ExtUtils::MakeMaker::VERSION; + our @EXPORT = qw( - author manifest_include run_preflight + author manifest_include readme_generator run_preflight ); sub import { - strictures->import; + strict->import; + warnings->import(FATAL => 'all'); shift->export_to_level(1,@_); } -sub author { our $Author = shift } - -our $Ran_Preflight; +sub author { + our $Author = shift; + $Author = [ $Author ] + if !ref $Author; +} our @Manifest = ( 'lib' => '.pm', + 'lib' => '.pod', 't' => '.t', 't/lib' => '.pm', 'xt' => '.t', @@ -34,8 +46,15 @@ sub manifest_include { push @Manifest, @_; } +my $readme_generator = <<'README'; + pod2text $(VERSION_FROM) >$(DISTVNAME)/README + $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) ../Distar/helpers/add-readme-to-manifest +README +sub readme_generator { + $readme_generator = shift; +} + sub write_manifest_skip { - use autodie; my @files = @Manifest; my @parts; while (my ($dir, $spec) = splice(@files, 0, 2)) { @@ -49,25 +68,38 @@ sub write_manifest_skip { push @parts, $re; } my $final = '^(?!'.join('|', map "${_}\$", @parts).')'; - open my $skip, '>', 'MANIFEST.SKIP'; + open my $skip, '>', 'MANIFEST.SKIP' + or die "can't open MANIFEST.SKIP: $!"; print $skip "${final}\n"; close $skip; } sub run_preflight { - $Ran_Preflight = 1; - - system("git fetch"); + my $version = $ARGV[0]; my $make = $Config{make}; my $null = File::Spec->devnull; + system("git fetch"); + if (system("git rev-parse --quiet --verify v$version >$null") == 0) { + die "Tag v$version already exists!"; + } + + require File::Find; + File::Find::find({ no_chdir => 1, wanted => sub { + return + unless -f && /\.pm$/; + my $file_version = MM->parse_version($_); + die "Module $_ version $file_version doesn't match dist version $version" + unless $file_version eq 'undef' || $file_version eq $version; + }}, 'lib'); + for (scalar `"$make" manifest 2>&1 >$null`) { $_ && die "$make manifest changed:\n$_ Go check it and retry"; } for (scalar `git status`) { - /^# On branch master/ || die "Not on master. EEEK"; + /^(?:# )?On branch master/ || die "Not on master. EEEK"; /Your branch is behind|Your branch and .*? have diverged/ && die "Not synced with upstream"; } @@ -75,53 +107,101 @@ sub run_preflight { length && die "Outstanding changes"; } my $ymd = sprintf( - "%i-%02i-%02i", (localtime)[5]+1900, (localtime)[4]+1, (localtime)[3] + "%i-%02i-%02i", (gmtime)[5]+1900, (gmtime)[4]+1, (gmtime)[3] ); + my $changes_line = "$version - $ymd\n"; my @cached = grep /^\+/, `git diff --cached -U0`; - @cached > 0 or die "Please add:\n\n$ARGV[0] - $ymd\n\nto Changes stage Changes (git add Changes)"; + @cached > 0 or die "Please add:\n\n$changes_line\nto Changes stage Changes (git add Changes)"; @cached == 2 or die "Pre-commit Changes not just Changes line"; $cached[0] =~ /^\+\+\+ .\/Changes\n/ or die "Changes not changed"; - $cached[1] eq "+$ARGV[0] - $ymd\n" or die "Changes new line should be: \n\n$ARGV[0] - $ymd\n "; + $cached[1] eq "+$changes_line" or die "Changes new line should be: \n\n$changes_line "; + + { no warnings 'exec'; `cpan-upload -h`; } + $? and die "cpan-upload not available"; } -sub MY::postamble { - my $post = <<'END'; +{ + package Distar::MM; + our @ISA = @MM::ISA; + @MM::ISA = (__PACKAGE__); + + sub new { + my ($class, $args) = @_; + return $class->SUPER::new({ + LICENSE => 'perl_5', + MIN_PERL_VERSION => '5.006', + AUTHOR => ($MM_VER >= 6.5702 ? $Distar::Author : join(', ', @$Distar::Author)), + %$args, + ABSTRACT_FROM => $args->{VERSION_FROM}, + test => { TESTS => ($args->{test}{TESTS}||'t/*.t').' xt/*.t xt/*/*.t' }, + realclean => { FILES => ( + ($args->{realclean}{FILES}||'') + . ' Distar/ MANIFEST.SKIP MANIFEST MANIFEST.bak' + ) }, + }); + } + + sub flush { + my $self = shift; + Distar::write_manifest_skip(); + $self->SUPER::flush(@_); + } + + sub dist_test { + my $self = shift; + my $dist_test = $self->SUPER::dist_test(@_); + + my $include = ''; + if (open my $fh, '<', 'maint/Makefile.include') { + $include = "\n# --- Makefile.include:\n" . do { local $/; <$fh> }; + } + + $dist_test .= "REMAKE = \$(PERLRUN) Makefile.PL @{[ map { $self->quote_literal($_) } @ARGV ]}"; + $dist_test .= <<'END' + +# --- Distar section: preflight: perl -IDistar/lib -MDistar -erun_preflight $(VERSION) release: preflight $(MAKE) disttest rm -rf $(DISTVNAME) $(MAKE) $(DISTVNAME).tar$(SUFFIX) - cpan-upload $(DISTVNAME).tar$(SUFFIX) git commit -a -m "Release commit for $(VERSION)" git tag v$(VERSION) -m "release v$(VERSION)" - git push --tags - git push + cpan-upload $(DISTVNAME).tar$(SUFFIX) + git push origin v$(VERSION) HEAD distdir: readmefile readmefile: create_distdir - pod2text $(VERSION_FROM) >$(DISTVNAME)/README - $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) ../Distar/helpers/add-readme-to-manifest END - if (open my $fh, '<', 'maint/Makefile.include') { - $post .= do { local $/; <$fh> }; + . $readme_generator . <<'END'; +disttest: distmanicheck +distmanicheck: create_distdir + cd $(DISTVNAME) && $(ABSPERLRUN) "-MExtUtils::Manifest=manicheck" -e "exit manicheck" +nextrelease: + $(ABSPERLRUN) Distar/helpers/add-changelog-heading $(VERSION) Changes + git add -p Changes +refresh: + cd Distar && git pull + rm Makefile + $(REMAKE) +END + + for my $type ('', 'minor', 'major') { + if ($include !~ /^bump$type:/m) { + my $arg = $type || '$(V)'; + $dist_test .= <<"END" +bump$type: + Distar/helpers/bump-version --git \$(VERSION) $arg + rm Makefile + \$(REMAKE) +END + } } - return $post; -} -{ - no warnings 'redefine'; - sub main::WriteMakefile { - my %args = @_; - ExtUtils::MakeMaker::WriteMakefile( - LICENSE => 'perl', - @_, AUTHOR => our $Author, ABSTRACT_FROM => $args{VERSION_FROM}, - test => { TESTS => ($args{test}{TESTS}||'t/*.t').' xt/*.t' }, - ); - } -} + $dist_test .= $include . "\n"; -END { - write_manifest_skip() unless $Ran_Preflight + return $dist_test; + } } 1;