X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FOptional%2FDependencies.pm;h=531b0fc6578875be595333d7156a7c5b3eab474c;hb=602561137df00cb97daa1ff8909edc29431ba6a2;hp=d81f5b7c4d572fc6ca58084fb5edbf05864cb83c;hpb=31c31b8d18d88c2dcdbdbfac2660cb41819fb006;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm index d81f5b7..531b0fc 100644 --- a/lib/DBIx/Class/Optional/Dependencies.pm +++ b/lib/DBIx/Class/Optional/Dependencies.pm @@ -1,9 +1,15 @@ package DBIx::Class::Optional::Dependencies; -use warnings; -use strict; - -use Carp; +### This may look crazy, but it in fact tangibly ( by 50(!)% ) shortens +# the skip-test time when everything requested is unavailable +use if $ENV{RELEASE_TESTING} => 'warnings'; +use if $ENV{RELEASE_TESTING} => 'strict'; + +sub croak { + require Carp; + Carp::croak(@_); +}; +### # 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,109 +17,45 @@ use Carp; # POD is generated automatically by calling _gen_pod from the # Makefile.PL in $AUTHOR mode -# 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', -}; - +# *DELIBERATELY* not making a group for these - they must disappear +# forever as optdeps in the first place my $moose_basic = { 'Moose' => '0.98', 'MooseX::Types' => '0.21', 'MooseX::Types::LoadableClass' => '0.011', }; -my $replicated = { - %$moose_basic, -}; - -my $admin_basic = { - %$moose_basic, - %$min_json_any, - 'MooseX::Types::Path::Class' => '0.05', - 'MooseX::Types::JSON' => '0.02', -}; +my $dbic_reqs = { -my $admin_script = { - %$moose_basic, - %$admin_basic, - 'Getopt::Long::Descriptive' => '0.081', - 'Text::CSV' => '1.16', -}; + # 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 + _json_any => { + req => { + 'JSON::Any' => '1.23', + }, + }, -my $datetime_basic = { - 'DateTime' => '0.55', - 'DateTime::Format::Strptime' => '1.2', -}; + _json_xs_compatible_json_any => { + req => { + 'JSON::Any' => '1.31', + }, + }, -my $id_shortener = { - 'Math::BigInt' => '1.80', - 'Math::Base36' => '0.07', -}; + _rdbms_generic_odbc => { + req => { + 'DBD::ODBC' => 0, + } + }, -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', -}; + _rdbms_generic_ado => { + req => { + 'DBD::ADO' => 0, + } + }, -my $dbic_reqs = { replicated => { - req => $replicated, + req => $moose_basic, pod => { title => 'Storage::Replicated', desc => 'Modules required for L', @@ -121,16 +63,18 @@ my $dbic_reqs = { }, test_replicated => { + include => 'replicated', req => { - %$replicated, - 'Test::Moose' => '0', + 'Test::Moose' => '0', }, }, - admin => { + include => '_json_any', req => { - %$admin_basic, + %$moose_basic, + 'MooseX::Types::Path::Class' => '0.05', + 'MooseX::Types::JSON' => '0.02', }, pod => { title => 'DBIx::Class::Admin', @@ -139,8 +83,10 @@ my $dbic_reqs = { }, admin_script => { + include => 'admin', req => { - %$admin_script, + 'Getopt::Long::Descriptive' => '0.081', + 'Text::CSV' => '1.16', }, pod => { title => 'dbicadmin', @@ -159,7 +105,10 @@ my $dbic_reqs = { }, id_shortener => { - req => $id_shortener, + req => { + 'Math::BigInt' => '1.80', + 'Math::Base36' => '0.07', + }, }, test_component_accessor => { @@ -172,6 +121,7 @@ my $dbic_reqs = { req => { 'Test::Pod' => '1.42', }, + release_testing_mandatory => 1, }, test_podcoverage => { @@ -179,6 +129,7 @@ my $dbic_reqs = { 'Test::Pod::Coverage' => '1.08', 'Pod::Coverage' => '0.20', }, + release_testing_mandatory => 1, }, test_whitespace => { @@ -186,22 +137,23 @@ my $dbic_reqs = { 'Test::EOL' => '1.0', 'Test::NoTabs' => '0.9', }, + release_testing_mandatory => 1, }, test_strictures => { req => { 'Test::Strict' => '0.20', }, + release_testing_mandatory => 1, }, test_prettydebug => { - req => $min_json_any, + include => '_json_any', }, test_admin_script => { + include => [qw( admin_script _json_xs_compatible_json_any )], req => { - %$admin_script, - %$test_and_dist_json_any, 'JSON' => 0, 'JSON::PP' => 0, 'Cpanel::JSON::XS' => 0, @@ -223,12 +175,15 @@ my $dbic_reqs = { }, test_dt => { - req => $datetime_basic, + req => { + 'DateTime' => '0.55', + 'DateTime::Format::Strptime' => '1.2', + }, }, test_dt_sqlite => { + include => 'test_dt', req => { - %$datetime_basic, # t/36datetime.t # t/60core.t 'DateTime::Format::SQLite' => '0', @@ -236,8 +191,8 @@ my $dbic_reqs = { }, test_dt_mysql => { + include => 'test_dt', req => { - %$datetime_basic, # t/inflate/datetime_mysql.t # (doesn't need Mysql itself) 'DateTime::Format::MySQL' => '0', @@ -245,8 +200,8 @@ my $dbic_reqs = { }, test_dt_pg => { + include => 'test_dt', req => { - %$datetime_basic, # t/inflate/datetime_pg.t # (doesn't need PG itself) 'DateTime::Format::Pg' => '0.16004', @@ -254,9 +209,9 @@ my $dbic_reqs = { }, test_cdbicompat => { + include => 'test_dt', req => { 'Class::DBI::Plugin::DeepAbstractSearch' => '0', - %$datetime_basic, 'Time::Piece::MySQL' => '0', 'Date::Simple' => '3.03', }, @@ -266,7 +221,7 @@ my $dbic_reqs = { # is a core dep of DBIC for testing rdbms_sqlite => { req => { - %$rdbms_sqlite, + 'DBD::SQLite' => 0, }, pod => { title => 'SQLite support', @@ -277,7 +232,7 @@ my $dbic_reqs = { rdbms_pg => { req => { # when changing this list make sure to adjust xt/optional_deps.t - %$rdbms_pg, + 'DBD::Pg' => 0, }, pod => { title => 'PostgreSQL support', @@ -286,9 +241,7 @@ my $dbic_reqs = { }, rdbms_mssql_odbc => { - req => { - %$rdbms_mssql_odbc, - }, + include => '_rdbms_generic_odbc', pod => { title => 'MSSQL support via DBD::ODBC', desc => 'Modules required to connect to MSSQL via DBD::ODBC', @@ -297,7 +250,7 @@ my $dbic_reqs = { rdbms_mssql_sybase => { req => { - %$rdbms_mssql_sybase, + 'DBD::Sybase' => 0, }, pod => { title => 'MSSQL support via DBD::Sybase', @@ -306,9 +259,7 @@ my $dbic_reqs = { }, rdbms_mssql_ado => { - req => { - %$rdbms_mssql_ado, - }, + include => '_rdbms_generic_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', @@ -316,9 +267,7 @@ my $dbic_reqs = { }, rdbms_msaccess_odbc => { - req => { - %$rdbms_msaccess_odbc, - }, + include => '_rdbms_generic_odbc', pod => { title => 'MS Access support via DBD::ODBC', desc => 'Modules required to connect to MS Access via DBD::ODBC', @@ -326,9 +275,7 @@ my $dbic_reqs = { }, rdbms_msaccess_ado => { - req => { - %$rdbms_msaccess_ado, - }, + include => '_rdbms_generic_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', @@ -337,7 +284,7 @@ my $dbic_reqs = { rdbms_mysql => { req => { - %$rdbms_mysql, + 'DBD::mysql' => 0, }, pod => { title => 'MySQL support', @@ -346,8 +293,9 @@ my $dbic_reqs = { }, rdbms_oracle => { + include => 'id_shortener', req => { - %$rdbms_oracle, + 'DBD::Oracle' => 0, }, pod => { title => 'Oracle support', @@ -357,7 +305,7 @@ my $dbic_reqs = { rdbms_ase => { req => { - %$rdbms_ase, + 'DBD::Sybase' => 0, }, pod => { title => 'Sybase ASE support', @@ -367,7 +315,7 @@ my $dbic_reqs = { rdbms_db2 => { req => { - %$rdbms_db2, + 'DBD::DB2' => 0, }, pod => { title => 'DB2 support', @@ -376,9 +324,7 @@ my $dbic_reqs = { }, rdbms_db2_400 => { - req => { - %$rdbms_db2_400, - }, + include => '_rdbms_generic_odbc', pod => { title => 'DB2 on AS/400 support', desc => 'Modules required to connect to DB2 on AS/400', @@ -387,7 +333,7 @@ my $dbic_reqs = { rdbms_informix => { req => { - %$rdbms_informix, + 'DBD::Informix' => 0, }, pod => { title => 'Informix support', @@ -397,7 +343,7 @@ my $dbic_reqs = { rdbms_sqlanywhere => { req => { - %$rdbms_sqlanywhere, + 'DBD::SQLAnywhere' => 0, }, pod => { title => 'SQLAnywhere support', @@ -406,9 +352,7 @@ my $dbic_reqs = { }, rdbms_sqlanywhere_odbc => { - req => { - %$rdbms_sqlanywhere_odbc, - }, + include => '_rdbms_generic_odbc', pod => { title => 'SQLAnywhere support via DBD::ODBC', desc => 'Modules required to connect to SQLAnywhere via DBD::ODBC', @@ -417,7 +361,7 @@ my $dbic_reqs = { rdbms_firebird => { req => { - %$rdbms_firebird, + 'DBD::Firebird' => 0, }, pod => { title => 'Firebird support', @@ -427,7 +371,7 @@ my $dbic_reqs = { rdbms_firebird_interbase => { req => { - %$rdbms_firebird_interbase, + 'DBD::InterBase' => 0, }, pod => { title => 'Firebird support via DBD::InterBase', @@ -436,191 +380,211 @@ my $dbic_reqs = { }, rdbms_firebird_odbc => { - req => { - %$rdbms_firebird_odbc, - }, + include => '_rdbms_generic_odbc', pod => { title => 'Firebird support via DBD::ODBC', desc => 'Modules required to connect to Firebird via DBD::ODBC', }, }, - test_rdbms_pg => { + test_rdbms_sqlite => { + include => 'rdbms_sqlite', req => { - $ENV{DBICTEST_PG_DSN} - ? ( - # the order does matter because the rdbms support group might require - # a different version that the test group - # - # when changing this list make sure to adjust xt/optional_deps.t - %$rdbms_pg, - 'DBD::Pg' => '2.009002', - ) : () + ### + ### IMPORTANT - do not raise this dependency + ### even though many bugfixes are present in newer versions, the general DBIC + ### rule is to bend over backwards for available DBDs (given upgrading them is + ### often *not* easy or even possible) + ### + 'DBD::SQLite' => '1.29', }, }, - test_rdbms_mssql_odbc => { + test_rdbms_pg => { + include => 'rdbms_pg', + env => [ + DBICTEST_PG_DSN => 1, + DBICTEST_PG_USER => 0, + DBICTEST_PG_PASS => 0, + ], req => { - $ENV{DBICTEST_MSSQL_ODBC_DSN} - ? ( - %$rdbms_mssql_odbc, - ) : () + # the order does matter because the rdbms support group might require + # a different version that the test group + # + # when changing this list make sure to adjust xt/optional_deps.t + 'DBD::Pg' => '2.009002', # specific version to test bytea }, }, + test_rdbms_mssql_odbc => { + include => 'rdbms_mssql_odbc', + env => [ + DBICTEST_MSSQL_ODBC_DSN => 1, + DBICTEST_MSSQL_ODBC_USER => 0, + DBICTEST_MSSQL_ODBC_PASS => 0, + ], + }, + test_rdbms_mssql_ado => { - req => { - $ENV{DBICTEST_MSSQL_ADO_DSN} - ? ( - %$rdbms_mssql_ado, - ) : () - }, + include => 'rdbms_mssql_ado', + env => [ + DBICTEST_MSSQL_ADO_DSN => 1, + DBICTEST_MSSQL_ADO_USER => 0, + DBICTEST_MSSQL_ADO_PASS => 0, + ], }, test_rdbms_mssql_sybase => { - req => { - $ENV{DBICTEST_MSSQL_DSN} - ? ( - %$rdbms_mssql_sybase, - ) : () - }, + include => 'rdbms_mssql_sybase', + env => [ + DBICTEST_MSSQL_DSN => 1, + DBICTEST_MSSQL_USER => 0, + DBICTEST_MSSQL_PASS => 0, + ], }, test_rdbms_msaccess_odbc => { + include => 'rdbms_msaccess_odbc', + env => [ + DBICTEST_MSACCESS_ODBC_DSN => 1, + DBICTEST_MSACCESS_ODBC_USER => 0, + DBICTEST_MSACCESS_ODBC_PASS => 0, + ], req => { - $ENV{DBICTEST_MSACCESS_ODBC_DSN} - ? ( - %$rdbms_msaccess_odbc, - %$datetime_basic, - 'Data::GUID' => '0', - ) : () + 'Data::GUID' => '0', }, }, test_rdbms_msaccess_ado => { + include => 'rdbms_msaccess_ado', + env => [ + DBICTEST_MSACCESS_ADO_DSN => 1, + DBICTEST_MSACCESS_ADO_USER => 0, + DBICTEST_MSACCESS_ADO_PASS => 0, + ], req => { - $ENV{DBICTEST_MSACCESS_ADO_DSN} - ? ( - %$rdbms_msaccess_ado, - %$datetime_basic, - 'Data::GUID' => 0, - ) : () + 'Data::GUID' => 0, }, }, test_rdbms_mysql => { - req => { - $ENV{DBICTEST_MYSQL_DSN} - ? ( - %$rdbms_mysql, - ) : () - }, + include => 'rdbms_mysql', + env => [ + DBICTEST_MYSQL_DSN => 1, + DBICTEST_MYSQL_USER => 0, + DBICTEST_MYSQL_PASS => 0, + ], }, test_rdbms_oracle => { + include => 'rdbms_oracle', + env => [ + DBICTEST_ORA_DSN => 1, + DBICTEST_ORA_USER => 0, + DBICTEST_ORA_PASS => 0, + ], req => { - $ENV{DBICTEST_ORA_DSN} - ? ( - %$rdbms_oracle, - 'DateTime::Format::Oracle' => '0', - 'DBD::Oracle' => '1.24', - ) : () + 'DateTime::Format::Oracle' => '0', + 'DBD::Oracle' => '1.24', }, }, test_rdbms_ase => { - req => { - $ENV{DBICTEST_SYBASE_DSN} - ? ( - %$rdbms_ase, - ) : () - }, + include => 'rdbms_ase', + env => [ + DBICTEST_SYBASE_DSN => 1, + DBICTEST_SYBASE_USER => 0, + DBICTEST_SYBASE_PASS => 0, + ], }, test_rdbms_db2 => { - req => { - $ENV{DBICTEST_DB2_DSN} - ? ( - %$rdbms_db2, - ) : () - }, + include => 'rdbms_db2', + env => [ + DBICTEST_DB2_DSN => 1, + DBICTEST_DB2_USER => 0, + DBICTEST_DB2_PASS => 0, + ], }, test_rdbms_db2_400 => { - req => { - $ENV{DBICTEST_DB2_400_DSN} - ? ( - %$rdbms_db2_400, - ) : () - }, + include => 'rdbms_db2_400', + env => [ + DBICTEST_DB2_400_DSN => 1, + DBICTEST_DB2_400_USER => 0, + DBICTEST_DB2_400_PASS => 0, + ], }, test_rdbms_informix => { - req => { - $ENV{DBICTEST_INFORMIX_DSN} - ? ( - %$rdbms_informix, - ) : () - }, + include => 'rdbms_informix', + env => [ + DBICTEST_INFORMIX_DSN => 1, + DBICTEST_INFORMIX_USER => 0, + DBICTEST_INFORMIX_PASS => 0, + ], }, test_rdbms_sqlanywhere => { - req => { - $ENV{DBICTEST_SQLANYWHERE_DSN} - ? ( - %$rdbms_sqlanywhere, - ) : () - }, + include => 'rdbms_sqlanywhere', + env => [ + DBICTEST_SQLANYWHERE_DSN => 1, + DBICTEST_SQLANYWHERE_USER => 0, + DBICTEST_SQLANYWHERE_PASS => 0, + ], }, test_rdbms_sqlanywhere_odbc => { - req => { - $ENV{DBICTEST_SQLANYWHERE_ODBC_DSN} - ? ( - %$rdbms_sqlanywhere_odbc, - ) : () - }, + include => 'rdbms_sqlanywhere_odbc', + env => [ + DBICTEST_SQLANYWHERE_ODBC_DSN => 1, + DBICTEST_SQLANYWHERE_ODBC_USER => 0, + DBICTEST_SQLANYWHERE_ODBC_PASS => 0, + ], }, test_rdbms_firebird => { - req => { - $ENV{DBICTEST_FIREBIRD_DSN} - ? ( - %$rdbms_firebird, - ) : () - }, + include => 'rdbms_firebird', + env => [ + DBICTEST_FIREBIRD_DSN => 1, + DBICTEST_FIREBIRD_USER => 0, + DBICTEST_FIREBIRD_PASS => 0, + ], }, test_rdbms_firebird_interbase => { - req => { - $ENV{DBICTEST_FIREBIRD_INTERBASE_DSN} - ? ( - %$rdbms_firebird_interbase, - ) : () - }, + include => 'rdbms_firebird_interbase', + env => [ + DBICTEST_FIREBIRD_INTERBASE_DSN => 1, + DBICTEST_FIREBIRD_INTERBASE_USER => 0, + DBICTEST_FIREBIRD_INTERBASE_PASS => 0, + ], }, test_rdbms_firebird_odbc => { - req => { - $ENV{DBICTEST_FIREBIRD_ODBC_DSN} - ? ( - %$rdbms_firebird_odbc, - ) : () - }, + include => 'rdbms_firebird_odbc', + env => [ + DBICTEST_FIREBIRD_ODBC_DSN => 1, + DBICTEST_FIREBIRD_ODBC_USER => 0, + DBICTEST_FIREBIRD_ODBC_PASS => 0, + ], }, test_memcached => { + env => [ + DBICTEST_MEMCACHED => 1, + ], req => { - $ENV{DBICTEST_MEMCACHED} - ? ( - 'Cache::Memcached' => 0, - ) : () + 'Cache::Memcached' => 0, }, }, dist_dir => { + # we need to run the dbicadmin so we can self-generate its POD + # also we do not want surprises in case JSON::XS is in the path + # so make sure we get an always-working JSON::Any + include => [qw( admin_script _json_xs_compatible_json_any )], req => { - %$test_and_dist_json_any, 'ExtUtils::MakeMaker' => '6.64', 'Pod::Inherit' => '0.91', }, @@ -631,66 +595,174 @@ my $dbic_reqs = { 'CPAN::Uploader' => '0.103001', }, }, - }; ### Public API +sub import { + my $class = shift; + + if (@_) { + + my $action = shift; + + if ($action eq '-die_without') { + my $err; + { + local $@; + eval { $class->die_unless_req_ok_for(\@_); 1 } + or $err = $@; + } + die "\n$err\n" if $err; + } + elsif ($action eq '-list_missing') { + print $class->modreq_missing_for(\@_); + print "\n"; + exit 0; + } + elsif ($action eq '-skip_all_without') { + + # sanity check - make sure ->current_test is 0 and no plan has been declared + do { + local $@; + defined eval { + Test::Builder->new->current_test + or + Test::Builder->new->has_plan + }; + } and croak("Unable to invoke -skip_all_without after testing has started"); + + if ( my $missing = $class->req_missing_for(\@_) ) { + + die ("\nMandatory requirements not satisfied during release-testing: $missing\n\n") + if $ENV{RELEASE_TESTING} and $class->_groups_to_reqs(\@_)->{release_testing_mandatory}; + + print "1..0 # SKIP requirements not satisfied: $missing\n"; + exit 0; + } + } + elsif ($action =~ /^-/) { + croak "Unknown import-time action '$action'"; + } + else { + croak "$class is not an exporter, unable to import '$action'"; + } + } + + 1; +} + +sub unimport { + croak( __PACKAGE__ . " does not implement unimport" ); +} + # OO for (mistakenly considered) ease of extensibility, not due to any need to # carry state of any sort. This API is currently used outside, so leave as-is. # FIXME - make sure to not propagate this further if module is extracted as a # standalone library - keep the stupidity to a DBIC-secific shim! # sub req_list_for { - shift->_groups_to_reqs(@_)->{modreqs}; + shift->_groups_to_reqs(shift)->{effective_modreqs}; +} + +sub modreq_list_for { + shift->_groups_to_reqs(shift)->{modreqs}; } sub req_group_list { +{ map { $_ => $_[0]->_groups_to_reqs($_) } - keys %$dbic_reqs + grep { $_ !~ /^_/ } keys %$dbic_reqs } } -sub req_errorlist_for { - my $self = shift; - $self->_errorlist_for_modreqs( $self->_groups_to_reqs(@_)->{modreqs} ); +sub req_errorlist_for { shift->modreq_errorlist_for(shift) } # deprecated +sub modreq_errorlist_for { + my ($self, $groups) = @_; + $self->_errorlist_for_modreqs( $self->_groups_to_reqs($groups)->{modreqs} ); } sub req_ok_for { - my $self = shift; - $self->_errorlist_for_modreqs( $self->_groups_to_reqs(@_)->{modreqs} ) - ? 0 - : 1 - ; + shift->req_missing_for(shift) ? 0 : 1; } sub req_missing_for { - my $self = shift; + my ($self, $groups) = @_; - my $reqs = $self->_groups_to_reqs(@_); - my $modreq_errors = $self->_errorlist_for_modreqs($reqs->{modreqs}) or return ''; + my $reqs = $self->_groups_to_reqs($groups); + my $mods_missing = $self->modreq_missing_for($groups); - join ' ', - (map { $reqs->{modreqs}{$_} ? qq("$_~>=$reqs->{modreqs}{$_}") : $_ } sort keys %$modreq_errors), - ( $reqs->{modreqs_fully_documented} ? "(see @{[ ref $self || $self ]} documentation for details)" : () ), + return '' if + ! $mods_missing + and + ! $reqs->{missing_envvars} + ; + + my @res = $mods_missing || (); + + push @res, 'the following group(s) of environment variables: ' . join ' and ', sort map + { __envvar_group_desc($_) } + @{$reqs->{missing_envvars}} + if $reqs->{missing_envvars}; + + return ( + ( join ' as well as ', @res ) + . + ( $reqs->{modreqs_fully_documented} ? " (see @{[ ref $self || $self ]} documentation for details)" : '' ), + ); +} + +sub modreq_missing_for { + my ($self, $groups) = @_; + + my $reqs = $self->_groups_to_reqs($groups); + my $modreq_errors = $self->_errorlist_for_modreqs($reqs->{modreqs}) + or return ''; + + join ' ', map + { $reqs->{modreqs}{$_} ? qq("$_~>=$reqs->{modreqs}{$_}") : $_ } + sort { lc($a) cmp lc($b) } keys %$modreq_errors ; } sub die_unless_req_ok_for { - if (my $err = shift->req_missing_for(@_) ) { - die "Required modules missing, unable to continue: $err\n"; + if (my $err = shift->req_missing_for(shift) ) { + die "Unable to continue due to missing requirements: $err\n"; } } +### Private functions + +# potentially shorten group desc +sub __envvar_group_desc { + my @envs = @{$_[0]}; + + my (@res, $last_prefix); + while (my $ev = shift @envs) { + my ($pref, $sep, $suff) = split / ([\_\-]) (?= [^\_\-]+ \z )/x, $ev; + + if ( defined $sep and ($last_prefix||'') eq $pref ) { + push @res, "...${sep}${suff}" + } + else { + push @res, $ev; + } + + $last_prefix = $pref if $sep; + } + + join '/', @res; +} + ### Private OO API our %req_unavailability_cache; -# this method is just a lister/metadata checker - it does not try to load anything +# this method is just a lister and envvar/metadata checker - it does not try to load anything +my $processed_groups = {}; sub _groups_to_reqs { my ($self, $groups) = @_; @@ -705,14 +777,14 @@ sub _groups_to_reqs { modreqs_fully_documented => 1, }; + for my $group ( grep { ! $processed_groups->{$_} } @$groups ) { - for my $group ( @$groups ) { - - $group =~ /\A [A-Za-z][0-9A-Z_a-z]* \z/x + $group =~ /\A [A-Z_a-z][0-9A-Z_a-z]* \z/x or croak "Invalid requirement group name '$group': only ascii alphanumerics and _ are allowed"; - my $group_reqs = ($dbic_reqs->{$group}||{})->{req} - or croak "Requirement group '$group' is not defined"; + croak "Requirement group '$group' is not defined" unless defined $dbic_reqs->{$group}; + + my $group_reqs = $dbic_reqs->{$group}{req}; # sanity-check for (keys %$group_reqs) { @@ -726,20 +798,84 @@ sub _groups_to_reqs { if ( ($group_reqs->{$_}||0) !~ / \A [0-9]+ (?: \. [0-9]+ )? \z /x ); } - # assemble into the final ret - for (keys %$group_reqs) { + # check if we have all required envvars if such names are defined + my ($some_envs_required, $some_envs_missing); + if (my @e = @{$dbic_reqs->{$group}{env} || [] }) { - $ret->{modreqs}{$_} = $group_reqs->{$_}||0 if ( + croak "Unexpected 'env' attribute under group '$group' (only allowed in test_* groups)" + unless $group =~ /^test_/; - ! exists $ret->{modreqs}{$_} - or - # we sanitized the version to be numeric above - we can just -gt it - ($group_reqs->{$_}||0) > $ret->{modreqs}{$_} + croak "Unexpected *odd* list in 'env' under group '$group'" + if @e % 2; - ); + my @group_envnames_list; + + # deconstruct the whole thing + while (@e) { + push @group_envnames_list, my $envname = shift @e; + + # env required or not + next unless shift @e; + + $some_envs_required ||= 1; + + $some_envs_missing ||= ( + ! defined $ENV{$envname} + or + ! length $ENV{$envname} + ); + } + + croak "None of the envvars in group '$group' declared as required, making the requirement moot" + unless $some_envs_required; + + push @{$ret->{missing_envvars}}, \@group_envnames_list if $some_envs_missing; } + # get the reqs for includes if any + my $inc_reqs; + if (my $incs = $dbic_reqs->{$group}{include}) { + $incs = [ $incs ] unless ref $incs eq 'ARRAY'; + + croak "Malformed 'include' for group '$group': must be another existing group name or arrayref of existing group names" + unless @$incs; + + local $processed_groups->{$group} = 1; + + my $subreqs = $self->_groups_to_reqs($incs); + + croak "Includes with variable effective_modreqs not yet supported" + if $subreqs->{effective_modreqs_differ}; + + $inc_reqs = $subreqs->{modreqs}; + + } + + # assemble into the final ret + for my $type ( + 'modreqs', + $some_envs_missing ? () : 'effective_modreqs' + ) { + for my $req_bag ($group_reqs, $inc_reqs||()) { + for my $mod (keys %$req_bag) { + + $ret->{$type}{$mod} = $req_bag->{$mod}||0 if ( + + ! exists $ret->{$type}{$mod} + or + # we sanitized the version to be numeric above - we can just -gt it + ($req_bag->{$mod}||0) > $ret->{$type}{$mod} + + ); + } + } + } + + $ret->{effective_modreqs_differ} ||= !!$some_envs_missing; + $ret->{modreqs_fully_documented} &&= !!$dbic_reqs->{$group}{pod}; + + $ret->{release_testing_mandatory} ||= !!$dbic_reqs->{$group}{release_testing_mandatory}; } return $ret; @@ -888,8 +1024,12 @@ authors alike. Dependencies are organized in L where each group can list one or more required modules, with an optional minimum version -(or 0 for any version). Each group name (or a combination thereof) can be used -in the L as described below. +(or 0 for any version). In addition groups prefixed with C can specify +a set of environment variables, some (or all) of which are marked as required +for the group to be considered by L + +Each group name (or a combination thereof) can be used in the +L as described below. EOC @@ -902,8 +1042,7 @@ EOC my $p = $dbic_reqs->{$group}{pod} or next; - my $modlist = $dbic_reqs->{$group}{req} - or next; + my $modlist = $class->modreq_list_for($group); next unless keys %$modlist; @@ -923,6 +1062,70 @@ EOC #@@ push @chunks, <<'EOC'; +=head1 IMPORT-LIKE ACTIONS + +Even though this module is not an L, it recognizes several C +supplied to its C method. + +=head2 -skip_all_without + +=over + +=item Arguments: @group_names + +=back + +A convenience wrapper for use during testing: +EOC + + push @chunks, " use $class -skip_all_without => qw(admin test_rdbms_mysql);"; + + push @chunks, 'Roughly equivalent to the following code:'; + + push @chunks, sprintf <<'EOS', ($class) x 2; + + BEGIN { + require %s; + if ( my $missing = %s->req_missing_for(\@group_names_) ) { + print "1..0 # SKIP requirements not satisfied: $missing\n"; + exit 0; + } + } +EOS + + push @chunks, <<'EOC'; + +It also takes into account the C environment variable and +behaves like L for any requirement groups marked as +C. + +=head2 -die_without + +=over + +=item Arguments: @group_names + +=back + +A convenience wrapper around L: +EOC + + push @chunks, " use $class -die_without => qw(deploy admin);"; + + push @chunks, <<'EOC'; + +=head2 -list_missing + +=over + +=item Arguments: @group_names + +=back + +A convenience wrapper around L: + + perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,deploy,admin | cpanm + =head1 METHODS =head2 req_group_list @@ -954,7 +1157,29 @@ maintainers, instead of treating this as public (left alone stable) API. This method should be used by DBIx::Class extension authors, to determine the version of modules a specific set of features requires for this version of -DBIx::Class. See the L for a real-world example. +DBIx::Class (regardless of their availability on the system). +See the L for a real-world example. + +When handling C groups this method behaves B from +L below (and is the only such inconsistency among the +C methods). If a particular group declares as requirements some +C and these requirements are not satisfied (the envvars +are unset) - then the C of this group are not included in +the returned list. + +=head2 modreq_list_for + +=over + +=item Arguments: $group_name | \@group_names + +=item Return Value: \%set_of_module_version_pairs + +=back + +Same as L but does not take into consideration any +C - returns just the list of required +modules. =head2 req_ok_for @@ -966,8 +1191,8 @@ DBIx::Class. See the L for a real-world example. =back -Returns true or false depending on whether all modules required by -the group(s) are present on the system and loadable. +Returns true or false depending on whether all modules/envvars required by +the group(s) are loadable/set on the system. =head2 req_missing_for @@ -980,9 +1205,9 @@ the group(s) are present on the system and loadable. =back Returns a single-line string suitable for inclusion in larger error messages. -This method would normally be used by DBIx::Class core-modules, to indicate to -the user that they need to install specific modules before being able to use a -specific feature set. +This method would normally be used by DBIx::Class core features, to indicate to +the user that they need to install specific modules and/or set specific +environment variables before being able to use a specific feature set. For example if some of the requirements for C are not available, the returned string could look like: @@ -992,7 +1217,32 @@ EOC push @chunks, <<'EOC'; The author is expected to prepend the necessary text to this message before -returning the actual error seen by the user. +returning the actual error seen by the user. See also L + +=head2 modreq_missing_for + +=over + +=item Arguments: $group_name | \@group_names + +=item Return Value: $error_message_string + +=back + +Same as L except that the error string is guaranteed to be +either empty, or contain a set of module requirement specifications suitable +for piping to e.g. L. The method explicitly does not +attempt to validate the state of required environment variables (if any). + +For instance if some of the requirements for C are not available, +the returned string could look like: +EOC + + push @chunks, qq{ "SQL::Translator~>=$sqltver"}; + + push @chunks, <<'EOC'; + +See also L. =head2 die_unless_req_ok_for @@ -1004,9 +1254,9 @@ returning the actual error seen by the user. Checks if L passes for the supplied group(s), and in case of failure throws an exception including the information -from L. +from L. See also L. -=head2 req_errorlist_for +=head2 modreq_errorlist_for =over @@ -1018,8 +1268,12 @@ from L. Returns a hashref containing the actual errors that occurred while attempting to load each module in the requirement group(s). -EOC +=head2 req_errorlist_for + +Deprecated method name, equivalent (via proxy) to L. + +EOC #@@ #@@ FOOTER