fix blib handling in Mojo::Home

mojolicious · Feb 22, 2017 · 95b3769 · 95b3769
1 parent 504b09e
commit 95b3769
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
-7.27  2017-02-17
+7.27  2017-02-22
+  - Fixed blib handling in Mojo::Home.
 
 7.26  2017-02-15
   - Fixed bug in Mojo::IOLoop::Subprocess where starting multiple subprocesses

diff --git a/lib/Mojo/Home.pm b/lib/Mojo/Home.pm
@@ -14,7 +14,8 @@ sub detect {
   elsif ($class && (my $path = $INC{my $file = class_to_path $class})) {
     $home = Mojo::File->new($path)->to_array;
     splice @$home, (my @dummy = split('/', $file)) * -1;
-    pop @$home if @$home && ($home->[-1] eq 'blib' || $home->[-1] eq 'lib');
+    pop @$home if @$home && $home->[-1] eq 'lib';
+    pop @$home if @$home && $home->[-1] eq 'blib';
   }
 
   $$self = Mojo::File->new(@$home)->to_abs->to_string if $home;

diff --git a/t/mojo/home.t b/t/mojo/home.t
@@ -32,10 +32,11 @@ use Mojo::Home;
   is_deeply $home->to_array, $fake->to_array, 'right path detected';
 }
 
-# Specific class detection (with "blib")
+# Specific class detection (with "blib/lib")
 {
   my $fake = path->to_abs->child('does_not_exist_3');
-  local $INC{'My/Class.pm'} = $fake->child('blib', 'My', 'Class.pm')->to_string;
+  local $INC{'My/Class.pm'}
+    = $fake->child('blib', 'lib', 'My', 'Class.pm')->to_string;
   my $home = Mojo::Home->new->detect('My::Class');
   is_deeply $home->to_array, $fake->to_array, 'right path detected';
 }
@@ -47,9 +48,9 @@ use Mojo::Home;
   is_deeply $home->to_array, path->to_array, 'right path detected';
 }
 
-# Specific class detection (relative "blib")
+# Specific class detection (relative "blib/lib")
 {
-  local $INC{'My/Class.pm'} = path('blib', 'My', 'Class.pm')->to_string;
+  local $INC{'My/Class.pm'} = path('blib', 'lib', 'My', 'Class.pm')->to_string;
   my $home = Mojo::Home->new->detect('My::Class');
   is_deeply $home->to_array, path->to_array, 'right path detected';
 }