[Bps-public-commit] Shipwright branch, master, updated. 13eacbb11050b4d6de11abca48d11c6356350c81

[sunnavy at bestpractical.com]

The branch, master has been updated
       via  13eacbb11050b4d6de11abca48d11c6356350c81 (commit)
       via  53377e14f22eaae34ab590b451f16c44b0e82877 (commit)
       via  7885172b567e3a1c2e7872790d3a6bf3504e568a (commit)
       via  bbbdae7d74921bc42845775de31c956dd6465f31 (commit)
      from  d72b8133021c35c501dd71717ad6227415ca324b (commit)

Summary of changes:
 lib/Shipwright/Script/Update.pm |    1 +
 lib/Shipwright/Source/SVN.pm    |   11 +++++++++--
 lib/Shipwright/Util.pm          |    9 ++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit bbbdae7d74921bc42845775de31c956dd6465f31
Author: rob <rmb32 at cornell.edu>
Date:   Mon Sep 28 14:12:43 2009 -0400

    Shipwright::Source needed to be included in the update script

diff --git a/lib/Shipwright/Script/Update.pm b/lib/Shipwright/Script/Update.pm
index dcf31da..84ffd31 100644
--- a/lib/Shipwright/Script/Update.pm
+++ b/lib/Shipwright/Script/Update.pm
@@ -11,6 +11,7 @@ __PACKAGE__->mk_accessors(
 
 use Shipwright;
 use File::Spec::Functions qw/catdir/;
+use Shipwright::Source;
 use Shipwright::Util;
 use File::Copy qw/copy move/;
 use File::Temp qw/tempdir/;

commit 7885172b567e3a1c2e7872790d3a6bf3504e568a
Author: rob <rmb32 at cornell.edu>
Date:   Mon Sep 28 14:32:06 2009 -0400

    improved Util::run error message output

diff --git a/lib/Shipwright/Util.pm b/lib/Shipwright/Util.pm
index af95484..9b76149 100644
--- a/lib/Shipwright/Util.pm
+++ b/lib/Shipwright/Util.pm
@@ -67,10 +67,13 @@ sub run {
         $log->error(
             'failed to run ' . join( ' ', @$cmd ) . " with exit number $?" );
         unless ($ignore_failure) {
+	    $out = "\n$out" if length $out;
+	    $err = "\n$err" if length $err;
             confess <<"EOF";
-something wrong when execute @$cmd: $?
-the output is: $out
-the error is: $err
+command failed: @$cmd
+\$?: $?
+stdout was: $out
+stderr was: $err
 EOF
         }
     }

commit 53377e14f22eaae34ab590b451f16c44b0e82877
Author: rob <rmb32 at cornell.edu>
Date:   Mon Sep 28 14:41:22 2009 -0400

    fixed updating with SVN backend.  need to remove the export target dir before exporting in order to get a clean export

diff --git a/lib/Shipwright/Source/SVN.pm b/lib/Shipwright/Source/SVN.pm
index a46c889..a882fc9 100644
--- a/lib/Shipwright/Source/SVN.pm
+++ b/lib/Shipwright/Source/SVN.pm
@@ -4,6 +4,7 @@ use warnings;
 use strict;
 use Carp;
 use File::Spec::Functions qw/catdir/;
+use File::Path;
 
 use base qw/Shipwright::Source::Base/;
 
@@ -49,11 +50,12 @@ sub _run {
     my $self   = shift;
     my $source = $self->source;
 
+    my $export_dir = catdir( $self->download_directory, $self->name );
     my $cmd = [
         $ENV{'SHIPWRIGHT_SVN'},
         'export',
         $self->source,
-        catdir( $self->download_directory, $self->name ),
+	$export_dir,
         $self->version ? ( '-r', $self->version ) : (),
     ];
 
@@ -66,7 +68,12 @@ sub _run {
         }
     }
 
-    $self->source( catdir( $self->download_directory, $self->name ) );
+    if( -d $export_dir ) {
+      File::Path::rmtree($export_dir);
+      -d $export_dir
+	and confess "could not remove old export dir '$export_dir'";
+    }
+    $self->source( $export_dir );
     Shipwright::Util->run($cmd);
 }
 

commit 13eacbb11050b4d6de11abca48d11c6356350c81
Merge: d72b813 53377e1
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Oct 3 22:11:44 2009 +0800

    Merge branch 'master' of git://github.com/rbuels/shipwright


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