[Bps-public-commit] Shipwright branch, master, updated. 124f050d893e64609fd17adbce6677b41c3f4c59

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  124f050d893e64609fd17adbce6677b41c3f4c59 (commit)
      from  27980eff88fec27dc15349104c8f8d3f0b35ed64 (commit)

Summary of changes:
 lib/Shipwright.pm             |    9 ++++++++-
 lib/Shipwright/Manual/ENV.pod |   24 ++++++++++++++++++++++++
 lib/Shipwright/Source/FTP.pm  |    2 --
 3 files changed, 32 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 124f050d893e64609fd17adbce6677b41c3f4c59
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Sep 17 15:42:58 2009 +0800

    tweak env and its doc

diff --git a/lib/Shipwright.pm b/lib/Shipwright.pm
index bc07a49..7c9ae5f 100644
--- a/lib/Shipwright.pm
+++ b/lib/Shipwright.pm
@@ -16,9 +16,16 @@ $ENV{SHIPWRIGHT_MAKE} ||= 'make';
 $ENV{SHIPWRIGHT_SVK} ||= 'svk';
 $ENV{SHIPWRIGHT_SVN} ||= 'svn';
 $ENV{SHIPWRIGHT_GIT} ||= 'git';
-$ENV{PERL_MM_USE_DEFAULT} ||= 1;
 $ENV{SHIPWRIGHT_LWP_TIMEOUT} ||= 1200;
 
+$ENV{PERL_MM_USE_DEFAULT} = 1; # always true
+
+# FTP_PASSIVE is true by default,
+# since many sites use this nowadays.
+unless ( defined $ENV{FTP_PASSIVE} ) {
+    $ENV{FTP_PASSIVE} = 1;
+}
+
 sub new {
     my $class = shift;
 
diff --git a/lib/Shipwright/Manual/ENV.pod b/lib/Shipwright/Manual/ENV.pod
index 9ca20e8..6c046c8 100644
--- a/lib/Shipwright/Manual/ENV.pod
+++ b/lib/Shipwright/Manual/ENV.pod
@@ -14,6 +14,17 @@ Introduce ENV variables Shipwright makes use of.
 
 user's home directory, e.g. /home/joe
 
+=item USER
+
+user's name, e.g. joe
+
+=item SHIPWRIGHT_REPOSITORY
+
+    shipwright's repository, i.e. uri occurs in cmd option -r ...
+    if there's no -r arg in cmd, this env is used if any.
+
+    e.g. fs:/tmp/fs
+
 =item SHIPWRIGHT_MAKE
 
     path of 'make' cmd, default value is 'make' on UNIX
@@ -54,6 +65,19 @@ F<svnadmin> command is expected to be in the same directory as F<svn>.
 
     test git backend if this's true
 
+=item PERL_MM_USE_DEFAULT
+
+    CPAN in Shipwright is always run without interaction,
+    so this will always be true.
+
+=item FTP_PASSIVE
+
+    used in FTP source, true by default 
+
+=item SVKROOT
+
+    used in tests, svk depot path
+
 =back
 
 =head1 SEE ALSO
diff --git a/lib/Shipwright/Source/FTP.pm b/lib/Shipwright/Source/FTP.pm
index a294915..63d27ab 100644
--- a/lib/Shipwright/Source/FTP.pm
+++ b/lib/Shipwright/Source/FTP.pm
@@ -9,8 +9,6 @@ use File::Spec::Functions qw/catfile/;
 
 use base qw/Shipwright::Source::Base/;
 
-$ENV{'FTP_PASSIVE'} = 1;    # force enable passive mode, seems safe nowadays
-
 =head2 run
 
 =cut

-----------------------------------------------------------------------