X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=7b7388936fd8af831cc548e4382edd5e42a4d702;hb=06fc872a2ef6aefbd56057f3d22a2184556d0e16;hp=a507742f4d4dd5f278ed105955175d34060b939f;hpb=6343a20374932aeb277eb63a91f9769f9da2f4b6;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm index a507742..7b73889 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,10 +112,6 @@ my $rdbms_firebird_odbc = { }; my $reqs = { - dist => { - #'Module::Install::Pod::Inherit' => '0.01', - }, - replicated => { req => $replicated, pod => { @@ -146,20 +148,13 @@ 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()', - desc => 'Modules required for L and L', + desc => 'Modules required for L and L', }, }, @@ -175,7 +170,7 @@ my $reqs = { test_pod => { req => { - 'Test::Pod' => '1.41', + 'Test::Pod' => '1.42', }, }, @@ -186,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_leaks => { + test_admin_script => { req => { - 'Test::Memory::Cycle' => '0', - 'Devel::Cycle' => '1.10', + %$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_heavy => { + req => { + 'Class::MethodCache' => '0.02', + 'PadWalker' => '1.06', }, }, @@ -242,7 +255,6 @@ my $reqs = { test_cdbicompat => { req => { - 'Class::DBI' => 0, 'Class::DBI::Plugin::DeepAbstractSearch' => '0', %$datetime_basic, 'Time::Piece::MySQL' => '0', @@ -441,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', ) : () }, @@ -606,8 +617,23 @@ 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) = @_; @@ -622,7 +648,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) = @_; @@ -698,13 +733,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 $modfn = __PACKAGE__ . '.pm'; - $modfn =~ s/\:\:/\//g; + my ($class, $distver, $pod_dir) = @_; - my $podfn = __FILE__; - $podfn =~ s/\.pm$/\.pod/; + die "No POD root dir supplied" unless $pod_dir; $distver ||= eval { require DBIx::Class; DBIx::Class->VERSION; } @@ -717,6 +748,17 @@ 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?"; @@ -797,7 +839,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 @@ -808,7 +850,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 @@ -820,7 +862,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 @@ -830,7 +872,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. @@ -847,23 +889,40 @@ 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 passes for the supplied C<$group_name>, and +in case of failure throws an exception including the information +from L. +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', - 'See L.', - '=head1 LICENSE', - 'You may distribute this code under the same terms as Perl itself', + '=head1 FURTHER QUESTIONS?', + 'Check the list of L.', + '=head1 COPYRIGHT AND LICENSE', + <<'EOL', +This module is free software L +by the L. You can +redistribute it and/or modify it under the same terms as the +L. +EOL + ); open (my $fh, '>', $podfn) or Carp::croak "Unable to write to $podfn: $!"; print $fh join ("\n\n", @chunks); + print $fh "\n"; close ($fh); }