r47014 - in /branches/upstream/libfind-lib-perl/current: Changes META.yml lib/Find/Lib.pm t/01-basic.t

[jawnsy-guest at users.alioth.debian.org]

Author: jawnsy-guest
Date: Wed Nov 11 02:54:08 2009
New Revision: 47014

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47014
Log:
[svn-upgrade] Integrating new upstream version, libfind-lib-perl (1.01)

Modified:
    branches/upstream/libfind-lib-perl/current/Changes
    branches/upstream/libfind-lib-perl/current/META.yml
    branches/upstream/libfind-lib-perl/current/lib/Find/Lib.pm
    branches/upstream/libfind-lib-perl/current/t/01-basic.t

Modified: branches/upstream/libfind-lib-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfind-lib-perl/current/Changes?rev=47014&op=diff
==============================================================================
--- branches/upstream/libfind-lib-perl/current/Changes (original)
+++ branches/upstream/libfind-lib-perl/current/Changes Wed Nov 11 02:54:08 2009
@@ -1,4 +1,8 @@
 Revision history for Find-Lib
+
+1.01    Tue Nov 10 12:30:00 PDT 2009
+        - Fix a problem with File::Spec::Functions use of Exporter
+          making Find::Lib->cat(dir|file) behaving incorrectly.
 
 1.0     Tue Oct 27 13:40:00 PDT 2009
         *** Incompatible changes see details in 0.99 releases below. ***

Modified: branches/upstream/libfind-lib-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfind-lib-perl/current/META.yml?rev=47014&op=diff
==============================================================================
--- branches/upstream/libfind-lib-perl/current/META.yml (original)
+++ branches/upstream/libfind-lib-perl/current/META.yml Wed Nov 11 02:54:08 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Find-Lib
-version:            1.0
+version:            1.01
 abstract:           Helper to smartly find libs to use in the filesystem tree
 author:
     - Yann Kerherve <yannk at cpan.org>

Modified: branches/upstream/libfind-lib-perl/current/lib/Find/Lib.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfind-lib-perl/current/lib/Find/Lib.pm?rev=47014&op=diff
==============================================================================
--- branches/upstream/libfind-lib-perl/current/lib/Find/Lib.pm (original)
+++ branches/upstream/libfind-lib-perl/current/lib/Find/Lib.pm Wed Nov 11 02:54:08 2009
@@ -3,7 +3,7 @@
 use warnings;
 use lib;
 
-use File::Spec::Functions qw( catpath splitpath rel2abs splitdir );
+use File::Spec();
 use vars qw/$Base $VERSION @base/;
 use vars qw/$Script/; # compat
 
@@ -13,11 +13,11 @@
 
 =head1 VERSION
 
-Version 1.0
-
-=cut
-
-$VERSION = '1.0';
+Version 1.01
+
+=cut
+
+$VERSION = '1.01';
 
 =head1 SYNOPSIS
 
@@ -128,16 +128,16 @@
 }
 
 sub guess_shell_path {
-    my ($volume, $path, $file) = splitpath( $ENV{PWD} );
-    my @path = splitdir $path;
+    my ($volume, $path, $file) = File::Spec->splitpath( $ENV{PWD} );
+    my @path = File::Spec->splitdir($path);
     pop @path unless $path[-1];
     @base = (@path, $file);
-    my @zero = splitdir $0;
+    my @zero = File::Spec->splitdir($0);
     pop @zero; # get rid of the script
     ## a clean base is also important for the pop business below
     #@base = grep { $_ && $_ ne '.' } shell_resolve(\@base, \@zero);
     @base = shell_resolve(\@base, \@zero);
-    return catpath( $volume, (File::Spec->catdir( @base )), '' );
+    return File::Spec->catpath( $volume, (File::Spec->catdir( @base )), '' );
 }
 
 ## naive method, but really DWIM from a developer perspective
@@ -157,7 +157,8 @@
 }
 
 sub guess_system_path {
-    return catpath( (splitpath( rel2abs $0 ))[ 0, 1 ], '' );
+    my @split = (File::Spec->splitpath( File::Spec->rel2abs($0) ))[ 0, 1 ];
+    return File::Spec->catpath( @split, '' );
 }
 
 sub import {
@@ -177,7 +178,7 @@
     @libs = @_ unless @libs;
 
     for ( reverse @libs ) {
-        my @lib = splitdir $_;
+        my @lib = File::Spec->splitdir($_);
         if (@lib && ! $lib[0]) {
             # '/abs/olute/' path
             lib->import($_);

Modified: branches/upstream/libfind-lib-perl/current/t/01-basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libfind-lib-perl/current/t/01-basic.t?rev=47014&op=diff
==============================================================================
--- branches/upstream/libfind-lib-perl/current/t/01-basic.t (original)
+++ branches/upstream/libfind-lib-perl/current/t/01-basic.t Wed Nov 11 02:54:08 2009
@@ -1,5 +1,5 @@
 use strict;
-use Test::More tests => 8;
+use Test::More tests => 9;
 
 require 't/testutils.pl';
 
@@ -16,3 +16,4 @@
 is (Find::Lib->catfile('something'), File::Spec->catfile($base, 'something'));
 is (Find::Lib->catdir('dir'), File::Spec->catdir($base, 'dir'));
 is (Find::Lib->catdir('..', 'dir'), File::Spec->catdir($base, '..', 'dir'));
+unlike (Find::Lib->catdir("x"), qr/Find::Lib/, 'Bug with dumb Exporter use');