This is 0.10 on CPAN. Updated test server script and fixed test call

to use -fork instead of -f. Updated reqs to have => undef or version
numbers where possible.

diff --git a/Changes b/Changes
index 8fcd964..bf394db 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,13 @@
 Revision history for Catalyst::Authentication::Credential::OpenID
 
+0.10  Thu Oct  2 19:13:42 PDT 2008
+      - Just twiddled the requirements calls in the Makefile. I can't
+        figure out why testers are failing it for prereqs it *is*
+        listing. Someone recently mentioned this same problem on
+        use.perl so I'm giving this a shot.
+      - Spelling fix in Pod.
+      - Updated tests and test server script too.
+
 0.09  Mon Sep 29 18:29:59 PDT 2008
       - Bug patch for boneheaded return v detach bug given by M. Blom.
 

diff --git a/Makefile.PL b/Makefile.PL
index ff534f3..e13ee97 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,31 +5,29 @@ all_from        "lib/Catalyst/Authentication/Credential/OpenID.pm";
 author          "Ashley Pond V <ashley@cpan.org>";
 
 requires  "parent"                => "0.2";
-requires  "Class::Accessor::Fast";
-requires  "HTML::Parser";     # Causing test failures...?
-# requires  "Devel::Autoflush"; # Ditto but I never had it...?
-requires  "LWP::UserAgent";
+requires  "Class::Accessor::Fast" => undef;
+requires  "HTML::Parser"          => "3";
+requires  "LWP::UserAgent"        => undef;
 requires  "Catalyst"              => "5.7";
 requires  "Catalyst::Devel"       => "1";
 requires  "Crypt::DH"             => "0.05"; # IIRC OpenID stuff forgets to prereq this
 requires  "Net::OpenID::Consumer" => "0.14";
-requires  "Catalyst::Exception";
-requires  "Catalyst::Authentication::User::Hash";
+requires  "Catalyst::Authentication::User::Hash" => undef;
 requires  "Cache::FastMmap"       => "1.28";
 requires  "Catalyst::Plugin::Session::Store::FastMmap" => "0.05";
-requires  "Catalyst::Plugin::Session::State::Cookie";
-requires  "Catalyst::Engine::HTTP";
+requires  "Catalyst::Plugin::Session::State::Cookie" => "0.08";
+requires  "Catalyst::Engine::HTTP" => undef;
 
 recommends "Config::General"     => "2";
 recommends "YAML"                => "0.6";
 recommends "LWPx::ParanoidAgent" => "1.03";
-recommends "Math::BigInt";
+recommends "Math::BigInt"        => undef;
 
-build_requires  "Test::More"            => "0.42";
-build_requires  "Net::OpenID::Server";
-build_requires  "Test::WWW::Mechanize"  => "1.20";
-build_requires  "Net::DNS";
-build_requires  "IO::Socket::INET";
+build_requires  "Test::More"           => "0.42";
+build_requires  "Net::OpenID::Server"  => undef;
+build_requires  "Test::WWW::Mechanize" => "1.20";
+build_requires  "Net::DNS"             => undef;
+build_requires  "IO::Socket::INET"     => undef;
 
 auto_install;
 WriteAll;

diff --git a/lib/Catalyst/Authentication/Credential/OpenID.pm b/lib/Catalyst/Authentication/Credential/OpenID.pm
index 516bf63..3d3a3be 100644 (file)
--- a/lib/Catalyst/Authentication/Credential/OpenID.pm
+++ b/lib/Catalyst/Authentication/Credential/OpenID.pm
@@ -8,7 +8,7 @@ BEGIN {
     __PACKAGE__->mk_accessors(qw/ _config realm debug secret /);
 }
 
-our $VERSION = "0.09";
+our $VERSION = "0.10";
 
 use Net::OpenID::Consumer;
 use Catalyst::Exception ();
@@ -128,7 +128,7 @@ Catalyst::Authentication::Credential::OpenID - OpenID credential for Catalyst::P
 
 =head1 VERSION
 
-0.09
+0.10
 
 =head1 SYNOPSIS
 
@@ -481,7 +481,7 @@ L<Net::OpenID::Consumer>, L<http://openid.net/>, and L<http://openid.net/develop
 
 L<Catalyst>, L<Catalyst::Plugin::Authentication>, L<Catalyst::Manual::Tutorial::Authorization>, and L<Catalyst::Manual::Tutorial::Authentication>.
 
-=item Catalyst Configuraiton
+=item Catalyst Configuration
 
 L<Catalyst::Plugin::ConfigLoader>, L<Config::General>, and L<YAML>.
 

