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

[? sunnavy]

The branch, master has been updated
       via  b896d59db5d7029f3eb07bfff250b72408849181 (commit)
       via  9302580072b1eb4775ea955bbcc0e62cd9176be1 (commit)
       via  268d0e62d6306a08fbc37dcdb12578393b5025b6 (commit)
      from  22b2306ca3d29abb4ead10d403f6a9c2d3d9a8bb (commit)

Summary of changes:
 Changes                             |    6 +++++-
 META.yml                            |    2 +-
 lib/Shipwright.pm                   |    2 +-
 lib/Shipwright/Source/Compressed.pm |    5 ++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit 268d0e62d6306a08fbc37dcdb12578393b5025b6
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Apr 28 01:52:22 2011 +0800

    handling compressed files which include filenames prefixed with ./

diff --git a/lib/Shipwright/Source/Compressed.pm b/lib/Shipwright/Source/Compressed.pm
index 2576ef5..5773436 100644
--- a/lib/Shipwright/Source/Compressed.pm
+++ b/lib/Shipwright/Source/Compressed.pm
@@ -56,11 +56,14 @@ sub path {
     my $files = $ae->files;
 
     my $base_dir = $files->[0];
+    # some compressed file has name like ./PerlImagick-6.67/
+    $base_dir =~ s!^\.[/\\]!!;
+
 # sunnavy found that the 1st file is not the directory name when extracting
 # HTML-Strip-1.06.tar.gz, which is weird but valid compressed file.
     $base_dir =~ s![/\\].*!!; 
 
-    if ( @$files != grep { /^\Q$base_dir\E/ } @$files ) {
+    if ( @$files != grep { /^(?:\.[\/\\])?\Q$base_dir\E/ } @$files ) {
         confess_or_die 'only support compressed file which contains only one directory: '
           . $base_dir;
     }

commit 9302580072b1eb4775ea955bbcc0e62cd9176be1
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Apr 28 01:58:11 2011 +0800

    release 2.4.25

diff --git a/Changes b/Changes
index 25967f2..fa570cc 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,8 @@
 Revision history for Shipwright
 
-2.4.25
+2.4.25 Thu Apr 28 01:57:42 CST 2011
+
+* support archives which include filenames prefixed with ./
 
 2.4.24 Sat Apr  2 19:30:01 CST 2011
 

commit b896d59db5d7029f3eb07bfff250b72408849181
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Apr 28 01:59:20 2011 +0800

    bump to 2.4.26

diff --git a/Changes b/Changes
index fa570cc..97e5fcf 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 Revision history for Shipwright
 
+2.4.26
+
 2.4.25 Thu Apr 28 01:57:42 CST 2011
 
 * support archives which include filenames prefixed with ./
diff --git a/META.yml b/META.yml
index 980cbaa..87dc8c8 100644
--- a/META.yml
+++ b/META.yml
@@ -56,4 +56,4 @@ requires:
 resources:
   license: http://dev.perl.org/licenses/
   repository: git://github.com/bestpractical/shipwright.git
-version: 2.004025
+version: 2.004026
diff --git a/lib/Shipwright.pm b/lib/Shipwright.pm
index 548646f..0c0ab07 100644
--- a/lib/Shipwright.pm
+++ b/lib/Shipwright.pm
@@ -2,7 +2,7 @@ package Shipwright;
 
 use warnings;
 use strict;
-use version; our $VERSION = qv('2.4.25');
+use version; our $VERSION = qv('2.4.26');
 
 use base qw/Shipwright::Base/;
 

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