[Catalyst-commits] r6528 - in trunk/Authen-Htpasswd: . lib/Authen t

[ningu at dev.catalyst.perl.org]

Author: ningu
Date: 2007-07-15 08:48:53 +0100 (Sun, 15 Jul 2007)
New Revision: 6528

Modified:
   trunk/Authen-Htpasswd/Changes
   trunk/Authen-Htpasswd/lib/Authen/Htpasswd.pm
   trunk/Authen-Htpasswd/t/04core.t
   trunk/Authen-Htpasswd/t/05edit.t
Log:
fix Authen::Htpasswd tests for windows, hopefully

Modified: trunk/Authen-Htpasswd/Changes
===================================================================
--- trunk/Authen-Htpasswd/Changes	2007-07-13 18:07:20 UTC (rev 6527)
+++ trunk/Authen-Htpasswd/Changes	2007-07-15 07:48:53 UTC (rev 6528)
@@ -1,3 +1,6 @@
+0.15001 Sun Jul 15 00:07:00 PDT 2007
+    - use File::Spec in tests to avoid build failure on Windows
+
 0.15	Sun Dec 31 02:51:35 EST 2006
     - prevent User::password() from clobbering the password if none is passed
     - document Util::supported_hashes()
@@ -11,8 +14,8 @@
     - added Yuval Kogman as author, also added license to POD
 
 0.12    November 10 2005
-	- extra_info is now an array, as suggested by Uwe Voelker
-	- changing the username will now delete the old username and add the new one
+    - extra_info is now an array, as suggested by Uwe Voelker
+    - changing the username will now delete the old username and add the new one
 
 0.11    November 09 2005
     - implement locking with IO::LockedFile

Modified: trunk/Authen-Htpasswd/lib/Authen/Htpasswd.pm
===================================================================
--- trunk/Authen-Htpasswd/lib/Authen/Htpasswd.pm	2007-07-13 18:07:20 UTC (rev 6527)
+++ trunk/Authen-Htpasswd/lib/Authen/Htpasswd.pm	2007-07-15 07:48:53 UTC (rev 6528)
@@ -5,7 +5,7 @@
 use IO::LockedFile;
 use Authen::Htpasswd::User;
 
-our $VERSION = '0.15';
+our $VERSION = '0.15001';
 our $SUFFIX = '.new';
 
 __PACKAGE__->mk_accessors(qw/ file encrypt_hash check_hashes /);

Modified: trunk/Authen-Htpasswd/t/04core.t
===================================================================
--- trunk/Authen-Htpasswd/t/04core.t	2007-07-13 18:07:20 UTC (rev 6527)
+++ trunk/Authen-Htpasswd/t/04core.t	2007-07-15 07:48:53 UTC (rev 6528)
@@ -5,8 +5,9 @@
 use strict;
 use warnings;
 use Authen::Htpasswd;
+use File::Spec::Functions;
 
-my $file = Authen::Htpasswd->new('t/data/passwd.txt');
+my $file = Authen::Htpasswd->new(catfile(qw/t data passwd.txt/));
 
 ok( $file, 'object created successfully');
 

Modified: trunk/Authen-Htpasswd/t/05edit.t
===================================================================
--- trunk/Authen-Htpasswd/t/05edit.t	2007-07-13 18:07:20 UTC (rev 6527)
+++ trunk/Authen-Htpasswd/t/05edit.t	2007-07-15 07:48:53 UTC (rev 6528)
@@ -6,11 +6,12 @@
 use warnings;
 
 use Authen::Htpasswd;
+use File::Spec::Functions;
 
 use File::Copy;
-copy('t/data/passwd.txt', 't/data/temp.txt') or die $!;
+copy(catfile(qw/t data passwd.txt/), catfile(qw/t data temp.txt/)) or die $!;
 
-my $file = Authen::Htpasswd->new('t/data/temp.txt');
+my $file = Authen::Htpasswd->new(catfile(qw/t data temp.txt/));
 
 ok( $file, 'object created successfully');
 
@@ -59,5 +60,5 @@
 ok($@, 'password with no args dies');
 ok($user->check_password('orange'), 'user still has correct password');
 
-unlink 't/data/temp.txt';
+unlink catfile(qw/t data temp.txt/);