X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FRole%2FConnector%2FPerlInterpreter.pm;h=f304a8d650977fe89658d8097c151774a2027309;hb=12fb4a80d68ad14c18a35f60cc6d8a671f728ac9;hp=5a9f64e6165297fb37471ad6cce645cab3482c30;hpb=7efea51f193cf42822232047403138ef98abcc32;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
index 5a9f64e..f304a8d 100644
--- a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
+++ b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
@@ -1,6 +1,7 @@
 package Object::Remote::Role::Connector::PerlInterpreter;
 
 use IPC::Open2;
+use IO::Handle;
 use Object::Remote::ModuleSender;
 use Object::Remote::Handle;
 use Scalar::Util qw(blessed);
@@ -25,6 +26,8 @@ around connect => sub {
     class => 'Object::Remote::ModuleLoader',
     args => { module_sender => $self->module_sender }
   )->disarm_free;
+  require Object::Remote::Prompt;
+  Object::Remote::Prompt::maybe_set_prompt_command_on($conn);
   return $conn;
 };
 
@@ -43,10 +46,31 @@ sub _start_perl {
 sub _open2_for {
   my $self = shift;
   my ($foreign_stdin, $foreign_stdout, $pid) = $self->_start_perl(@_);
-  require Object::Remote::FatNode;
-  print $foreign_stdin $Object::Remote::FatNode::DATA, "__END__\n"
+  $foreign_stdin->autoflush(1);
+  print $foreign_stdin 'BEGIN { $ENV{OBJECT_REMOTE_DEBUG} = 1 }'."\n"
+    if $ENV{OBJECT_REMOTE_DEBUG};
+  print $foreign_stdin $self->fatnode_text
     or die "Failed to send fatpacked data to new node on '$_[0]': $!";
   return ($foreign_stdin, $foreign_stdout, $pid);
 }
 
+sub fatnode_text {
+  my ($self) = @_;
+  require Object::Remote::FatNode;
+  my $text = '';
+  $text .= 'BEGIN { $ENV{OBJECT_REMOTE_DEBUG} = 1 }'."\n"
+    if $ENV{OBJECT_REMOTE_DEBUG};
+  $text .= <<'END';
+$INC{'Object/Remote/FatNode.pm'} = __FILE__;
+$Object::Remote::FatNode::DATA = <<'ENDFAT';
+END
+  $text .= $Object::Remote::FatNode::DATA;
+  $text .= "ENDFAT\n";
+  $text .= <<'END';
+eval $Object::Remote::FatNode::DATA;
+END
+  $text .= "__END__\n";
+  return $text;
+}
+
 1;