[Bps-public-commit] r15352 - in Shipwright/branches/1.10: lib/Shipwright/Backend t

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Aug 21 22:12:06 2008
New Revision: 15352

Modified:
   Shipwright/branches/1.10/lib/Shipwright/Backend/SVN.pm
   Shipwright/branches/1.10/lib/Shipwright/Test.pm
   Shipwright/branches/1.10/t/perlcritic.t

Log:
merged 15347:15351 to 1.1

Modified: Shipwright/branches/1.10/lib/Shipwright/Backend/SVN.pm
==============================================================================
--- Shipwright/branches/1.10/lib/Shipwright/Backend/SVN.pm	(original)
+++ Shipwright/branches/1.10/lib/Shipwright/Backend/SVN.pm	Thu Aug 21 22:12:06 2008
@@ -212,7 +212,11 @@
 
         my ( $info, $err ) = $self->info;
 
-        return 1 if $info || $err && $err =~ /Not a valid URL/;
+        my $repo = $self->repository;
+# $err like 
+# file:///tmp/svn/foo:  (Not a valid URL)
+# usually means foo doesn't exist, which is valid for create
+        return 1 if $info || $err && $err =~ m{^\Q$repo\E:}m;
 
     }
     else {

Modified: Shipwright/branches/1.10/lib/Shipwright/Test.pm
==============================================================================
--- Shipwright/branches/1.10/lib/Shipwright/Test.pm	(original)
+++ Shipwright/branches/1.10/lib/Shipwright/Test.pm	Thu Aug 21 22:12:06 2008
@@ -29,8 +29,8 @@
 
 sub has_svk {
     if ( can_run('svk') && can_run('svnadmin') ) {
-        my $out = Shipwright::Util->run(['svk', '--version']);
-        if ( $out =~ /version v(\d)\./ ) {
+        my $out = Shipwright::Util->run(['svk', '--version'], 1);
+        if ( $out && $out =~ /version v(\d)\./i ) {
             return 1 if $1 >= 2;
         }
     }
@@ -46,8 +46,8 @@
 
 sub has_svn {
     if ( can_run('svn') && can_run('svnadmin') ) {
-        my $out = Shipwright::Util->run(['svn', '--version']);
-        if ( $out =~ /version 1\.(\d)/ ) {
+        my $out = Shipwright::Util->run(['svn', '--version'], 1);
+        if ( $out && $out =~ /version 1\.(\d)/i ) {
             return 1 if $1 >= 4;
         }
     }

Modified: Shipwright/branches/1.10/t/perlcritic.t
==============================================================================
--- Shipwright/branches/1.10/t/perlcritic.t	(original)
+++ Shipwright/branches/1.10/t/perlcritic.t	Thu Aug 21 22:12:06 2008
@@ -2,8 +2,15 @@
 use warnings;
 
 use Test::More;
+
 # we forced use Perl::Critic is for version limit
 eval "use Perl::Critic 1.090; use Test::Perl::Critic 1.01";
-plan skip_all => "Perl::Critic 1.090 and Test::Perl::Critic 1.01 required for testing PBP compliance" if $@;
+if ($@) {
+    plan skip_all =>
+"Perl::Critic 1.090 and Test::Perl::Critic 1.01 required for testing PBP compliance";
+}
+elsif ( !-e 'inc/.author' ) {
+    plan skip_all => 'no inc/.author, will not run this test ;)';
+}
 
 Test::Perl::Critic::all_critic_ok();