update comment about empty config vars and regexs in fatnode module shipping filters

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

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 52c772c..9ea7250 100644 (file)
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -6,8 +6,8 @@ use B qw(perlstring);
 
 my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
 
-#used by t/watchdog_fatnode 
-our $INHIBIT_RUN_NODE = 0; 
+#used by t/watchdog_fatnode
+our $INHIBIT_RUN_NODE = 0;
 
 sub stripspace {
   my ($text) = @_;
@@ -41,9 +41,11 @@ my $command = qq(
 
 $command =~ s/\n/ /g;
 
+#warn $command;
 chomp(my @inc = qx($command));
 
-my %exclude = map { $_ => 1 } @exclude_mods; 
+my %exclude = map { $_ => 1 } @exclude_mods;
+my %mod_files = @inc;
 my %mods = reverse @inc;
 
 foreach(keys(%mods)) {
@@ -52,14 +54,25 @@ foreach(keys(%mods)) {
   }
 }
 
-sub filter_not_core {
+my @non_core_non_arch = ( $mod_files{'Devel/GlobalDestruction.pm'} );
+push @non_core_non_arch, grep +(
   not (
-    /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-  )        
-}
-
-my @before_inc = grep { filter_not_core() } keys %mods;
-my @after_inc;
+    #some of the config variables can be empty which will eval as a matching regex
+    $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;
+
+my @core_non_arch = grep +(
+  $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
+  and not($Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
+    or /\Q$Config{archname}/ or /\Q$Config{myarchname}/)
+), keys %mods;
+
+#print STDERR "non-core non-arch ", Dumper(\@non_core_non_arch);
+#print STDERR "core non-arch ", Dumper(\@core_non_arch);
 
 #TODO this is the wrong path to go down - fork() will bring
 #the env vars with it and the ssh connector can handle
@@ -81,8 +94,10 @@ if (defined($ENV{OBJECT_REMOTE_LOG_FORWARDING})) {
   my $forwarding = $ENV{OBJECT_REMOTE_LOG_FORWARDING};
   $env_pass .= '$ENV{OBJECT_REMOTE_LOG_FORWARDING} = "' . $forwarding . "\";\n";
 }
-
-
+if (defined($ENV{OBJECT_REMOTE_PERL_BIN})) {
+  my $perl_bin = $ENV{OBJECT_REMOTE_PERL_BIN};
+  $env_pass .= '$ENV{OBJECT_REMOTE_PERL_BIN} = "' . $perl_bin . "\";\n";
+}
 
 my $start = stripspace <<'END_START';
   # This chunk of stuff was generated by Object::Remote::FatNode. To find
@@ -129,22 +144,29 @@ sub load_from_hash {
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
-              @before_inc, @after_inc;
+              @non_core_non_arch, @core_non_arch;
 
+my %did_pack;
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
   (my $stub = $orig) =~ s/\.pm$//;
   my $name = uc join '_', split '/', $stub;
   my $data = $files{$orig} or die $orig; $data =~ s/^/  /mg;
-  return '$'.$hash_name.'{'.perlstring($orig).qq!} = <<'${name}';\n!
-  .qq!${data}${name}\n!;
+  return () if $did_pack{$hash_name}{$orig};
+  $did_pack{$hash_name}{$orig} = 1;
+  $data .= "\n" unless $data =~ m/\n$/;
+  my $ret = '$'.$hash_name.'{'.perlstring($orig).qq!} = <<'${name}';\n!
+    .qq!${data}${name}\n!;
+#  warn $ret;
+  return $ret;
 }
 
 my @segments = (
-  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @before_inc),
-  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @after_inc),
+    map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core_non_arch),
+    map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
 );
 
+#print STDERR Dumper(\@segments);
 our $DATA = join "\n", $start, $env_pass, @segments, $end;
 
 1;