X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=a6cbb49702f12da5cfd700633ac805223cd35b0d;hb=7536c92b1affd50dd567cb1acae7a38f2222d04d;hp=6e46f917175aede91538afb2c3ce936b8fb2d147;hpb=e3fc11e1540ac502176358aac2d2df20c7d90d7f;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm index 6e46f91..a6cbb49 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,36 +11,124 @@ 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, }; 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 $admin_script = { + %$moose_basic, + %$admin_basic, + 'Getopt::Long::Descriptive' => '0.081', + 'Text::CSV' => '1.16', +}; + +my $datetime_basic = { + 'DateTime' => '0.55', + 'DateTime::Format::Strptime' => '1.2', +}; + +my $id_shortener = { + 'Math::BigInt' => '1.80', + '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_mssql_ado = { + 'DBD::ADO' => '0', +}; +my $rdbms_msaccess_odbc = { + 'DBD::ODBC' => '0', +}; +my $rdbms_msaccess_ado = { + 'DBD::ADO' => '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 $rdbms_db2_400 = { + 'DBD::ODBC' => '0', +}; +my $rdbms_informix = { + 'DBD::Informix' => '0', +}; +my $rdbms_sqlanywhere = { + 'DBD::SQLAnywhere' => '0', +}; +my $rdbms_sqlanywhere_odbc = { + 'DBD::ODBC' => '0', +}; +my $rdbms_firebird = { + 'DBD::Firebird' => '0', +}; +my $rdbms_firebird_interbase = { + 'DBD::InterBase' => '0', +}; +my $rdbms_firebird_odbc = { + 'DBD::ODBC' => '0', }; my $reqs = { - dist => { - #'Module::Install::Pod::Inherit' => '0.01', + dist_podinherit => { + req => { + 'Pod::Inherit' => '0.90', + 'Pod::Tree' => '0', + } }, replicated => { - req => { - %$moose_basic, - 'namespace::clean' => '0.11', - '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, @@ -53,10 +141,7 @@ my $reqs = { admin_script => { req => { - %$moose_basic, - %$admin_basic, - 'Getopt::Long::Descriptive' => '0.081', - 'Text::CSV' => '1.16', + %$admin_script, }, pod => { title => 'dbicadmin', @@ -66,14 +151,23 @@ my $reqs = { deploy => { req => { - 'SQL::Translator' => '0.11005', + 'SQL::Translator' => '0.11016', }, 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_component_accessor => { + req => { + 'Class::Unload' => '0.07', + }, + }, test_pod => { req => { @@ -90,104 +184,434 @@ my $reqs = { test_notabs => { req => { - #'Test::NoTabs' => '0.9', + 'Test::NoTabs' => '0.9', }, }, test_eol => { req => { - #'Test::EOL' => '0.6', + 'Test::EOL' => '1.0', }, }, - test_cycle => { + test_prettydebug => { + req => $json_any, + }, + + test_admin_script => { + req => { + %$admin_script, + 'JSON' => 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 => { 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' => 0, 'Class::DBI::Plugin::DeepAbstractSearch' => '0', - 'Class::Trigger' => '0', + %$datetime_basic, 'Time::Piece::MySQL' => '0', - 'Clone' => '0', 'Date::Simple' => '3.03', }, }, + # 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 => { + # when changing this list make sure to adjust xt/optional_deps.t + %$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 via DBD::Sybase', + }, + }, + + rdbms_mssql_ado => { + req => { + %$rdbms_mssql_ado, + }, + pod => { + title => 'MSSQL support via DBD::ADO (Windows only)', + desc => 'Modules required to connect to MSSQL via DBD::ADO. This particular DBD is available on Windows only', + }, + }, + + rdbms_msaccess_odbc => { + req => { + %$rdbms_msaccess_odbc, + }, + pod => { + title => 'MS Access support via DBD::ODBC', + desc => 'Modules required to connect to MS Access via DBD::ODBC', + }, + }, + + rdbms_msaccess_ado => { + req => { + %$rdbms_msaccess_ado, + }, + pod => { + title => 'MS Access support via DBD::ADO (Windows only)', + desc => 'Modules required to connect to MS Access via DBD::ADO. This particular DBD is available on Windows only', + }, + }, + + 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', + }, + }, + + rdbms_db2_400 => { + req => { + %$rdbms_db2_400, + }, + pod => { + title => 'DB2 on AS/400 support', + desc => 'Modules required to connect to DB2 on AS/400', + }, + }, + + rdbms_informix => { + req => { + %$rdbms_informix, + }, + pod => { + title => 'Informix support', + desc => 'Modules required to connect to Informix', + }, + }, + + rdbms_sqlanywhere => { + req => { + %$rdbms_sqlanywhere, + }, + pod => { + title => 'SQLAnywhere support', + desc => 'Modules required to connect to SQLAnywhere', + }, + }, + + rdbms_sqlanywhere_odbc => { + req => { + %$rdbms_sqlanywhere_odbc, + }, + pod => { + title => 'SQLAnywhere support via DBD::ODBC', + desc => 'Modules required to connect to SQLAnywhere via DBD::ODBC', + }, + }, + + rdbms_firebird => { + req => { + %$rdbms_firebird, + }, + pod => { + title => 'Firebird support', + desc => 'Modules required to connect to Firebird', + }, + }, + + rdbms_firebird_interbase => { + req => { + %$rdbms_firebird_interbase, + }, + pod => { + title => 'Firebird support via DBD::InterBase', + desc => 'Modules required to connect to Firebird via DBD::InterBase', + }, + }, + + rdbms_firebird_odbc => { + req => { + %$rdbms_firebird_odbc, + }, + pod => { + title => 'Firebird support via DBD::ODBC', + desc => 'Modules required to connect to Firebird via DBD::ODBC', + }, + }, + +# 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} ? ( - 'Sys::SigAction' => '0', + # when changing this list make sure to adjust xt/optional_deps.t + %$rdbms_pg, + ($^O ne 'MSWin32' ? ('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_ado => { + req => { + $ENV{DBICTEST_MSSQL_ADO_DSN} + ? ( + %$rdbms_mssql_ado, + ) : () + }, + }, + + test_rdbms_mssql_sybase => { + req => { + $ENV{DBICTEST_MSSQL_DSN} + ? ( + %$rdbms_mssql_sybase, + ) : () + }, + }, + + test_rdbms_msaccess_odbc => { + req => { + $ENV{DBICTEST_MSACCESS_ODBC_DSN} + ? ( + %$rdbms_msaccess_odbc, + %$datetime_basic, + 'Data::GUID' => '0', + ) : () + }, + }, + + test_rdbms_msaccess_ado => { + req => { + $ENV{DBICTEST_MSACCESS_ADO_DSN} + ? ( + %$rdbms_msaccess_ado, + %$datetime_basic, + 'Data::GUID' => 0, + ) : () + }, + }, + + 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, ) : () }, }, - 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_rdbms_db2_400 => { req => { - $ENV{DBICTEST_DB2_DSN} + $ENV{DBICTEST_DB2_400_DSN} + ? ( + %$rdbms_db2_400, + ) : () + }, + }, + + test_rdbms_informix => { + req => { + $ENV{DBICTEST_INFORMIX_DSN} + ? ( + %$rdbms_informix, + ) : () + }, + }, + + test_rdbms_sqlanywhere => { + req => { + $ENV{DBICTEST_SQLANYWHERE_DSN} + ? ( + %$rdbms_sqlanywhere, + ) : () + }, + }, + + test_rdbms_sqlanywhere_odbc => { + req => { + $ENV{DBICTEST_SQLANYWHERE_ODBC_DSN} + ? ( + %$rdbms_sqlanywhere_odbc, + ) : () + }, + }, + + test_rdbms_firebird => { + req => { + $ENV{DBICTEST_FIREBIRD_DSN} + ? ( + %$rdbms_firebird, + ) : () + }, + }, + + test_rdbms_firebird_interbase => { + req => { + $ENV{DBICTEST_FIREBIRD_INTERBASE_DSN} + ? ( + %$rdbms_firebird_interbase, + ) : () + }, + }, + + test_rdbms_firebird_odbc => { + req => { + $ENV{DBICTEST_FIREBIRD_ODBC_DSN} ? ( - 'DBD::DB2' => 0, + %$rdbms_firebird_odbc, + ) : () + }, + }, + + test_memcached => { + req => { + $ENV{DBICTEST_MEMCACHED} + ? ( + 'Cache::Memcached' => 0, ) : () }, }, @@ -198,11 +622,11 @@ my $reqs = { sub req_list_for { my ($class, $group) = @_; - croak "req_list_for() expects a requirement group name" + Carp::croak "req_list_for() expects a requirement group name" unless $group; my $deps = $reqs->{$group}{req} - or croak "Requirement group '$group' does not exist"; + or Carp::croak "Requirement group '$group' does not exist"; return { %$deps }; } @@ -212,69 +636,70 @@ our %req_availability_cache; sub req_ok_for { my ($class, $group) = @_; - croak "req_ok_for() expects a requirement group name" + Carp::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 { my ($class, $group) = @_; - croak "req_missing_for() expects a requirement group name" + Carp::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 { my ($class, $group) = @_; - croak "req_errorlist_for() expects a requirement group name" + Carp::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 $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; - my %errors; - for my $mod (keys %$deps) { - if (my $ver = $deps->{$mod}) { - eval "use $mod $ver ()"; + 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 { @@ -283,12 +708,32 @@ sub req_group_list { # This is to be called by the author only (automatically in Makefile.PL) sub _gen_pod { - my $class = shift; - my $modfn = __PACKAGE__ . '.pm'; - $modfn =~ s/\:\:/\//g; + my ($class, $distver, $pod_dir) = @_; + + die "No POD root dir supplied" unless $pod_dir; + + $distver ||= + eval { require DBIx::Class; DBIx::Class->VERSION; } + || + 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" + ; + + # 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]); - require DBIx::Class; - my $distver = DBIx::Class->VERSION; my $sqltver = $class->req_list_for ('deploy')->{'SQL::Translator'} or die "Hrmm? No sqlt dep?"; @@ -306,7 +751,7 @@ EOC '=head1 NAME', "$class - Optional module dependency specifications (for module authors)", '=head1 SYNOPSIS', - <'s Makefile.PL): ... @@ -315,7 +760,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->{\$_}; @@ -341,7 +786,7 @@ EOD <<'EOD', Dependencies are organized in C and each group can list one or more required modules, with an optional minimum version (or 0 for any version). -The group name can be used in the +The group name can be used in the EOD ); @@ -368,10 +813,10 @@ EOD '=head1 METHODS', '=head2 req_group_list', '=over', - '=item Arguments: $none', - '=item Returns: \%list_of_requirement_groups', + '=item Arguments: none', + '=item Return Value: \%list_of_requirement_groups', '=back', - < version of DBIx::Class. See the L for a real-world @@ -392,16 +837,19 @@ EOD '=head2 req_ok_for', '=over', '=item Arguments: $group_name', - '=item Returns: 1|0', + '=item Return Value: 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', + '=item Return Value: $error_message_string', '=back', - <', $fn) or croak "Unable to write to $fn: $!"; + open (my $fh, '>', $podfn) or Carp::croak "Unable to write to $podfn: $!"; print $fh join ("\n\n", @chunks); + print $fh "\n"; close ($fh); }