X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=samples%2Fgenerate.pl;h=a8332279be776d6cb1eae2c6cc0eef9a38decfa4;hb=698741fb7af41bc3d17b3489201b4ea26109703d;hp=0c5307c073c0554f6b69387351f9e1f79303c569;hpb=ce944712f5232aac857a6a435f27d5e954617d53;p=perl%2Fmodules%2FTask-Devel-Cover-Recommended.git

diff --git a/samples/generate.pl b/samples/generate.pl
index 0c5307c..a833227 100644
--- a/samples/generate.pl
+++ b/samples/generate.pl
@@ -11,6 +11,7 @@ use Cwd;
 use File::Fetch;
 use File::Spec;
 use File::Temp 0.19;
+use Getopt::Std;
 use List::Util;
 use Parse::CPAN::Meta;
 
@@ -30,6 +31,9 @@ my %prereq_desc = (
  'PPI::HTML' => 'Devel::Cover lets you optionally pick between L<PPI::HTML> and L<Perl::Tidy>, but it will only use the former if both are installed.',
 );
 
+my %opts;
+getopts 'n' => \%opts;
+
 sub get_latest_dist {
  my $dist = shift;
 
@@ -108,7 +112,7 @@ for my $eumm_phase (keys %eumm_phases) {
 
  for my $meta_phase (@{$eumm_phases{$eumm_phase}}) {
 
-  for my $type (qw<requires recommends>) {
+  for my $type (qw<requires recommends suggests>) {
    my $phase_prereqs = $meta->{prereqs}{$meta_phase}{$type};
    next unless $phase_prereqs;
 
@@ -148,8 +152,10 @@ my ($old_task_revision) = $old_task_version =~ /([0-9]+)$/;
 
 my $new_task_version  = version->parse($target_version)->normal;
 my $new_task_revision = $old_task_revision;
-++$new_task_revision
-      if version->parse($new_task_version) <= version->parse($old_task_version);
+if (!$opts{n}
+   and version->parse($new_task_version) <= version->parse($old_task_version)) {
+ ++$new_task_revision;
+}
 if (($target_version =~ tr/.//) < 2) {
  my @components     = split /\./, $new_task_version;
  $components[2]     = $new_task_revision;
@@ -170,7 +176,7 @@ sub deplist_to_pod {
  while (@deplist) {
   my ($module, $version) = splice @deplist, 0, 2;
   my $X = $module eq 'perl' ? 'C' : 'L';
-  $pod .= "=item $X<$module>";
+  $pod .= "=item *\n\n$X<$module>";
   $pod .= " $version" if $version;
   $pod .= "\n\n";
   if (my $desc = $prereq_desc{$module}) {
@@ -188,7 +194,7 @@ sub deplist_to_perl {
  return '{ }' unless @deplist;
 
  my $len = List::Util::max(
-  map length, @deplist[grep not($_ % 2), 0 .. $#deplist ]
+  map length, @deplist[grep not($_ % 2), 0 .. $#deplist]
  );
 
  my $perl = "{\n";
@@ -207,10 +213,15 @@ sub sorthr ($) {
  map { $_ => $hr->{$_} } sort keys %$hr;
 }
 
+# Make sure no package FOO statement appears in this file.
+my $package_statement = join ' ', 'package',
+                                   $task_pkg;
+
 my %vars = (
  TARGET_PKG             => $target_pkg,
  TARGET_VERSION         => $target_version,
  TASK_PKG               => $task_pkg,
+ PACKAGE_TASK_PKG       => $package_statement,
  TASK_VERSION           => $new_task_version,
  PERL_PREREQ            => $prereqs{perl},
  CONFIGURE_PREREQS_POD  => deplist_to_pod(sorthr $prereqs{configure}),
@@ -234,72 +245,77 @@ my %vars = (
 
 my %templates = (
  $task_file => <<'TEMPLATE',
-package __TASK_PKG__;
+__PACKAGE_TASK_PKG__;
 
 use strict;
 use warnings;
 
-=head1 NAME
+\=head1 NAME
 
 __TASK_PKG__ - Install __TARGET_PKG__ and its recommended dependencies.
 
-=head1 VERSION
+\=head1 VERSION
 
 Version __TASK_VERSION__
 
-=cut
+\=cut
 
 our $VERSION = '__TASK_VERSION__';
 
-=head1 SYNOPSIS
+\=head1 SYNOPSIS
 
     $ cpan __TASK_PKG__
     $ cpanp -i __TASK_PKG__
     $ cpanm __TASK_PKG__
 
-=head1 DESCRIPTION
+\=head1 DESCRIPTION
 
 This task module lets you easily install L<__TARGET_PKG__> __TARGET_VERSION__ and all its recommended dependencies.
 
-=head1 DEPENDENCIES
+\=head1 DEPENDENCIES
 
-=head2 Configure-time dependencies
+\=head2 Configure-time dependencies
 
 __CONFIGURE_PREREQS_POD__
 
-=head2 Build-time and test-time dependencies
+\=head2 Build-time and test-time dependencies
 
 __BUILD_PREREQS_POD__
 
-=head2 Run-time dependencies
+\=head2 Run-time dependencies
 
 __RUN_PREREQS_POD__
 
-=head1 AUTHOR
+\=head1 CAVEATS
+
+Note that run-time dependencies that are only recommended by __TARGET_PKG__ may not yet be installed at the time __TARGET_PKG__ is tested, as there is no explicit dependency link between them and in that case most CPAN clients default to install prerequisites in alphabetic order.
+However, they will be installed when __TASK_PKG__ is, thus will be available when you actually use __TARGET_PKG__.
+
+\=head1 AUTHOR
 
 Vincent Pit, C<< <perl at profvince.com> >>, L<http://www.profvince.com>.
 
 You can contact me by mail or on C<irc.perl.org> (vincent).
 
-=head1 BUGS
+\=head1 BUGS
 
 Please report any bugs or feature requests to C<__BUG_EMAIL__>, or through the web interface at L<__BUG_QUEUE__>.
 I will be notified, and then you'll automatically be notified of progress on your bug as I make changes.
 
-=head1 SUPPORT
+\=head1 SUPPORT
 
 You can find documentation for this module with the perldoc command.
 
     perldoc __TASK_PKG__
 
-=head1 COPYRIGHT & LICENSE
+\=head1 COPYRIGHT & LICENSE
 
 Copyright __YEARS__ Vincent Pit, all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
 
-=cut
+\=cut
 
 1; # End of __TASK_PKG__
 TEMPLATE
@@ -343,6 +359,7 @@ WriteMakefile(
  VERSION_FROM     => $file,
  ABSTRACT_FROM    => $file,
  PL_FILES         => {},
+ BUILD_REQUIRES   => $BUILD_PREREQS,
  PREREQ_PM        => $RUN_PREREQS,
  MIN_PERL_VERSION => '__PERL_PREREQ__',
  META_MERGE       => \%META,
@@ -385,6 +402,8 @@ for my $test (@tests) {
 TEMPLATE
 );
 
+$templates{$task_file} =~ s/^\\=/=/mg;
+
 my $valid_keys = join '|', keys %vars;
 $valid_keys    = qr/$valid_keys/;