whitespace cleanup

[p5sagit/Distar.git] / lib / Distar.pm

diff --git a/lib/Distar.pm b/lib/Distar.pm
index e4f2628..f27036d 100644 (file)
--- a/lib/Distar.pm
+++ b/lib/Distar.pm
@@ -1,11 +1,17 @@
 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;
+
 our @EXPORT = qw(
   author manifest_include run_preflight
 );
@@ -35,7 +41,6 @@ sub manifest_include {
 }
 
 sub write_manifest_skip {
-  use autodie;
   my @files = @Manifest;
   my @parts;
   while (my ($dir, $spec) = splice(@files, 0, 2)) {
@@ -49,25 +54,39 @@ 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";
   }
 
@@ -77,17 +96,35 @@ sub run_preflight {
   my $ymd = sprintf(
     "%i-%02i-%02i", (localtime)[5]+1900, (localtime)[4]+1, (localtime)[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 ";
 }
 
-sub MY::postamble {
-    my ($self, %extra) = @_;
+{
+  package Distar::MM;
+  our @ISA = @ExtUtils::MM::ISA;
+  @ExtUtils::MM::ISA = (__PACKAGE__);
 
-    my $post = <<'END';
+  sub new {
+    my ($class, $args) = @_;
+    return $class->SUPER::new({
+      LICENSE => 'perl',
+      %$args,
+      AUTHOR => $Distar::Author,
+      ABSTRACT_FROM => $args->{VERSION_FROM},
+      test => { TESTS => ($args->{test}{TESTS}||'t/*.t').' xt/*.t' },
+    });
+  }
+
+  sub dist_test {
+    my $self = shift;
+    my $dist_test = $self->SUPER::dist_test(@_) . <<'END';
+
+# --- Distar section:
 preflight:
        perl -IDistar/lib -MDistar -erun_preflight $(VERSION)
 release: preflight
@@ -97,28 +134,17 @@ release: preflight
        git commit -a -m "Release commit for $(VERSION)"
        git tag v$(VERSION) -m "release v$(VERSION)"
        cpan-upload $(DISTVNAME).tar$(SUFFIX)
-       git push origin --tags HEAD
+       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> };
+      $dist_test .= do { local $/; <$fh> };
     }
-    $post .= "\n" . join('', %extra) if keys %extra;
-    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' },
-    );
+    return $dist_test;
   }
 }