Changeset 16807 for lang/perl/Devel-SearchINC/trunk

Timestamp:

07/29/08 21:44:19 (5 years ago)

Author:

hanekomu

Message:

Devel::SearchINC::FindLib? is no more; Devel::SearchINC should be sufficient

Location:

lang/perl/Devel-SearchINC/trunk

Files:

• MANIFEST (modified) (2 diffs)
• lib/Devel/SearchINC (deleted)
• lib/Devel/SearchINC.pm (modified) (4 diffs)
• t/01_basic.t (modified) (2 diffs)
• t/02_debug.t (modified) (1 diff)

lang/perl/Devel-SearchINC/trunk/MANIFEST

@@ -14 +14 @@
 inc/Test/More.pm
 lib/Devel/SearchINC.pm
-lib/Devel/SearchINC/FindLib.pm
 LICENSE
 Makefile.PL
@@ -25 +24 @@
 t/01_basic.t
 t/02_debug.t
-t/lib/A/B/B.pm
 t/lib/C/D/lib/C/D/F.pm
 t/lib/C/D/lib/C/D/F/G.pm

lang/perl/Devel-SearchINC/trunk/lib/Devel/SearchINC.pm

@@ -4 +4 @@
 use strict;
 use warnings;
+use Data::Dumper;
 use File::Find;
 
@@ -14 +15 @@
     return if keys %cache;
 
-    for my $path (our @paths) {
-        # Allow paths to be separated by semicolons as well as colons;
-        # splitting along colons is done by perl already.
-
-        find(sub {
-            if (-d && /^t|CVS|\.svn|skel|_build$/) {
-                $File::Find::prune = 1;
-                return;
-            }
-
-            return unless -f && /\.pm$/;
-
-            if ($File::Find::name =~ m!.*/(?:lib|blib/(?:lib|arch))/(.*)!) {
-                $cache{$1} ||= $File::Find::name;
-
-            }
-        }, @path);
-    }
-
-    if (our $DEBUG) {
-        use Data::Dumper;
-        print Dumper \%cache;
-    }
+    find(sub {
+        if (-d && /^t|CVS|\.svn|skel|_build$/) {
+            $File::Find::prune = 1;
+            return;
+        }
+
+        return unless -f && /\.pm$/;
+
+        if ($File::Find::name =~ m!.*/(?:lib|blib/(?:lib|arch))/(.*)!) {
+            $cache{$1} ||= $File::Find::name;
+
+        }
+    }, our @paths);
+
+    warn "cache:\n", Dumper \%cache if our $DEBUG;
 }
 
@@ -76 +69 @@
         @_;
 
+    our @paths;
     for my $path (@p) {
         if ($path eq ':debug') {
@@ -81 +75 @@
             next;
         };
-        push our @paths => $path;
+        push @paths => $path;
     }
 }

lang/perl/Devel-SearchINC/trunk/t/01_basic.t

@@ -1 @@
-use Test::More tests => 8;
+use Test::More tests => 6;
 
 BEGIN {
     use_ok('Devel::SearchINC', 't/lib');
-    use_ok('A::B');
     use_ok('C::D::F');
     use_ok('C::D::F::G');
@@ -14 +13 @@
 }
 
-is(A::B::answer(), 42, 'A::B::answer is 42');
 is(C::D::F::answer(), 42, 'C::D::F::answer is 42');
 is(C::D::F::G::answer(), 42, 'C::D::F::G::answer is 42');

lang/perl/Devel-SearchINC/trunk/t/02_debug.t

@@ -3 +3 @@
 BEGIN {
     use_ok('Devel::SearchINC', 't/lib', ':debug');
-    use_ok('A::B');
+    use_ok('C::D::F');
 }
 
-is(A::B::answer(), 42, 'A::B::answer is 42');
+is(C::D::F::answer(), 42, 'C::D::F::answer is 42');