Switch Admin/dbicadmin to Opt::Deps

diff --git a/lib/DBIx/Class/Admin.pm b/lib/DBIx/Class/Admin.pm
index 8814bf7..e47e93b 100644 (file)
--- a/lib/DBIx/Class/Admin.pm
+++ b/lib/DBIx/Class/Admin.pm
@@ -2,28 +2,14 @@ package DBIx::Class::Admin;
 
 # check deps
 BEGIN {
-    my @_deps = qw(
-        Moose MooseX::Types MooseX::Types::JSON MooseX::Types::Path::Class
-        Try::Tiny parent JSON::Any Class::C3::Componentised
-        namespace::autoclean
-    );
-
-    my @_missing_deps;
-    foreach my $dep (@_deps) {
-      eval "require $dep";
-      if ($@) {
-        push @_missing_deps, $dep;
-      }
-    }
-
-    if (@_missing_deps > 0) {
-      die "The following dependecies are missing " . join ",", @_missing_deps;
-    }
+  use Carp::Clan qw/^DBIx::Class/;
+  use DBIx::Class;
+  croak('The following modules are required for DBIx::Class::Admin ' . DBIx::Class::Optional::Dependencies->req_missing_for ('admin') )
+    unless DBIx::Class::Optional::Dependencies->req_ok_for ('admin');
 }
 
 use Moose;
 use parent 'DBIx::Class::Schema';
-use Carp::Clan qw/^DBIx::Class/;
 
 use MooseX::Types::Moose qw/Int Str Any Bool/;
 use DBIx::Class::Admin::Types qw/DBICConnectInfo DBICHashRef/;
@@ -72,31 +58,10 @@ DBIx::Class::Admin - Administration object for schemas
 
 =head1 REQUIREMENTS
 
-The following CPAN modules are required to use C<dbicadmin> and this module:
-
-L<Moose>
-
-L<MooseX::Types>
-
-L<MooseX::Types::JSON>
-
-L<MooseX::Types::Path::Class>
-
-L<Try::Tiny>
-
-L<parent>
-
-L<JSON::Any>
-
-(L<JSON::DWIW> preferred for barekey support)
-
-L<namespace::autoclean>
-
-L<Getopt::Long::Descriptive>
-
-L<Text::CSV>
+The Admin interface has additional requirements not currently part of
+L<DBIx::Class>. See L<DBIx::Class::Optional::Dependencies> for more details.
 
-=head1 Attributes
+=head1 ATTRIBUTES
 
 =head2 schema_class
 

diff --git a/lib/DBIx/Class/Optional/Dependencies.pm b/lib/DBIx/Class/Optional/Dependencies.pm
index 99ae149..adc26f9 100644 (file)
--- a/lib/DBIx/Class/Optional/Dependencies.pm
+++ b/lib/DBIx/Class/Optional/Dependencies.pm
@@ -51,7 +51,7 @@ my $reqs = {
     },
   },
 
-  dbicadmin => {
+  admin_script => {
     req => {
       %$moose_basic,
       %$admin_basic,

diff --git a/script/dbicadmin b/script/dbicadmin
index c50c50b..2b6a456 100755 (executable)
--- a/script/dbicadmin
+++ b/script/dbicadmin
@@ -3,6 +3,13 @@
 use strict;
 use warnings;
 
+BEGIN {
+  use DBIx::Class;
+  die (  "The following modules are required for the dbicadmin utility\n"
+       . DBIx::Class::Optional::Dependencies->req_missing_for ('admin_script')
+  ) unless DBIx::Class::Optional::Dependencies->req_ok_for ('admin_script');
+}
+
 use Getopt::Long::Descriptive;
 use DBIx::Class::Admin;
 
@@ -77,15 +84,12 @@ if ($action eq 'select') {
   }
 }
 
-
-
 =head1 AUTHOR
 
-Aran Deltac <bluefeet@cpan.org>
-
-refactored by
-Gordon Irving <goraxe@cpan.org>
+See L<DBIx::Class/CONTRIBUTORS>.
 
 =head1 LICENSE
 
-You may distribute this code under the same terms as Perl itself.
+You may distribute this code under the same terms as Perl itself
+
+=cut

diff --git a/t/admin/10script.t b/t/admin/10script.t
index d8ccbfc..7718b34 100644 (file)
--- a/t/admin/10script.t
+++ b/t/admin/10script.t
@@ -11,8 +11,8 @@ use DBICTest;
 
 BEGIN {
     require DBIx::Class;
-    plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('dbicadmin')
-      unless DBIx::Class::Optional::Dependencies->req_ok_for('dbicadmin');
+    plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missing_for('admin_script')
+      unless DBIx::Class::Optional::Dependencies->req_ok_for('admin_script');
 }
 
 my @json_backends = qw/XS JSON DWIW/;