[Bps-public-commit] r17724 - in TAP-Harness-Remote: .

[alexmv at bestpractical.com]

Author: alexmv
Date: Tue Jan 13 00:00:50 2009
New Revision: 17724

Modified:
   TAP-Harness-Remote/   (props changed)
   TAP-Harness-Remote/lib/TAP/Harness/Remote.pm

Log:
 r40900 at kohr-ah:  chmrr | 2009-01-12 23:57:01 -0500
 Better docs and error-checking on rsync_args


Modified: TAP-Harness-Remote/lib/TAP/Harness/Remote.pm
==============================================================================
--- TAP-Harness-Remote/lib/TAP/Harness/Remote.pm	(original)
+++ TAP-Harness-Remote/lib/TAP/Harness/Remote.pm	Tue Jan 13 00:00:50 2009
@@ -49,6 +49,10 @@
       - -x
       - -S
       - '~/.ssh/master-%r@%h:%p'
+    rsync_args:
+      - -C
+      - --exclude
+      - blib
 
 See L</CONFIGURATION AND ENVIRONMENT> for more details on the
 individual configuration options.
@@ -134,14 +138,15 @@
 
 sub default_config {
     return {
-        user     => "smoker",
-        host     => "smoke-server.example.com",
-        root     => "/home/smoker/remote-test/$ENV{USER}/",
-        perl     => "/home/smoker/bin/perl",
-        local    => [ "/home/$ENV{USER}/remote-test/" ],
-        ssh      => "/usr/bin/ssh",
-        ssh_args => [ "-x", "-S", "~/.ssh/master-%r@%h:%p" ],
-        master   => 1,
+        user       => "smoker",
+        host       => "smoke-server.example.com",
+        root       => "/home/smoker/remote-test/$ENV{USER}/",
+        perl       => "/home/smoker/bin/perl",
+        local      => [ "/home/$ENV{USER}/remote-test/" ],
+        ssh        => "/usr/bin/ssh",
+        ssh_args   => [ "-x", "-S", "~/.ssh/master-%r@%h:%p" ],
+        rsync_args => [ "-C" ],
+        master     => 1,
     };
 }
 
@@ -172,8 +177,13 @@
 
     # Ditto ssh_args
     $self->{remote_config}{ssh_args}
-        = [ split ' ', $self->{remote_config}{ssh_args} ]
+        = [ split ' ', ( $self->{remote_config}{ssh_args} || "") ]
         unless ref $self->{remote_config}{ssh_args};
+
+    # Also, rsync_args
+    $self->{remote_config}{rsync_args}
+        = [ split ' ', ($self->{remote_config}{rsync_args} || "") ]
+        unless ref $self->{remote_config}{rsync_args};
 }
 
 =head2 remote_config KEY
@@ -384,11 +394,6 @@
 
 The path to the local C<ssh> binary.
 
-=item rsync_args
-
-Either a string or an array reference of arguments to pass to ssh.
-You can use this, for say C<--exclude .git>
-
 =item ssh_args
 
 Either a string or an array reference of arguments to pass to ssh.
@@ -400,6 +405,14 @@
 connections to reduce the overhead of making repeated connections to
 the remote host.
 
+=item rsync_args
+
+Either a string or an array reference of arguments to pass to rsync.
+You can use this, for say C<--exclude blib>.  The arguments C<-avz
+--delete> are fixed, and then any C<rsync_args> are appended.  C<-C>
+is generally a useful and correct option, and is the default when
+creating new F<.remote_test> files.  See L<rsync(1)> for more details.
+
 =back
 
 =head1 DEPENDENCIES