X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=72b8c2ddbbb7c26257fbec4617ecc94d2c657dbf;hb=9af7ff2e588277fe294352d7acae45a35b2a6698;hp=7169783e63508e308382fe8ed867ffcd544b076f;hpb=42e08a83216e13515942995a7f1707b12ac8b95b;p=p5sagit%2FDistar.git

diff --git a/lib/Distar.pm b/lib/Distar.pm
index 7169783..72b8c2d 100644
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -1,28 +1,44 @@
 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
+  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 }
+sub author {
+  our $Author = shift;
+  $Author = [ $Author ]
+    if !ref $Author;
+}
 
 our @Manifest = (
   'lib' => '.pm',
+  'lib' => '.pod',
   't' => '.t',
   't/lib' => '.pm',
   'xt' => '.t',
   'xt/lib' => '.pm',
-  '' => '.PL',
+  '' => qr{[^/]*\.PL},
   '' => qr{Changes|MANIFEST|README|META\.yml},
-  '' => qr{t/smells-of-vcs/.svn},
   'maint' => qr{[^.].*},
 );
 
@@ -30,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)) {
@@ -40,39 +63,145 @@ sub write_manifest_skip {
         ? $spec
         : !ref($spec)
           ? ".*\Q${spec}\E"
+            # print ref as well as stringification in case of overload ""
           : die "spec must be string or regexp, was: ${spec} (${\ref $spec})");
     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 MY::postamble { <<'END'; }
-upload: $(DISTVNAME).tar$(SUFFIX)
-	cpan-upload $<
-release: upload
-	git commit -a -m "Release commit for $(VERSION)"
-	git tag release_$(VERSION)
-	git push
-	git push --tags
-END
+sub run_preflight {
+  my $version = $ARGV[0];
 
-{
-  no warnings 'redefine';
-  sub main::WriteMakefile {
-    my %args = @_;
-    system("pod2text $args{VERSION_FROM} >README");
-    ExtUtils::MakeMaker::WriteMakefile(
-      @_, AUTHOR => our $Author, ABSTRACT_FROM => $args{VERSION_FROM},
-      test => { TESTS => ($args{test}{TESTS}||'').' xt/*.t' },
-    );
+  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";
+    /Your branch is behind|Your branch and .*? have diverged/ && die "Not synced with upstream";
+  }
+
+  for (scalar `git diff`) {
+    length && die "Outstanding changes";
+  }
+  my $ymd = sprintf(
+    "%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$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 "+$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";
 }
 
-END {
-  write_manifest_skip()
+{
+  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)
+	git commit -a -m "Release commit for $(VERSION)"
+	git tag v$(VERSION) -m "release v$(VERSION)"
+	cpan-upload $(DISTVNAME).tar$(SUFFIX)
+	git push origin v$(VERSION) HEAD
+distdir: readmefile
+readmefile: create_distdir
+END
+    . $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
+      }
+    }
+
+    $dist_test .= $include . "\n";
+
+    return $dist_test;
+  }
 }
 
 1;