[Catalyst-commits] r12783 - in Catalyst-Helper-AuthDBIC/trunk: . lib/Catalyst/Helper t

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2010-01-31 11:51:13 +0000 (Sun, 31 Jan 2010)
New Revision: 12783

Modified:
   Catalyst-Helper-AuthDBIC/trunk/Changes
   Catalyst-Helper-AuthDBIC/trunk/Makefile.PL
   Catalyst-Helper-AuthDBIC/trunk/lib/Catalyst/Helper/AuthDBIC.pm
   Catalyst-Helper-AuthDBIC/trunk/t/live-test.t
Log:
Fix up AuthDBIC

Modified: Catalyst-Helper-AuthDBIC/trunk/Changes
===================================================================
--- Catalyst-Helper-AuthDBIC/trunk/Changes	2010-01-31 01:09:04 UTC (rev 12782)
+++ Catalyst-Helper-AuthDBIC/trunk/Changes	2010-01-31 11:51:13 UTC (rev 12783)
@@ -1,4 +1,7 @@
-0.10 Aug 27 209
+0.11 Jan 31 2010
+     - Add parent.pm to dependencies.
+     - Make TWMC optional and do not run mech tests if it's not installed.
+0.10 Aug 27 2009
      - Fix RT #49036 (thanks Tsvetozar Penov)
 0.09 Jun 18 2009
      - Fix RT # 47075 (thanks KMX)

Modified: Catalyst-Helper-AuthDBIC/trunk/Makefile.PL
===================================================================
--- Catalyst-Helper-AuthDBIC/trunk/Makefile.PL	2010-01-31 01:09:04 UTC (rev 12782)
+++ Catalyst-Helper-AuthDBIC/trunk/Makefile.PL	2010-01-31 11:51:13 UTC (rev 12783)
@@ -8,6 +8,7 @@
 
 build_requires 'Catalyst::Runtime';
 build_requires 'ok';
+requires 'parent';
 requires 'DBIx::Class::EncodedColumn';
 requires 'PPI';
 requires 'DBIx::Class::Schema::Loader';

Modified: Catalyst-Helper-AuthDBIC/trunk/lib/Catalyst/Helper/AuthDBIC.pm
===================================================================
--- Catalyst-Helper-AuthDBIC/trunk/lib/Catalyst/Helper/AuthDBIC.pm	2010-01-31 01:09:04 UTC (rev 12782)
+++ Catalyst-Helper-AuthDBIC/trunk/lib/Catalyst/Helper/AuthDBIC.pm	2010-01-31 11:51:13 UTC (rev 12783)
@@ -2,7 +2,7 @@
 use strict;
 use warnings;
 use Catalyst::Helper;
-our $VERSION = '0.10';
+our $VERSION = '0.11';
 use Carp;
 use DBI;
 use DBIx::Class::Schema::Loader qw/ make_schema_at /;
@@ -161,7 +161,7 @@
 
 sub add_plugins {
     my ($module, $doc) = _get_ppi();
-    
+
     my $find = PPI::Find->new( \&_find_use_catalyst);
     my ($found) = $find->in($doc);
     my $find_plugins = PPI::Find->new(\&_find_plugins);
@@ -204,7 +204,7 @@
     my ($setup) = $found->in($doc);
     croak "unable to find __PACKAGE__->setup in $module\n" if !$setup;
     my $auth_doc_plain;
-    
+
     if ( $credential eq 'http' ) {
         warn "Configuring http credential\n";
         $auth_doc_plain = Catalyst::Helper->get_file(__PACKAGE__, 'auth_conf_http');
@@ -213,7 +213,7 @@
         warn "Configuring password (web based) authentication credential\n";
         $auth_doc_plain = Catalyst::Helper->get_file(__PACKAGE__, 'auth_conf_passwd');
     }
-    
+
     $auth_doc_plain =~ s/__MYSCHEMA__/Auth/msg;
     my $auth_doc = PPI::Document->new(\$auth_doc_plain);
     my $auth_conf = $auth_doc->find_first('PPI::Statement');

Modified: Catalyst-Helper-AuthDBIC/trunk/t/live-test.t
===================================================================
--- Catalyst-Helper-AuthDBIC/trunk/t/live-test.t	2010-01-31 01:09:04 UTC (rev 12782)
+++ Catalyst-Helper-AuthDBIC/trunk/t/live-test.t	2010-01-31 11:51:13 UTC (rev 12783)
@@ -2,8 +2,15 @@
 
 use strict;
 use warnings;
-use Test::More tests => 3;
+use Test::More;
 
+BEGIN {
+    eval { require Test::WWW::Mechanize::Catalyst }
+    or plan skip_all => 'Need Test::WWW::Mechanize::Catalyst to run this test';
+}
+
+plan tests => 3;
+
 # setup library path
 use FindBin qw($Bin);
 use lib "$Bin/lib";