diff --git a/t/TestApp/lib/TestApp.pm b/t/TestApp/lib/TestApp.pm
index 4828f03..b5a2f90 100644 (file)
--- a/t/TestApp/lib/TestApp.pm
+++ b/t/TestApp/lib/TestApp.pm
@@ -41,10 +41,11 @@ __PACKAGE__->config
                           }
               },
               openid => {
-#                  ua_class => "LWPx::ParanoidAgent",
-                  ua_class => "LWP::UserAgent",
+                  ua_class => "LWPx::ParanoidAgent",
+#                  ua_class => "LWP::UserAgent",
                   ua_args => {
                       whitelisted_hosts => [qw/ 127.0.0.1 localhost /],
+                      timeout => 10,
                   },
                   debug => 1,
                   credential => {

diff --git a/t/TestApp/script/testapp_server.pl b/t/TestApp/script/testapp_server.pl
index ff045b7..5adcb9b 100755 (executable)
--- a/t/TestApp/script/testapp_server.pl
+++ b/t/TestApp/script/testapp_server.pl
@@ -2,7 +2,7 @@
 
 BEGIN { 
     $ENV{CATALYST_ENGINE} ||= 'HTTP';
-    $ENV{CATALYST_SCRIPT_GEN} = 30;
+    $ENV{CATALYST_SCRIPT_GEN} = 31;
     require Catalyst::Engine::HTTP;
 }  
 
@@ -21,8 +21,9 @@ my $port              = $ENV{TESTAPP_PORT} || $ENV{CATALYST_PORT} || 3000;
 my $keepalive         = 0;
 my $restart           = $ENV{TESTAPP_RELOAD} || $ENV{CATALYST_RELOAD} || 0;
 my $restart_delay     = 1;
-my $restart_regex     = '\.yml$|\.yaml$|\.pm$';
+my $restart_regex     = '(?:/|^)(?!\.#).+(?:\.yml$|\.yaml$|\.conf|\.pm)$';
 my $restart_directory = undef;
+my $follow_symlinks   = 0;
 
 my @argv = @ARGV;
 
@@ -36,7 +37,8 @@ GetOptions(
     'restart|r'           => \$restart,
     'restartdelay|rd=s'   => \$restart_delay,
     'restartregex|rr=s'   => \$restart_regex,
-    'restartdirectory=s'  => \$restart_directory,
+    'restartdirectory=s@' => \$restart_directory,
+    'followsymlinks'      => \$follow_symlinks,
 );
 
 pod2usage(1) if $help;
@@ -60,6 +62,7 @@ TestApp->run( $port, $host, {
     restart_delay     => $restart_delay,
     restart_regex     => qr/$restart_regex/,
     restart_directory => $restart_directory,
+    follow_symlinks   => $follow_symlinks,
 } );
 
 1;
@@ -85,11 +88,12 @@ testapp_server.pl [options]
    -rd -restartdelay  delay between file checks
    -rr -restartregex  regex match files that trigger
                       a restart when modified
-                      (defaults to '\.yml$|\.yaml$|\.pm$')
+                      (defaults to '\.yml$|\.yaml$|\.conf|\.pm$')
    -restartdirectory  the directory to search for
-                      modified files
-                      (defaults to '../')
-
+                      modified files, can be set mulitple times
+                      (defaults to '[SCRIPT_DIR]/..')
+   -follow_symlinks   follow symlinks in search directories
+                      (defaults to false. this is a no-op on Win32)
  See also:
    perldoc Catalyst::Manual
    perldoc Catalyst::Manual::Intro

diff --git a/t/live_app.t b/t/live_app.t
index fd816db..db6e92b 100644 (file)
--- a/t/live_app.t
+++ b/t/live_app.t
@@ -20,7 +20,7 @@ my $seconds = 30;
 # Spawn the standalone HTTP server.
 my $port = 30000 + int rand(1 + 10000);
 
- my $pipe = "perl -I$FindBin::Bin/../lib -I$FindBin::Bin/TestApp/lib $FindBin::Bin/TestApp/script/testapp_server.pl -f -port $port |";
+ my $pipe = "perl -I$FindBin::Bin/../lib -I$FindBin::Bin/TestApp/lib $FindBin::Bin/TestApp/script/testapp_server.pl -fork -port $port |";
 
 # my $pipe = "perl -I$FindBin::Bin/../lib -I$FindBin::Bin/TestApp/lib $FindBin::Bin/TestApp/script/testapp_server.pl -f -port $port 2>&1 |";
 
@@ -87,7 +87,8 @@ $mech->content_contains("You did it with OpenID!",
 
 $mech->get_ok($root, "GET $root");
 
-$mech->content_contains("provider/paco", "OpenID info is in the user");
+$mech->content_contains("provider/paco", "OpenID signed in");
+#$mech->content_contains("paco", "OpenID signed in as paco");
 
 # can't be verified