fix that pesky problem with basic_data.t being broken

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

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 9f94ee2..6b65a25 100644 (file)
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -4,6 +4,8 @@ use strictures 1;
 use Config;
 use B qw(perlstring);
 
+my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
+
 sub stripspace {
   my ($text) = @_;
   $text =~ /^(\s+)/ && $text =~ s/^$1//mg;
@@ -22,59 +24,105 @@ my $command = qq(
   -mObject::Remote
   -mObject::Remote::Connector::STDIO
   -mCPS::Future
+  -mMRO::Compat
   -mClass::C3
+  -mClass::C3::next
+  -mAlgorithm::C3
   -mObject::Remote::ModuleLoader
   -mObject::Remote::Node
   -mMethod::Generate::BuildAll
   -mMethod::Generate::DemolishAll
   -mJSON::PP
-  -e 'print join "\\n", reverse \%INC'
+  -e 'print join "\\n", \%INC'
 );
 
 $command =~ s/\n/ /g;
 
-chomp(my %mods = qx($command));
+chomp(my @inc = qx($command));
+
+my %exclude = map { $_ => 1 } @exclude_mods; 
+my %mods = reverse @inc;
+
+foreach(keys(%mods)) {
+  if ($exclude{ $mods{$_} }) {
+    delete($mods{$_});    
+  }
+}
+
+sub filter_not_core {
+  not (
+    /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
+  )        
+}
+
+my @file_names = keys %mods;
+my @before_inc = grep { filter_not_core() } @file_names;
+my @after_inc;
 
-my @non_core_non_arch = grep +(
-  not (/^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/)
-), grep !/\Q$Config{archname}/, grep !/\W$Config{myarchname}/, keys %mods;
+my $env_pass = '';
+if (defined($ENV{OBJECT_REMOTE_LOG_LEVEL})) {
+  my $level = $ENV{OBJECT_REMOTE_LOG_LEVEL};
+  return unless $level =~ /^\w+$/;
+  $env_pass = '$ENV{OBJECT_REMOTE_LOG_LEVEL} = "' . $level . "\";\n";
+}
 
 my $start = stripspace <<'END_START';
   # This chunk of stuff was generated by Object::Remote::FatNode. To find
   # the original file's code, look for the end of this BEGIN block or the
   # string 'FATPACK'
   BEGIN {
-  my %fatpacked;
+  my (%fatpacked,%fatpacked_extra);
 END_START
-my $end = stripspace <<'END_END';
-  s/^  //mg for values %fatpacked;
 
-  unshift @INC, sub {
-    if (my $fat = $fatpacked{$_[1]}) {
+$start .= 'my %exclude = map { $_ => 1 } (\'' . join("','", @exclude_mods) . "');\n";
+
+my $end = stripspace <<'END_END';
+  s/^  //mg for values %fatpacked, values %fatpacked_extra;
+
+  sub load_from_hash {
+    if (my $fat = $_[0]->{$_[1]}) {
+      if ($exclude{$_[1]}) {
+        warn "Will not pre-load '$_[1]'";
+        return undef; 
+      }
+ 
+      #warn "Handling $_[1]";
       open my $fh, '<', \$fat;
       return $fh;
     }
-    return
-  };
+    
+    #Uncomment this to find brokenness
+    #warn "Missing $_[1]";
+    return;
+  }
+
+  unshift @INC, sub { load_from_hash(\%fatpacked, $_[1]) };
+  push @INC, sub { load_from_hash(\%fatpacked_extra, $_[1]) };
 
   } # END OF FATPACK CODE
 
   use strictures 1;
   use Object::Remote::Node;
-  Object::Remote::Node->run;
+  Object::Remote::Node->run(watchdog_timeout => $WATCHDOG_TIMEOUT);
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
-              @non_core_non_arch;
+              @before_inc, @after_inc;
 
-my @segments = map {
-  (my $stub = $_) =~ s/\.pm$//;
+sub generate_fatpack_hash {
+  my ($hash_name, $orig) = @_;
+  (my $stub = $orig) =~ s/\.pm$//;
   my $name = uc join '_', split '/', $stub;
-  my $data = $files{$_}; $data =~ s/^/  /mg;
-  '$fatpacked{'.perlstring($_).qq!} = <<'${name}';\n!
+  my $data = $files{$orig} or die $orig; $data =~ s/^/  /mg;
+  return '$'.$hash_name.'{'.perlstring($orig).qq!} = <<'${name}';\n!
   .qq!${data}${name}\n!;
-} sort keys %files;
+}
+
+my @segments = (
+  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @before_inc),
+  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @after_inc),
+);
 
-our $DATA = join "\n", $start, @segments, $end;
+our $DATA = join "\n", $start, $env_pass, @segments, $end;
 
 1;