X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=1f353a36805ec3e86ec8a0c1059d96036a68ea55;hb=be68095d16b02db81aa1c37dfd6f6595f19d1ac2;hp=7dce8109c6aa79755422248f9be647e45704bd4d;hpb=ecb687463a4bf22f3736c1bff6a759ff525de48e;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm index 7dce810..1f353a3 100644 --- a/lib/DBIx/Class/Optional/Dependencies.pm +++ b/lib/DBIx/Class/Optional/Dependencies.pm @@ -11,17 +11,62 @@ use Carp; # POD is generated automatically by calling _gen_pod from the # Makefile.PL in $AUTHOR mode +my $json_any = { + 'JSON::Any' => '1.22', +}; + my $moose_basic = { - 'Moose' => '0.98', - 'MooseX::Types' => '0.21', + 'Moose' => '0.98', + 'MooseX::Types' => '0.21', +}; + +my $replicated = { + %$moose_basic, + 'Hash::Merge' => '0.12', }; my $admin_basic = { %$moose_basic, - 'MooseX::Types::Path::Class' => '0.05', - 'MooseX::Types::JSON' => '0.02', - 'JSON::Any' => '1.22', - 'namespace::autoclean' => '0.09', + %$json_any, + 'MooseX::Types::Path::Class' => '0.05', + 'MooseX::Types::JSON' => '0.02', + 'namespace::autoclean' => '0.09', +}; + +my $datetime_basic = { + 'DateTime' => '0.55', + 'DateTime::Format::Strptime' => '1.2', +}; + +my $id_shortener = { + 'Math::BigInt' => '1.89', + 'Math::Base36' => '0.07', +}; + +my $rdbms_sqlite = { + 'DBD::SQLite' => '0', +}; +my $rdbms_pg = { + 'DBD::Pg' => '0', +}; +my $rdbms_mssql_odbc = { + 'DBD::ODBC' => '0', +}; +my $rdbms_mssql_sybase = { + 'DBD::Sybase' => '0', +}; +my $rdbms_mysql = { + 'DBD::mysql' => '0', +}; +my $rdbms_oracle = { + 'DBD::Oracle' => '0', + %$id_shortener, +}; +my $rdbms_ase = { + 'DBD::Sybase' => '0', +}; +my $rdbms_db2 = { + 'DBD::DB2' => '0', }; my $reqs = { @@ -30,16 +75,21 @@ my $reqs = { }, replicated => { - req => { - %$moose_basic, - 'Hash::Merge' => '0.12', - }, + req => $replicated, pod => { title => 'Storage::Replicated', desc => 'Modules required for L', }, }, + test_replicated => { + req => { + %$replicated, + 'Test::Moose' => '0', + }, + }, + + admin => { req => { %$admin_basic, @@ -65,14 +115,17 @@ my $reqs = { deploy => { req => { - 'SQL::Translator' => '0.11005', + 'SQL::Translator' => '0.11006', }, pod => { title => 'Storage::DBI::deploy()', - desc => 'Modules required for L and L', + desc => 'Modules required for L and L', }, }, + id_shortener => { + req => $id_shortener, + }, test_pod => { req => { @@ -99,33 +152,49 @@ my $reqs = { }, }, - test_cycle => { + test_prettydebug => { + req => $json_any, + }, + + test_leaks => { req => { 'Test::Memory::Cycle' => '0', 'Devel::Cycle' => '1.10', }, }, - test_dtrelated => { + test_dt => { + req => $datetime_basic, + }, + + test_dt_sqlite => { req => { + %$datetime_basic, # t/36datetime.t # t/60core.t 'DateTime::Format::SQLite' => '0', + }, + }, - # t/96_is_deteministic_value.t - 'DateTime::Format::Strptime'=> '0', - + test_dt_mysql => { + req => { + %$datetime_basic, # t/inflate/datetime_mysql.t # (doesn't need Mysql itself) - 'DateTime::Format::MySQL' => '0', + 'DateTime::Format::MySQL' => '0', + }, + }, + test_dt_pg => { + req => { + %$datetime_basic, # t/inflate/datetime_pg.t # (doesn't need PG itself) - 'DateTime::Format::Pg' => '0', + 'DateTime::Format::Pg' => '0.16004', }, }, - cdbicompat => { + test_cdbicompat => { req => { 'DBIx::ContextualFetch' => '0', 'Class::DBI::Plugin::DeepAbstractSearch' => '0', @@ -136,57 +205,163 @@ my $reqs = { }, }, + # this is just for completeness as SQLite + # is a core dep of DBIC for testing + rdbms_sqlite => { + req => { + %$rdbms_sqlite, + }, + pod => { + title => 'SQLite support', + desc => 'Modules required to connect to SQLite', + }, + }, + rdbms_pg => { req => { + %$rdbms_pg, + }, + pod => { + title => 'PostgreSQL support', + desc => 'Modules required to connect to PostgreSQL', + }, + }, + + rdbms_mssql_odbc => { + req => { + %$rdbms_mssql_odbc, + }, + pod => { + title => 'MSSQL support via DBD::ODBC', + desc => 'Modules required to connect to MSSQL via DBD::ODBC', + }, + }, + + rdbms_mssql_sybase => { + req => { + %$rdbms_mssql_sybase, + }, + pod => { + title => 'MSSQL support via DBD::Sybase', + desc => 'Modules required to connect to MSSQL support via DBD::Sybase', + }, + }, + + rdbms_mysql => { + req => { + %$rdbms_mysql, + }, + pod => { + title => 'MySQL support', + desc => 'Modules required to connect to MySQL', + }, + }, + + rdbms_oracle => { + req => { + %$rdbms_oracle, + }, + pod => { + title => 'Oracle support', + desc => 'Modules required to connect to Oracle', + }, + }, + + rdbms_ase => { + req => { + %$rdbms_ase, + }, + pod => { + title => 'Sybase ASE support', + desc => 'Modules required to connect to Sybase ASE', + }, + }, + + rdbms_db2 => { + req => { + %$rdbms_db2, + }, + pod => { + title => 'DB2 support', + desc => 'Modules required to connect to DB2', + }, + }, + +# the order does matter because the rdbms support group might require +# a different version that the test group + test_rdbms_pg => { + req => { $ENV{DBICTEST_PG_DSN} ? ( + %$rdbms_pg, 'Sys::SigAction' => '0', 'DBD::Pg' => '2.009002', ) : () }, }, - rdbms_mysql => { + test_rdbms_mssql_odbc => { + req => { + $ENV{DBICTEST_MSSQL_ODBC_DSN} + ? ( + %$rdbms_mssql_odbc, + ) : () + }, + }, + + test_rdbms_mssql_sybase => { + req => { + $ENV{DBICTEST_MSSQL_DSN} + ? ( + %$rdbms_mssql_sybase, + ) : () + }, + }, + + test_rdbms_mysql => { req => { $ENV{DBICTEST_MYSQL_DSN} ? ( - 'DBD::mysql' => '0', + %$rdbms_mysql, ) : () }, }, - rdbms_oracle => { + test_rdbms_oracle => { req => { $ENV{DBICTEST_ORA_DSN} ? ( + %$rdbms_oracle, 'DateTime::Format::Oracle' => '0', + 'DBD::Oracle' => '1.24', ) : () }, }, - rdbms_ase => { + test_rdbms_ase => { req => { $ENV{DBICTEST_SYBASE_DSN} ? ( - 'DateTime::Format::Sybase' => 0, + %$rdbms_ase, + 'DateTime::Format::Sybase' => '0', ) : () }, }, - rdbms_asa => { + test_rdbms_db2 => { req => { - (scalar grep { $ENV{$_} } (qw/DBICTEST_SYBASE_ASA_DSN DBICTEST_SYBASE_ASA_ODBC_DSN/) ) + $ENV{DBICTEST_DB2_DSN} ? ( - 'DateTime::Format::Strptime' => 0, + %$rdbms_db2, ) : () }, }, - rdbms_db2 => { + test_memcached => { req => { - $ENV{DBICTEST_DB2_DSN} + $ENV{DBICTEST_MEMCACHED} ? ( - 'DBD::DB2' => 0, + 'Cache::Memcached' => 0, ) : () }, }, @@ -214,9 +389,7 @@ sub req_ok_for { croak "req_ok_for() expects a requirement group name" unless $group; - $class->_check_deps ($group) unless $req_availability_cache{$group}; - - return $req_availability_cache{$group}{status}; + return $class->_check_deps($group)->{status}; } sub req_missing_for { @@ -225,9 +398,7 @@ sub req_missing_for { croak "req_missing_for() expects a requirement group name" unless $group; - $class->_check_deps ($group) unless $req_availability_cache{$group}; - - return $req_availability_cache{$group}{missing}; + return $class->_check_deps($group)->{missing}; } sub req_errorlist_for { @@ -236,44 +407,49 @@ sub req_errorlist_for { croak "req_errorlist_for() expects a requirement group name" unless $group; - $class->_check_deps ($group) unless $req_availability_cache{$group}; - - return $req_availability_cache{$group}{errorlist}; + return $class->_check_deps($group)->{errorlist}; } sub _check_deps { my ($class, $group) = @_; - my $deps = $class->req_list_for ($group); + return $req_availability_cache{$group} ||= do { - my %errors; - for my $mod (keys %$deps) { - if (my $ver = $deps->{$mod}) { - eval "use $mod $ver ()"; + my $deps = $class->req_list_for ($group); + + my %errors; + for my $mod (keys %$deps) { + my $req_line = "require $mod;"; + if (my $ver = $deps->{$mod}) { + $req_line .= "$mod->VERSION($ver);"; + } + + eval $req_line; + + $errors{$mod} = $@ if $@; + } + + my $res; + + if (keys %errors) { + my $missing = join (', ', map { $deps->{$_} ? "$_ >= $deps->{$_}" : $_ } (sort keys %errors) ); + $missing .= " (see $class for details)" if $reqs->{$group}{pod}; + $res = { + status => 0, + errorlist => \%errors, + missing => $missing, + }; } else { - eval "require $mod"; + $res = { + status => 1, + errorlist => {}, + missing => '', + }; } - $errors{$mod} = $@ if $@; - } - - if (keys %errors) { - my $missing = join (', ', map { $deps->{$_} ? "$_ >= $deps->{$_}" : $_ } (sort keys %errors) ); - $missing .= " (see $class for details)" if $reqs->{$group}{pod}; - $req_availability_cache{$group} = { - status => 0, - errorlist => { %errors }, - missing => $missing, - }; - } - else { - $req_availability_cache{$group} = { - status => 1, - errorlist => {}, - missing => '', - }; - } + $res; + }; } sub req_group_list { @@ -282,34 +458,30 @@ 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 = shift; my $modfn = __PACKAGE__ . '.pm'; $modfn =~ s/\:\:/\//g; my $podfn = __FILE__; $podfn =~ s/\.pm$/\.pod/; - my $distver = + $distver ||= eval { require DBIx::Class; DBIx::Class->VERSION; } || - do { - warn + die "\n\n---------------------------------------------------------------------\n" . 'Unable to load core DBIx::Class module to determine current version, '. 'possibly due to missing dependencies. Author-mode autodocumentation ' . "halted\n\n" . $@ . "\n\n---------------------------------------------------------------------\n" - ; - '*UNKNOWN*'; # rv - } ; 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 ######################## ######################################################################### @@ -322,7 +494,7 @@ EOC '=head1 NAME', "$class - Optional module dependency specifications (for module authors)", '=head1 SYNOPSIS', - <'s Makefile.PL): ... @@ -331,7 +503,7 @@ Somewhere in your build-file (e.g. L's Makefile.PL): require $class; - my \$deploy_deps = $class->req_list_for ('deploy'); + my \$deploy_deps = $class->req_list_for('deploy'); for (keys %\$deploy_deps) { requires \$_ => \$deploy_deps->{\$_}; @@ -384,10 +556,10 @@ EOD '=head1 METHODS', '=head2 req_group_list', '=over', - '=item Arguments: $none', + '=item Arguments: none', '=item Returns: \%list_of_requirement_groups', '=back', - < version of DBIx::Class. See the L for a real-world @@ -410,14 +582,17 @@ EOD '=item Arguments: $group_name', '=item Returns: 1|0', '=back', - 'Returns true or false depending on whether all modules required by C<$group_name> are present on the system and loadable', + <<'EOD', +Returns true or false depending on whether all modules required by +C<$group_name> are present on the system and loadable. +EOD '=head2 req_missing_for', '=over', '=item Arguments: $group_name', '=item Returns: $error_message_string', '=back', - <