X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDistar.pm;h=df7fb8fba947f90fb7de3db44cbba0984cd0dd70;hb=a2f6bc7bb8c5e9471f215d2893957f7abe1fb524;hp=c58915065968d8ce7454d499c8b213c1d6d342da;hpb=5154970c57b68f91b9c82f3e671a3c64d55609e8;p=p5sagit%2FDistar.git

diff --git a/lib/Distar.pm b/lib/Distar.pm
index c589150..df7fb8f 100644
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -3,6 +3,9 @@ package Distar;
 use strictures 1;
 use base qw(Exporter);
 
+use Config;
+use File::Spec;
+
 our @EXPORT = qw(
   author manifest_include run_preflight
 );
@@ -14,13 +17,15 @@ sub import {
 
 sub author { our $Author = shift }
 
+our $Ran_Preflight;
+
 our @Manifest = (
   'lib' => '.pm',
   't' => '.t',
   't/lib' => '.pm',
   'xt' => '.t',
   'xt/lib' => '.pm',
-  '' => '.PL',
+  '' => qr{[^/]*\.PL},
   '' => qr{Changes|MANIFEST|README|META\.yml},
   'maint' => qr{[^.].*},
 );
@@ -39,6 +44,7 @@ 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;
   }
@@ -49,52 +55,73 @@ sub write_manifest_skip {
 }
 
 sub run_preflight {
+  $Ran_Preflight = 1;
+
   system("git fetch");
 
+  my $make = $Config{make};
+  my $null = File::Spec->devnull;
+
+  for (scalar `"$make" manifest 2>&1 >$null`) {
+    $_ && die "$make manifest changed:\n$_ Go check it and retry";
+  }
+
   for (scalar `git status`) {
-    /Your branch is (behind|ahead of)/ && die "Not synced with upstream";
+    /^# 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 "Oustanding changes";
+    length && die "Outstanding changes";
   }
-  my @cached = grep /^\+/, `git diff --cached -U0`;
-  @cached == 2 or die "Pre-commit Changes not just Changes line";
-  $cached[0] eq "+++ b/Changes\n" or die "Changes not changed";
   my $ymd = sprintf(
     "%i-%02i-%02i", (localtime)[5]+1900, (localtime)[4]+1, (localtime)[3]
   );
+  my @cached = grep /^\+/, `git diff --cached -U0`;
+  @cached > 0 or die "Please add:\n\n$ARGV[0] - $ymd\n\nto Changes and git add";
+  @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 ";
 }
 
-sub MY::postamble { <<'END'; }
+sub MY::postamble {
+    my $post = <<'END';
 preflight:
-	perl -Idistar/lib -MDistar -erun_preflight $(VERSION)
-upload: preflight disttest $(DISTVNAME).tar$(SUFFIX)
+	perl -IDistar/lib -MDistar -erun_preflight $(VERSION)
+release: preflight
+	$(MAKE) disttest
+	rm -rf $(DISTVNAME)
+	$(MAKE) $(DISTVNAME).tar$(SUFFIX)
 	cpan-upload $(DISTVNAME).tar$(SUFFIX)
-release: upload
 	git commit -a -m "Release commit for $(VERSION)"
-	git tag release_$(VERSION)
-	git push
+	git tag v$(VERSION) -m "release v$(VERSION)"
 	git push --tags
+	git push
 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> };
+    }
+    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}||'').' xt/*.t' },
+      test => { TESTS => ($args{test}{TESTS}||'t/*.t').' xt/*.t' },
     );
   }
 }
 
 END {
-  write_manifest_skip()
+  write_manifest_skip() unless $Ran_Preflight
 }
 
 1;