X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=76229c237a4df610161da1828df9856c49a08103;hb=bb96193692f7c0f53de7fe15e157492b0af51988;hp=d34de2ceace45cf372a026e96cc52245c8ef5c1d;hpb=b5e0fd2478552f66b232db5e569414537b1e3646;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index d34de2c..76229c2 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,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,13 +112,6 @@ my $rdbms_firebird_odbc = {
 };
 
 my $reqs = {
-  dist => {
-    req => { $] < '5.010001' ? () : (
-      'Pod::Inherit' => '0.16',
-      'Pod::Tree'    => '0',
-    ) },
-  },
-
   replicated => {
     req => $replicated,
     pod => {
@@ -149,16 +148,9 @@ my $reqs = {
     },
   },
 
-  test_admin_script => {
-    req => {
-      %$admin_script,
-      ($^O eq 'MSWin32' ? ('Win32::ShellQuote' => 0) : ()),
-    }
-  },
-
   deploy => {
     req => {
-      'SQL::Translator'           => '0.11006',
+      'SQL::Translator'           => '0.11018',
     },
     pod => {
       title => 'Storage::DBI::deploy()',
@@ -178,7 +170,7 @@ my $reqs = {
 
   test_pod => {
     req => {
-      'Test::Pod'                 => '1.41',
+      'Test::Pod'                 => '1.42',
     },
   },
 
@@ -189,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',
     },
   },
 
@@ -245,7 +255,6 @@ my $reqs = {
 
   test_cdbicompat => {
     req => {
-      'Class::DBI' => 0,
       'Class::DBI::Plugin::DeepAbstractSearch' => '0',
       %$datetime_basic,
       'Time::Piece::MySQL'        => '0',
@@ -444,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',
         ) : ()
     },
@@ -609,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) = @_;
@@ -625,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) = @_;
 
@@ -857,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 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',