Merge 'trunk' into 'dbicadmin_refactor'

r8691@Thesaurus (orig r8678):  ribasushi | 2010-02-13 10:07:15 +0100
Autogen comment for Dependencies.pod
r8692@Thesaurus (orig r8679):  ribasushi | 2010-02-13 10:11:24 +0100
Ask for newer M::I
r8698@Thesaurus (orig r8685):  ribasushi | 2010-02-13 11:11:10 +0100
Add author/license to pod
r8699@Thesaurus (orig r8686):  arcanez | 2010-02-13 13:43:22 +0100
fix typo per nuba on irc

diff --combined Makefile.PL
index 105c2ae,010c3ba..b69ec9f
--- 1/Makefile.PL
--- 2/Makefile.PL
+++ b/Makefile.PL
@@@ -1,4 -1,4 +1,4 @@@
- use inc::Module::Install 0.89;
+ use inc::Module::Install 0.93;
  use strict;
  use warnings;
  use POSIX ();
@@@ -44,6 -44,7 +44,6 @@@ my $runtime_requires = 
    'Class::Inspector'         => '1.24',
    'Data::Page'               => '2.00',
    'DBI'                      => '1.609',
 -  'JSON::Any'                => '1.18',
    'MRO::Compat'              => '0.09',
    'Module::Find'             => '0.06',
    'Path::Class'              => '0.16',

diff --combined lib/DBIx/Class/Optional/Dependencies.pm
index adc26f9,dd5265e..6870714
--- 1/lib/DBIx/Class/Optional/Dependencies.pm
--- 2/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@@ -11,19 -11,6 +11,19 @@@ use Carp
  # POD is generated automatically by calling _gen_pod from the
  # Makefile.PL in $AUTHOR mode
  
 +my $moose_basic = {
 +  'Moose'                      => '0.98',
 +  'MooseX::Types'              => '0.21',
 +};
 +
 +my $admin_basic = {
 +  %$moose_basic,
 +  'MooseX::Types::Path::Class' => '0.05',
 +  'MooseX::Types::JSON'        => '0.02',
 +  'namespace::autoclean'       => '0.09',
 +  'parent'                     => '0.223',
 +};
 +
  my $reqs = {
    dist => {
      #'Module::Install::Pod::Inherit' => '0.01',
@@@ -31,7 -18,8 +31,7 @@@
  
    replicated => {
      req => {
 -      'Moose'                     => '0.98',
 -      'MooseX::Types'             => '0.21',
 +      %$moose_basic,
        'namespace::clean'          => '0.11',
        'Hash::Merge'               => '0.11',
      },
@@@ -42,27 -30,6 +42,27 @@@
    },
  
    admin => {
 +    req => {
 +      %$admin_basic,
 +    },
 +    pod => {
 +      title => 'DBIx::Class::Admin',
 +      desc => 'Modules required for the DBIx::Class administrative library',
 +    },
 +  },
 +
 +  admin_script => {
 +    req => {
 +      %$moose_basic,
 +      %$admin_basic,
 +      'Getopt::Long::Descriptive' => '0.081',
 +      'JSON::Any'                 => '1.22',
 +      'Text::CSV'                 => '1.16',
 +    },
 +    pod => {
 +      title => 'dbicadmin',
 +      desc => 'Modules required for the CLI DBIx::Class interface dbicadmin',
 +    },
    },
  
    deploy => {
@@@ -249,8 -216,20 +249,20 @@@ sub _check_deps 
  
  sub _gen_pod {
    my $class = shift;
+   my $modfn = __PACKAGE__ . '.pm';
+   $modfn =~ s/\:\:/\//g;
  
    my @chunks = (
+     <<"EOC",
+ #########################################################################
+ #####################  A U T O G E N E R A T E D ########################
+ #########################################################################
+ #
+ # The contents of this POD file are auto-generated.  Any changes you make
+ # will be lost. If you need to change the generated text edit _gen_pod()
+ # at the end of $modfn
+ #
+ EOC
      '=head1 NAME',
      "$class - Optional module dependency specifications",
      '=head1 DESCRIPTION',
@@@ -317,7 -296,7 +329,7 @@@ EO
      '=item Arguments: $group_name',
      '=item Returns: 1|0',
      '=back',
-     'Returns true or false depending on whether all modules required by $group_name are present on the system and loadable',
+     'Returns true or false depending on whether all modules required by C<$group_name> are present on the system and loadable',
  
      '=head2 req_missing_for',
      '=over',
@@@ -348,7 -327,10 +360,10 @@@ EO
  Returns a hashref containing the actual errors that occured while attempting
  to load each module in the requirement group.
  EOD
- 
+     '=head1 AUTHOR',
+     'See L<DBIx::Class/CONTRIBUTORS>.',
+     '=head1 LICENSE',
+     'You may distribute this code under the same terms as Perl itself',
    );
  
    my $fn = __FILE__;