From: Rafael Kitover Date: Fri, 23 Jul 2010 09:56:05 +0000 (-0400) Subject: use Optional::Dependencies stole from DBIx::Class for use_moose option X-Git-Tag: 0.07001~4 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ef8e9c69e6f9d83c449a786eefc7413b3147b0ec;p=dbsrgits%2FDBIx-Class-Schema-Loader.git use Optional::Dependencies stole from DBIx::Class for use_moose option --- diff --git a/Makefile.PL b/Makefile.PL index c5c38a2..9ab25fc 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,5 +1,12 @@ use inc::Module::Install 0.91; +require Module::Install::ReadmeFromPod; + +use 5.008001; + +use FindBin; +use lib "$FindBin::Bin/lib"; + name 'DBIx-Class-Schema-Loader'; all_from 'lib/DBIx/Class/Schema/Loader.pm'; @@ -29,22 +36,28 @@ requires 'Class::Unload' => 0; requires 'File::Slurp' => '9999.13'; requires 'List::MoreUtils' => 0; requires 'namespace::clean' => 0; -requires 'Data::Dumper::Concise' => '1.200'; +requires 'Data::Dumper::Concise' => '2.002'; requires 'Scope::Guard' => 0; requires 'List::MoreUtils' => 0; requires 'Exporter' => '5.63'; requires 'Try::Tiny' => 0; -install_script 'script/dbicdump'; +if ($Module::Install::AUTHOR) { + warn "\n*** AUTHOR MODE: some optional dependencies converted to hard dependencies.\n\n"; -tests_recursive; + require DBIx::Class::Schema::Loader::Optional::Dependencies; -# Rebuild README for maintainers -if ($Module::Install::AUTHOR) { - system("pod2text lib/DBIx/Class/Schema/Loader.pm > README"); + test_requires map %$_, values %{ DBIx::Class::Schema::Loader::Optional::Dependencies->req_group_list }; + + DBIx::Class::Schema::Loader::Optional::Dependencies->_gen_pod; } -realclean_files 'README'; +tests_recursive; + +install_script 'script/dbicdump'; + +readme_from 'lib/DBIx/Class/Schema/Loader.pm'; +realclean_files qw[README MANIFEST lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pod]; resources 'IRC' => 'irc://irc.perl.org/#dbix-class'; resources 'license' => 'http://dev.perl.org/licenses/'; @@ -54,3 +67,5 @@ resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/db auto_provides; auto_install; WriteAll; + +# vim:et sts=4 sw=4 tw=0: diff --git a/lib/DBIx/Class/Schema/Loader/Base.pm b/lib/DBIx/Class/Schema/Loader/Base.pm index 35f9495..949f6b1 100644 --- a/lib/DBIx/Class/Schema/Loader/Base.pm +++ b/lib/DBIx/Class/Schema/Loader/Base.pm @@ -20,8 +20,9 @@ use Data::Dumper::Concise; use Scalar::Util 'looks_like_number'; use File::Slurp 'slurp'; use DBIx::Class::Schema::Loader::Utils 'split_name'; +use DBIx::Class::Schema::Loader::Optional::Dependencies (); use Try::Tiny; -require DBIx::Class; +use DBIx::Class (); use namespace::clean; our $VERSION = '0.07001'; @@ -545,14 +546,10 @@ sub new { $self->_validate_class_args; if ($self->use_moose) { - eval <<'EOF'; -require Moose; -require MooseX::NonMoose; -require namespace::autoclean; -EOF - if ($@) { - die sprintf "You must install the following CPAN modules to enable the use_moose option: %s.\n", - "Moose, MooseX::NonMoose and namespace::autoclean"; + if (not DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose')) { + die sprintf "You must install the following CPAN modules to enable the use_moose option: %s.\nYou are missing: %s.\n", + "Moose, MooseX::NonMoose and namespace::autoclean", + DBIx::Class::Schema::Loader::Optional::Dependencies->req_missing_for('use_moose'); } } diff --git a/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pm b/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pm new file mode 100644 index 0000000..2acfbc7 --- /dev/null +++ b/lib/DBIx/Class/Schema/Loader/Optional/Dependencies.pm @@ -0,0 +1,287 @@ +package DBIx::Class::Schema::Loader::Optional::Dependencies; + +use warnings; +use strict; + +use Carp; + +# Stolen from DBIx::Class + +# 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 + +# POD is generated automatically by calling _gen_pod from the +# Makefile.PL in $AUTHOR mode + +my $reqs = { + dist => { + #'Module::Install::Pod::Inherit' => '0.01', + }, + + use_moose => { + req => { + 'Moose' => 0, + 'MooseX::NonMoose' => 0, + 'namespace::autoclean' => 0, + }, + pod => { + title => 'use_moose', + desc => 'Modules required for the use_moose option', + }, + }, +}; + +sub req_list_for { + my ($class, $group) = @_; + + croak "req_list_for() expects a requirement group name" + unless $group; + + my $deps = $reqs->{$group}{req} + or croak "Requirement group '$group' does not exist"; + + return { %$deps }; +} + + +our %req_availability_cache; +sub req_ok_for { + my ($class, $group) = @_; + + 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}; +} + +sub req_missing_for { + my ($class, $group) = @_; + + 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}; +} + +sub req_errorlist_for { + my ($class, $group) = @_; + + 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}; +} + +sub _check_deps { + my ($class, $group) = @_; + + my $deps = $class->req_list_for ($group); + + my %errors; + for my $mod (keys %$deps) { + if (my $ver = $deps->{$mod}) { + eval "use $mod $ver ()"; + } + else { + eval "require $mod"; + } + + $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 => '', + }; + } +} + +sub req_group_list { + return { map { $_ => { %{ $reqs->{$_}{req} || {} } } } (keys %$reqs) }; +} + +# 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 $podfn = __FILE__; + $podfn =~ s/\.pm$/\.pod/; + + my $distver = + eval { require DBIx::Class::Schema::Loader; DBIx::Class::Schema::Loader->VERSION; } + || + do { + warn +"\n\n---------------------------------------------------------------------\n" . +'Unable to load the DBIx::Class::Schema::Loader module to determine current ' . +'version, possibly due to missing dependencies. Author-mode autodocumentation ' . +"halted\n\n" . $@ . +"\n\n---------------------------------------------------------------------\n" + ; + '*UNKNOWN*'; # rv + } + ; + + my @chunks = ( + <<"EOC", +######################################################################### +##################### A U T O G E N E R A T E D ######################## +######################################################################### +# +# The contents of this POD file are auto-generated. Any changes you make +# will be lost. If you need to change the generated text edit _gen_pod() +# at the end of $modfn +# +EOC + '=head1 NAME', + "$class - Optional module dependency specifications (for module authors)", + '=head1 SYNOPSIS', + <'s Makefile.PL): + + ... + + configure_requires 'DBIx::Class::Schema::Loader' => '$distver'; + + require $class; + + my \$use_moose_deps = $class->req_list_for ('use_moose'); + + for (keys %\$use_moose_deps) { + requires \$_ => \$use_moose_deps->{\$_}; + } + + ... + +Note that there are some caveats regarding C, more info +can be found at L +EOS + '=head1 DESCRIPTION', + <<'EOD', +Some of the features of L have external +module dependencies on their own. In order not to burden the average user +with modules he will never use, these optional dependencies are not included +in the base Makefile.PL. Instead an exception with a descriptive message is +thrown when a specific feature is missing one or several modules required for +its operation. This module is the central holding place for the current list +of such dependencies. +EOD + '=head1 CURRENT REQUIREMENT GROUPS', + <<'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). +EOD + ); + + for my $group (sort keys %$reqs) { + my $p = $reqs->{$group}{pod} + or next; + + my $modlist = $reqs->{$group}{req} + or next; + + next unless keys %$modlist; + + push @chunks, ( + "=head2 $p->{title}", + "$p->{desc}", + '=over', + ( map { "=item * $_" . ($modlist->{$_} ? " >= $modlist->{$_}" : '') } (sort keys %$modlist) ), + '=back', + "Requirement group: B<$group>", + ); + } + + push @chunks, ( + '=head1 METHODS', + '=head2 req_group_list', + '=over', + '=item Arguments: $none', + '=item Returns: \%list_of_requirement_groups', + '=back', + < version of +L. See the L for a real-world +example. +EOD + + '=head2 req_ok_for', + '=over', + '=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', + + '=head2 req_missing_for', + '=over', + '=item Arguments: $group_name', + '=item Returns: $error_message_string', + '=back', + < +maintainers, to indicate to the user that he needs to install specific modules +before he will be able to use a specific feature. + +For example if some of the requirements for C are not available, +the returned string could look like: + + Moose >= 0 (see use_moose for details) + +The author is expected to prepend the necessary text to this message before +returning the actual error seen by the user. +EOD + + '=head2 req_errorlist_for', + '=over', + '=item Arguments: $group_name', + '=item Returns: \%list_of_loaderrors_per_module', + '=back', + <<'EOD', +Returns a hashref containing the actual errors that occured 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', + ); + + open (my $fh, '>', $podfn) or croak "Unable to write to $podfn: $!"; + print $fh join ("\n\n", @chunks); + close ($fh); +} + +1; diff --git a/t/20invocations.t b/t/20invocations.t index fe52379..b8a6ef5 100644 --- a/t/20invocations.t +++ b/t/20invocations.t @@ -1,5 +1,6 @@ use strict; use Test::More; +use DBIx::Class::Schema::Loader::Optional::Dependencies; use lib qw(t/lib); use make_dbictest_db; @@ -124,15 +125,18 @@ my @invocations = ( ); DBICTest::Schema::14->clone; }, - 'moose' => sub { - package DBICTest::Schema::8; - use base qw/ DBIx::Class::Schema::Loader /; - __PACKAGE__->naming('current'); - __PACKAGE__->connect( - $make_dbictest_db::dsn, - { loader_options => { use_moose => 1 } } - ); - }, + (DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose') ? + ('moose' => sub { + package DBICTest::Schema::8; + use base qw/ DBIx::Class::Schema::Loader /; + __PACKAGE__->naming('current'); + __PACKAGE__->connect( + $make_dbictest_db::dsn, + { loader_options => { use_moose => 1 } } + ); + }) + : () + ), ); # 4 tests per k/v pair diff --git a/t/23dumpmore.t b/t/23dumpmore.t index f824cd9..8f48199 100644 --- a/t/23dumpmore.t +++ b/t/23dumpmore.t @@ -4,6 +4,7 @@ use File::Path; use IPC::Open3; use Data::Dumper::Concise; use DBIx::Class::Schema::Loader (); +use DBIx::Class::Schema::Loader::Optional::Dependencies (); use File::Temp 'tempfile'; use lib qw(t/lib); @@ -232,8 +233,7 @@ unlink $config_file; rmtree($DUMP_PATH, 1, 1); -eval "use Moose; use MooseX::NonMoose; use namespace::autoclean;"; -if (not $@) { +if (DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose')) { # first dump a fresh use_moose=1 schema diff --git a/t/lib/dbixcsl_common_tests.pm b/t/lib/dbixcsl_common_tests.pm index 22dc59d..3b951ba 100644 --- a/t/lib/dbixcsl_common_tests.pm +++ b/t/lib/dbixcsl_common_tests.pm @@ -14,6 +14,8 @@ use File::Find 'find'; use Class::Unload (); use Data::Dumper::Concise; use List::MoreUtils 'apply'; +use DBIx::Class::Schema::Loader::Optional::Dependencies (); +use namespace::clean; my $DUMP_DIR = './t/_common_dump'; rmtree $DUMP_DIR; @@ -180,12 +182,7 @@ sub setup_schema { my $debug = ($self->{verbose} > 1) ? 1 : 0; - eval <<'EOF'; -require Moose; -require MooseX::NonMoose; -require namespace::autoclean; -EOF - my $use_moose = $@ ? 0 : 1; + my $use_moose = DBIx::Class::Schema::Loader::Optional::Dependencies->req_ok_for('use_moose'); my %loader_opts = ( constraint =>