Merge lp:~percona-toolkit-dev/percona-toolkit/fix-831525-pqd-mangled-help into lp:percona-toolkit/2.1

[Brian Fraser]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2012-11-13 15:22:01 +0000
+++ bin/pt-query-digest	2012-11-16 01:10:29 +0000
@@ -1373,7 +1373,7 @@
             $desc .= ".  Optional suffix s=seconds, m=minutes, h=hours, "
                    . "d=days; if no suffix, $s is used.";
          }
-         $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol})(?:\s+|$)/g);
+         $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol}(?!\W))(?:\s+|(?<=\W)|$)/g);
          $desc =~ s/ +$//mg;
          if ( $short ) {
             $usage .= sprintf("  --%-${maxs}s -%s  %s\n", $long, $short, $desc);

=== modified file 'lib/OptionParser.pm'
--- lib/OptionParser.pm	2012-10-30 15:42:42 +0000
+++ lib/OptionParser.pm	2012-11-16 01:10:29 +0000
@@ -1074,7 +1074,7 @@
                    . "d=days; if no suffix, $s is used.";
          }
          # Wrap long descriptions
-         $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol})(?:\s+|$)/g);
+         $desc = join("\n$rpad", grep { $_ } $desc =~ m/(.{0,$rcol}(?!\W))(?:\s+|(?<=\W)|$)/g);
          $desc =~ s/ +$//mg;
          if ( $short ) {
             $usage .= sprintf("  --%-${maxs}s -%s  %s\n", $long, $short, $desc);

=== modified file 't/pt-query-digest/option_sanity.t'
--- t/pt-query-digest/option_sanity.t	2012-05-30 17:14:13 +0000
+++ t/pt-query-digest/option_sanity.t	2012-11-16 01:10:29 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 6;
+use Test::More;
 
 use PerconaTest;
 
@@ -57,8 +57,24 @@
 like $output,
    qr/\Q--embedded-attributes POSIX syntax [: :] belongs inside character/,
    "Bug 885382: --embedded-attributes rejects warning patterns early";;
-   
+
+# #############################################################################
+# pt-query-digest help output mangled
+# https://bugs.launchpad.net/percona-toolkit/+bug/831525
+# #############################################################################
+
+$output = `$trunk/bin/pt-query-digest --help`;
+
+like(
+   $output,
+   qr/\Q--report-format=A\E\s*
+      \QPrint these sections of the query analysis\E\s*
+      \Qreport (default rusage,date,hostname,files,\E\s*
+      \Qheader,profile,query_report,prepared)\E/x,
+   "Bug 831525: pt-query-digest help output mangled"
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
-exit;
+done_testing;