X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FModuleSender.pm;h=6624d6b8fdd21a9abc463bf31cd5da64d5caf38b;hp=87f75f119db02f9bdd9c280c15cc329315831817;hb=a577b9530c7c091e6800bca9dca4fd03c37ce039;hpb=542d5b5ca3990695be389d0d497883876c189486

diff --git a/lib/Object/Remote/ModuleSender.pm b/lib/Object/Remote/ModuleSender.pm
index 87f75f1..6624d6b 100644
--- a/lib/Object/Remote/ModuleSender.pm
+++ b/lib/Object/Remote/ModuleSender.pm
@@ -1,5 +1,6 @@
 package Object::Remote::ModuleSender;
 
+use Object::Remote::Logging qw( :log :dlog );
 use Config;
 use File::Spec;
 use List::Util qw(first);
@@ -8,18 +9,29 @@ use Moo;
 has dir_list => (is => 'lazy');
 
 sub _build_dir_list {
-  my %core = map +($_ => 1), @Config{qw(privlibexp archlibexp)};
-  [ grep !/$Config{archname}$/, grep !$core{$_}, @INC ];
+  my %core = map +($_ => 1), grep $_, @Config{
+    qw(privlibexp archlibexp vendorarchexp sitearchexp)
+  };
+  DlogS_trace { "dir list built in ModuleSender: $_" } [ grep !$core{$_}, @INC ];
 }
 
 sub source_for {
   my ($self, $module) = @_;
+  log_debug { "locating source for module '$module'" };
+  if (my $find = Object::Remote::FromData->can('find_module')) {
+    if (my $source = $find->($module)) {
+      Dlog_trace { "source of '$module' was found by Object::Remote::FromData" };
+      return $source;
+    }
+  }
+  log_trace { "Searching for module in library directories" };
   my ($found) = first {  -f $_ }
                   map File::Spec->catfile($_, $module),
                     @{$self->dir_list};
   die "Couldn't find ${module} in remote \@INC. dir_list contains:\n"
       .join("\n", @{$self->dir_list})
     unless $found;
+  log_debug { "found '$module' at '$found'" };
   open my $fh, '<', $found or die "Couldn't open ${found} for ${module}: $!";
   return do { local $/; <$fh> };
 }