only check for archname as last component of %INC path

[scpubgit/Object-Remote.git] / lib / Object / Remote / FatNode.pm

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 45332d5..93fa932 100644 (file)
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -14,18 +14,22 @@ sub stripspace {
   $text;
 }
 
-my %maybe_libs = map +($_ => 1), grep defined, (values %Config, '.');
+chomp(my @base_libs = `"$^X" -le"print for grep defined and !ref, \@INC"`);
+my %base_libs = map +($_ => 1), @base_libs;
 
-my @extra_libs = grep not(ref($_) or $maybe_libs{$_}), @INC;
-
-my $extra_libs = join '', map "  -I$_\n", @extra_libs;
+my @extra_libs = grep not(ref($_) or $base_libs{$_}), @INC;
+my $extra_libs = join ' ', map {
+  my $lib = $_;
+  $lib =~ s{'}{'\\''}g;
+  "-I'$lib'\n";
+} @extra_libs;
 
 my $command = qq(
   $^X
   $extra_libs
   -mObject::Remote
   -mObject::Remote::Connector::STDIO
-  -mCPS::Future
+  -mFuture
   -mMRO::Compat
   -mClass::C3
   -mClass::C3::next
@@ -34,6 +38,7 @@ my $command = qq(
   -mObject::Remote::Node
   -mMethod::Generate::BuildAll
   -mMethod::Generate::DemolishAll
+  -mMoo::HandleMoose::_TypeMap
   -mJSON::PP
   -e 'print join "\\n", \%INC'
 );
@@ -43,31 +48,48 @@ $command =~ s/\n/ /g;
 chomp(my @inc = qx($command));
 
 my %exclude = map { $_ => 1 } @exclude_mods;
-my %mods = reverse @inc;
+
 my %file_names = @inc;
 
+# only include mods that match the filename,
+# ie ones that will succeed with a require $module
+# https://rt.cpan.org/Ticket/Display.html?id=100478
+my %mods =
+  map { $file_names{$_} => $_ }
+  grep { $file_names{$_} =~ /\Q$_\E$/ } keys %file_names;
+
 foreach(keys(%mods)) {
   if ($exclude{ $mods{$_} }) {
     delete($mods{$_});
   }
 }
 
+my %mod_libdir = map {
+  (my $lib_dir = $_) =~ s/[\\\/]$mods{$_}\z//;
+  $_ => $lib_dir;
+} keys %mods;
+
 my @non_core_non_arch = ( $file_names{'Devel/GlobalDestruction.pm'} );
-push @non_core_non_arch, grep +(
+
+push @non_core_non_arch, grep {
+  local $_ = $mod_libdir{$_};
   not (
-    #some of the config variables can be empty which will eval as a matching regex
-    $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
+    /[\\\/]\Q$Config{archname}\E\z/
+      or /[\\\/]\Q$Config{myarchname}\E\z/
+      #some of the config variables can be empty which will eval as a matching regex
+      or $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
       or $Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
       or $Config{vendorarchexp} ne '' && /^\Q$Config{vendorarchexp}/
       or $Config{sitearchexp} ne '' && /^\Q$Config{sitearchexp}/
   )
-), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
+} keys %mods;
 
-my @core_non_arch = grep +(
+my @core_non_arch = grep {
+  local $_ = $mod_libdir{$_};
   $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
   and not($Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
-    or /\Q$Config{archname}/ or /\Q$Config{myarchname}/)
-), keys %mods;
+    or /[\\\/]\Q$Config{archname}\E\z/ or /[\\\/]\Q$Config{myarchname}\E\z/)
+} keys %mods;
 
 my $start = stripspace <<'END_START';
   # This chunk of stuff was generated by Object::Remote::FatNode. To find