X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=468237fe1839f3af795caa9c1b112919d0b7dcf3;hb=5529838f7afff91467ef2664087999ab222da48d;hp=20fe329b0717ef8a256e602bbfa85a368db41fc5;hpb=8273e845426f0187b4ad6c4a1b42286fa09a648f;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index 20fe329..468237f 100644
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -11,13 +11,20 @@ use Carp ();
 # POD is generated automatically by calling _gen_pod from the
 # Makefile.PL in $AUTHOR mode
 
-my $json_any = {
-  'JSON::Any'                     => '1.22',
+# NOTE: the rationale for 2 JSON::Any versions is that
+# we need the newer only to work around JSON::XS, which
+# itself is an optional dep
+my $min_json_any = {
+  'JSON::Any'                     => '1.23',
+};
+my $test_and_dist_json_any = {
+  'JSON::Any'                     => '1.31',
 };
 
 my $moose_basic = {
   'Moose'                         => '0.98',
   'MooseX::Types'                 => '0.21',
+  'MooseX::Types::LoadableClass'  => '0.011',
 };
 
 my $replicated = {
@@ -26,10 +33,16 @@ my $replicated = {
 
 my $admin_basic = {
   %$moose_basic,
-  %$json_any,
+  %$min_json_any,
   'MooseX::Types::Path::Class'    => '0.05',
   'MooseX::Types::JSON'           => '0.02',
-  'namespace::autoclean'          => '0.09',
+};
+
+my $admin_script = {
+  %$moose_basic,
+  %$admin_basic,
+  'Getopt::Long::Descriptive' => '0.081',
+  'Text::CSV'                 => '1.16',
 };
 
 my $datetime_basic = {
@@ -99,10 +112,6 @@ my $rdbms_firebird_odbc = {
 };
 
 my $reqs = {
-  dist => {
-    #'Module::Install::Pod::Inherit' => '0.01',
-  },
-
   replicated => {
     req => $replicated,
     pod => {
@@ -131,10 +140,7 @@ my $reqs = {
 
   admin_script => {
     req => {
-      %$moose_basic,
-      %$admin_basic,
-      'Getopt::Long::Descriptive' => '0.081',
-      'Text::CSV'                 => '1.16',
+      %$admin_script,
     },
     pod => {
       title => 'dbicadmin',
@@ -144,11 +150,11 @@ my $reqs = {
 
   deploy => {
     req => {
-      'SQL::Translator'           => '0.11006',
+      'SQL::Translator'           => '0.11018',
     },
     pod => {
       title => 'Storage::DBI::deploy()',
-      desc => 'Modules required for L<DBIx::Class::Storage::DBI/deploy> and L<DBIx::Class::Storage::DBI/deployment_statements>',
+      desc => 'Modules required for L<DBIx::Class::Storage::DBI/deployment_statements> and L<DBIx::Class::Schema/deploy>',
     },
   },
 
@@ -164,7 +170,7 @@ my $reqs = {
 
   test_pod => {
     req => {
-      'Test::Pod'                 => '1.41',
+      'Test::Pod'                 => '1.42',
     },
   },
 
@@ -175,26 +181,44 @@ my $reqs = {
     },
   },
 
-  test_notabs => {
+  test_whitespace => {
     req => {
+      'Test::EOL'                 => '1.0',
       'Test::NoTabs'              => '0.9',
     },
   },
 
-  test_eol => {
+  test_strictures => {
     req => {
-      'Test::EOL'                 => '1.0',
+      'Test::Strict'              => '0.20',
     },
   },
 
   test_prettydebug => {
-    req => $json_any,
+    req => $min_json_any,
+  },
+
+  test_admin_script => {
+    req => {
+      %$admin_script,
+      %$test_and_dist_json_any,
+      'JSON' => 0,
+      'JSON::PP' => 0,
+      'Cpanel::JSON::XS' => 0,
+      'JSON::XS' => 0,
+      $^O eq 'MSWin32'
+        # for t/admin/10script.t
+        ? ('Win32::ShellQuote' => 0)
+        # DWIW does not compile (./configure even) on win32
+        : ('JSON::DWIW' => 0 )
+      ,
+    }
   },
 
-  test_leaks => {
+  test_leaks_heavy => {
     req => {
-      'Test::Memory::Cycle'       => '0',
-      'Devel::Cycle'              => '1.10',
+      'Class::MethodCache' => '0.02',
+      'PadWalker' => '1.06',
     },
   },
 
@@ -231,11 +255,9 @@ my $reqs = {
 
   test_cdbicompat => {
     req => {
-      'DBIx::ContextualFetch'     => '0',
       'Class::DBI::Plugin::DeepAbstractSearch' => '0',
-      'Class::Trigger'            => '0',
+      %$datetime_basic,
       'Time::Piece::MySQL'        => '0',
-      'Clone'                     => '0',
       'Date::Simple'              => '3.03',
     },
   },
@@ -254,6 +276,7 @@ my $reqs = {
 
   rdbms_pg => {
     req => {
+      # when changing this list make sure to adjust xt/optional_deps.t
       %$rdbms_pg,
     },
     pod => {
@@ -428,8 +451,8 @@ my $reqs = {
     req => {
       $ENV{DBICTEST_PG_DSN}
         ? (
+          # when changing this list make sure to adjust xt/optional_deps.t
           %$rdbms_pg,
-          ($^O ne 'MSWin32' ? ('Sys::SigAction' => '0') : ()),
           'DBD::Pg'               => '2.009002',
         ) : ()
     },
@@ -594,8 +617,24 @@ my $reqs = {
     },
   },
 
+  dist_dir => {
+    req => {
+      %$test_and_dist_json_any,
+      'ExtUtils::MakeMaker' => '6.64',
+      'Pod::Inherit'        => '0.90',
+      'Pod::Tree'           => '0',
+    }
+  },
+
+  dist_upload => {
+    req => {
+      'CPAN::Uploader' => '0.103001',
+    },
+  },
+
 };
 
+our %req_availability_cache;
 
 sub req_list_for {
   my ($class, $group) = @_;
@@ -610,7 +649,16 @@ sub req_list_for {
 }
 
 
-our %req_availability_cache;
+sub die_unless_req_ok_for {
+  my ($class, $group) = @_;
+
+  Carp::croak "die_unless_req_ok_for() expects a requirement group name"
+    unless $group;
+
+  $class->_check_deps($group)->{status}
+    or die sprintf( "Required modules missing, unable to continue: %s\n", $class->_check_deps($group)->{missing} );
+}
+
 sub req_ok_for {
   my ($class, $group) = @_;
 
@@ -686,13 +734,9 @@ sub req_group_list {
 
 # This is to be called by the author only (automatically in Makefile.PL)
 sub _gen_pod {
-  my ($class, $distver) = @_;
+  my ($class, $distver, $pod_dir) = @_;
 
-  my $modfn = __PACKAGE__ . '.pm';
-  $modfn =~ s/\:\:/\//g;
-
-  my $podfn = __FILE__;
-  $podfn =~ s/\.pm$/\.pod/;
+  die "No POD root dir supplied" unless $pod_dir;
 
   $distver ||=
     eval { require DBIx::Class; DBIx::Class->VERSION; }
@@ -705,11 +749,22 @@ sub _gen_pod {
 "\n\n---------------------------------------------------------------------\n"
   ;
 
+  # do not ask for a recent version, use 1.x API calls
+  # this *may* execute on a smoker with old perl or whatnot
+  require File::Path;
+
+  (my $modfn = __PACKAGE__ . '.pm') =~ s|::|/|g;
+
+  (my $podfn = "$pod_dir/$modfn") =~ s/\.pm$/\.pod/;
+  (my $dir = $podfn) =~ s|/[^/]+$||;
+
+  File::Path::mkpath([$dir]);
+
   my $sqltver = $class->req_list_for ('deploy')->{'SQL::Translator'}
     or die "Hrmm? No sqlt dep?";
 
   my @chunks = (
-    <<'EOC',
+    <<"EOC",
 #########################################################################
 #####################  A U T O G E N E R A T E D ########################
 #########################################################################
@@ -785,7 +840,7 @@ EOD
     '=head2 req_group_list',
     '=over',
     '=item Arguments: none',
-    '=item Returns: \%list_of_requirement_groups',
+    '=item Return Value: \%list_of_requirement_groups',
     '=back',
     <<'EOD',
 This method should be used by DBIx::Class packagers, to get a hashref of all
@@ -796,7 +851,7 @@ EOD
     '=head2 req_list_for',
     '=over',
     '=item Arguments: $group_name',
-    '=item Returns: \%list_of_module_version_pairs',
+    '=item Return Value: \%list_of_module_version_pairs',
     '=back',
     <<'EOD',
 This method should be used by DBIx::Class extension authors, to determine the
@@ -808,7 +863,7 @@ EOD
     '=head2 req_ok_for',
     '=over',
     '=item Arguments: $group_name',
-    '=item Returns: 1|0',
+    '=item Return Value: 1|0',
     '=back',
     <<'EOD',
 Returns true or false depending on whether all modules required by
@@ -818,7 +873,7 @@ EOD
     '=head2 req_missing_for',
     '=over',
     '=item Arguments: $group_name',
-    '=item Returns: $error_message_string',
+    '=item Return Value: $error_message_string',
     '=back',
     <<"EOD",
 Returns a single line string suitable for inclusion in larger error messages.
@@ -835,13 +890,23 @@ The author is expected to prepend the necessary text to this message before
 returning the actual error seen by the user.
 EOD
 
+    '=head2 die_unless_req_ok_for',
+    '=over',
+    '=item Arguments: $group_name',
+    '=back',
+    <<'EOD',
+Checks if L</req_ok_for> passes for the supplied C<$group_name>, and
+in case of failure throws an exception including the information
+from L</req_missing_for>.
+EOD
+
     '=head2 req_errorlist_for',
     '=over',
     '=item Arguments: $group_name',
-    '=item Returns: \%list_of_loaderrors_per_module',
+    '=item Return Value: \%list_of_loaderrors_per_module',
     '=back',
     <<'EOD',
-Returns a hashref containing the actual errors that occured while attempting
+Returns a hashref containing the actual errors that occurred while attempting
 to load each module in the requirement group.
 EOD
     '=head1 AUTHOR',
@@ -852,6 +917,7 @@ EOD
 
   open (my $fh, '>', $podfn) or Carp::croak "Unable to write to $podfn: $!";
   print $fh join ("\n\n", @chunks);
+  print $fh "\n";
   close ($fh);
 }