X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=helpers%2Fbump-version;h=464680cde5d8953e85451b8af323ae32d62beb62;hb=6c6e7dc314a6e7588677b29a5c553c2f1e679e06;hp=7a4b6bc76099c4494d1eacc4257a444015368c26;hpb=f39746fb12a35c6a550b4b909ceea5d951cbf262;p=p5sagit%2FDistar.git

diff --git a/helpers/bump-version b/helpers/bump-version
index 7a4b6bc..464680c 100755
--- a/helpers/bump-version
+++ b/helpers/bump-version
@@ -9,6 +9,7 @@ use File::Temp ();
 GetOptions(
   "git"     => \my $git,
   "force"   => \my $force,
+  'n|dry-run' => \my $dry_run,
 ) or die("Error in command line arguments\n");
 
 my $old_version = shift
@@ -16,7 +17,7 @@ my $old_version = shift
 my $bump = shift;
 my ($new_decimal, $new_vstring) = bump_version($old_version, $bump);
 
-warn "Bumping $old_version -> $new_decimal\n";
+warn "Bumping $old_version -> $new_decimal" . ($new_decimal ne $new_vstring ? " ($new_vstring)" : '') . "\n";
 
 my $file_match = qr{
   Makefile\.PL
@@ -91,34 +92,41 @@ my $MAKE_RE = qr{
 
 my $patch = '';
 for my $file (sort keys %files) {
-  my $content = $files{$file};
-  my $file_diff = '';
-  my $re = $file eq 'Makefile.PL' ? $MAKE_RE : $FILE_RE;
-  my @lines = split /\r?\n/, $content;
-  for my $ln (0 .. $#lines) {
-    my $line = $lines[$ln];
-    if ($lines[$ln] =~ $re) {
-      die "unable to bump version number in $file from $old_version, found $3\n"
-        if !$force && $3 ne $old_version;
-      my $comment = ($5 ? $5 . $new_vstring : '');
-      my $new_line = "$1'$new_decimal'$4$comment$6";
-      $file_diff .= <<"END_DIFF";
+  eval {
+    my $content = $files{$file};
+    my $file_diff = '';
+    my $re = $file eq 'Makefile.PL' ? $MAKE_RE : $FILE_RE;
+    my @lines = split /\r?\n/, $content;
+    for my $ln (0 .. $#lines) {
+      my $line = $lines[$ln];
+      if ($lines[$ln] =~ $re) {
+        die "unable to bump version number in $file from $old_version, found $3\n"
+          if !$force && $3 ne $old_version;
+        my $comment = ($5 ? $5 . $new_vstring : '');
+        my $new_line = "$1'$new_decimal'$4$comment$6";
+        $file_diff .= <<"END_DIFF";
 @@ -@{[ $ln ]},3 +@{[ $ln ]},3 @@
  $lines[$ln-1]
 -$lines[$ln]
 +$new_line
  $lines[$ln+1]
 END_DIFF
+      }
     }
-  }
-  if ($file_diff) {
-    $patch .= <<"END_HEADER" . $file_diff;
+    if ($file_diff) {
+      $patch .= <<"END_HEADER" . $file_diff;
 --- a/$file
 +++ b/$file
 END_HEADER
-  }
+    }
+    1;
+  } or $dry_run ? warn($@) : die($@);
 }
 
+if ($dry_run) {
+  print $patch;
+  exit;
+}
 my ($fh, $file) = File::Temp::tempfile( "bump-version-XXXXXX", TMPDIR => 1 );
 print { $fh } $patch;
 close $fh;
@@ -159,14 +167,16 @@ sub bump_version {
 
   if (defined $bump_this) {
     if ($version =~ /^v/ || ($version =~ tr/.//) > 1) {
+      my $v = $version =~ /^(v)/ ? $1 : '';
       my @parts = version_parts($version);
+      $bump_this += @parts
+        if $bump_this < 0;
+      $parts[$_] = 0 for $bump_this+1 .. $#parts;
+      $parts[$_] = 0 for $#parts+1 .. $bump_this;
       $parts[$bump_this]++;
-      $parts[$_] = 0 for (($bump_this < 0 ? @parts : 0)+$bump_this+1 .. $#parts);
       $_ += 0
         for @parts;
-      $new_vstring = join '.', @parts;
-      my $format = '%i.'. join '', map { '%03i' } @parts[1 .. $#parts];
-      $new_decimal = sprintf $format, @parts;
+      $new_decimal = $new_vstring = $v . join '.', @parts;
     }
     else {
       my $alpha_pos = index($version, '_');