[Bast-commits] r8687 - in DBIx-Class/0.08/branches/dbicadmin_refactor: lib/DBIx/Class lib/DBIx/Class/Optional script t/admin

[ribasushi at dev.catalyst.perl.org]

Author: ribasushi
Date: 2010-02-13 13:32:50 +0000 (Sat, 13 Feb 2010)
New Revision: 8687

Modified:
   DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Admin.pm
   DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm
   DBIx-Class/0.08/branches/dbicadmin_refactor/script/dbicadmin
   DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/10script.t
Log:
Switch Admin/dbicadmin to Opt::Deps

Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Admin.pm
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Admin.pm	2010-02-13 12:43:22 UTC (rev 8686)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Admin.pm	2010-02-13 13:32:50 UTC (rev 8687)
@@ -2,28 +2,14 @@
 
 # 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,32 +58,11 @@
 
 =head1 REQUIREMENTS
 
-The following CPAN modules are required to use C<dbicadmin> and this module:
+The Admin interface has additional requirements not currently part of
+L<DBIx::Class>. See L<DBIx::Class::Optional::Dependencies> for more details.
 
-L<Moose>
+=head1 ATTRIBUTES
 
-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>
-
-=head1 Attributes
-
 =head2 schema_class
 
 the class of the schema to load

Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm	2010-02-13 12:43:22 UTC (rev 8686)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/lib/DBIx/Class/Optional/Dependencies.pm	2010-02-13 13:32:50 UTC (rev 8687)
@@ -51,7 +51,7 @@
     },
   },
 
-  dbicadmin => {
+  admin_script => {
     req => {
       %$moose_basic,
       %$admin_basic,

Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/script/dbicadmin
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/script/dbicadmin	2010-02-13 12:43:22 UTC (rev 8686)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/script/dbicadmin	2010-02-13 13:32:50 UTC (rev 8687)
@@ -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 @@
   }
 }
 
-
-
 =head1 AUTHOR
 
-Aran Deltac <bluefeet at cpan.org>
+See L<DBIx::Class/CONTRIBUTORS>.
 
-refactored by
-Gordon Irving <goraxe at cpan.org>
-
 =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

Modified: DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/10script.t
===================================================================
--- DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/10script.t	2010-02-13 12:43:22 UTC (rev 8686)
+++ DBIx-Class/0.08/branches/dbicadmin_refactor/t/admin/10script.t	2010-02-13 13:32:50 UTC (rev 8687)
@@ -11,8 +11,8 @@
 
 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/;