X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=27d38170c13e99e2763ab738a7556cc5d461aad8;hb=63a18cfe04b404ec09424385980b03e439f36d0c;hp=faba747f21266127d40aef1e43e511cf035e60fb;hpb=ee6e8c79bfa5b113aa94c850405b37b677410ef8;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index faba747..27d3817 100644
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -3,7 +3,7 @@ package DBIx::Class::Optional::Dependencies;
 use warnings;
 use strict;
 
-use Carp ();
+use Carp;
 
 # NO EXTERNAL NON-5.8.1 CORE DEPENDENCIES EVER (e.g. C::A::G)
 # This module is to be loaded by Makefile.PM on a pristine system
@@ -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,9 @@ 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 = {
@@ -106,19 +112,6 @@ my $rdbms_firebird_odbc = {
 };
 
 my $reqs = {
-  dist_upload => {
-    req => {
-      'CPAN::Uploader' => '0.103001',
-    },
-  },
-
-  dist_podinherit => {
-    req => {
-      'Pod::Inherit' => '0.90',
-      'Pod::Tree'    => '0',
-    }
-  },
-
   replicated => {
     req => $replicated,
     pod => {
@@ -157,11 +150,11 @@ my $reqs = {
 
   deploy => {
     req => {
-      'SQL::Translator'           => '0.11016',
+      '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>',
     },
   },
 
@@ -177,7 +170,7 @@ my $reqs = {
 
   test_pod => {
     req => {
-      'Test::Pod'                 => '1.41',
+      'Test::Pod'                 => '1.42',
     },
   },
 
@@ -197,18 +190,21 @@ my $reqs = {
 
   test_strictures => {
     req => {
-      'Test::Strict'              => '0.16',
+      '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
@@ -219,10 +215,10 @@ my $reqs = {
     }
   },
 
-  test_leaks => {
+  test_leaks_heavy => {
     req => {
-      'Test::Memory::Cycle'       => '0',
-      'Devel::Cycle'              => '1.10',
+      'Class::MethodCache' => '0.02',
+      'PadWalker' => '1.06',
     },
   },
 
@@ -259,7 +255,6 @@ my $reqs = {
 
   test_cdbicompat => {
     req => {
-      'Class::DBI' => 0,
       'Class::DBI::Plugin::DeepAbstractSearch' => '0',
       %$datetime_basic,
       'Time::Piece::MySQL'        => '0',
@@ -458,7 +453,6 @@ my $reqs = {
         ? (
           # when changing this list make sure to adjust xt/optional_deps.t
           %$rdbms_pg,
-          ($^O ne 'MSWin32' ? ('Sys::SigAction' => '0') : ()),
           'DBD::Pg'               => '2.009002',
         ) : ()
     },
@@ -623,27 +617,51 @@ my $reqs = {
     },
   },
 
+  dist_dir => {
+    req => {
+      %$test_and_dist_json_any,
+      'ExtUtils::MakeMaker' => '6.64',
+      'Pod::Inherit'        => '0.91',
+    },
+  },
+
+  dist_upload => {
+    req => {
+      'CPAN::Uploader' => '0.103001',
+    },
+  },
+
 };
 
+our %req_availability_cache;
 
 sub req_list_for {
   my ($class, $group) = @_;
 
-  Carp::croak "req_list_for() expects a requirement group name"
+  croak "req_list_for() expects a requirement group name"
     unless $group;
 
   my $deps = $reqs->{$group}{req}
-    or Carp::croak "Requirement group '$group' does not exist";
+    or croak "Requirement group '$group' does not exist";
 
   return { %$deps };
 }
 
 
-our %req_availability_cache;
+sub die_unless_req_ok_for {
+  my ($class, $group) = @_;
+
+  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) = @_;
 
-  Carp::croak "req_ok_for() expects a requirement group name"
+  croak "req_ok_for() expects a requirement group name"
     unless $group;
 
   return $class->_check_deps($group)->{status};
@@ -652,7 +670,7 @@ sub req_ok_for {
 sub req_missing_for {
   my ($class, $group) = @_;
 
-  Carp::croak "req_missing_for() expects a requirement group name"
+  croak "req_missing_for() expects a requirement group name"
     unless $group;
 
   return $class->_check_deps($group)->{missing};
@@ -661,7 +679,7 @@ sub req_missing_for {
 sub req_errorlist_for {
   my ($class, $group) = @_;
 
-  Carp::croak "req_errorlist_for() expects a requirement group name"
+  croak "req_errorlist_for() expects a requirement group name"
     unless $group;
 
   return $class->_check_deps($group)->{errorlist};
@@ -871,25 +889,43 @@ 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 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',
-    'See L<DBIx::Class/CONTRIBUTORS>.',
-    '=head1 LICENSE',
-    'You may distribute this code under the same terms as Perl itself',
+    '=head1 FURTHER QUESTIONS?',
+    'Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.',
+    '=head1 COPYRIGHT AND LICENSE',
+    <<'EOL',
+This module is free software L<copyright|DBIx::Class/COPYRIGHT AND LICENSE>
+by the L<DBIx::Class (DBIC) authors|DBIx::Class/AUTHORS>. You can
+redistribute it and/or modify it under the same terms as the
+L<DBIx::Class library|DBIx::Class/COPYRIGHT AND LICENSE>.
+EOL
+
   );
 
-  open (my $fh, '>', $podfn) or Carp::croak "Unable to write to $podfn: $!";
-  print $fh join ("\n\n", @chunks);
-  print $fh "\n";
-  close ($fh);
+  eval {
+    open (my $fh, '>', $podfn) or die;
+    print $fh join ("\n\n", @chunks) or die;
+    print $fh "\n" or die;
+    close ($fh) or die;
+  } or croak( "Unable to write $podfn: " . ( $! || $@ || 'unknown error') );
 }
 
 1;