X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnector%2FSSH.pm;h=73bc2fc2630ad7b775b8e49190fc0dde706db92e;hp=7d6142c54bbb54b8a874b9ae72c7929b39ee5e79;hb=bef36e73e4257b2ba8e59eb55661ffc51d8a620a;hpb=8ba4f2e3adb9a1fda64b463b34a4306c9034359a

diff --git a/lib/Object/Remote/Connector/SSH.pm b/lib/Object/Remote/Connector/SSH.pm
index 7d6142c..73bc2fc 100644
--- a/lib/Object/Remote/Connector/SSH.pm
+++ b/lib/Object/Remote/Connector/SSH.pm
@@ -1,42 +1,41 @@
 package Object::Remote::Connector::SSH;
 
-use Object::Remote::FatNode;
 use Object::Remote::ModuleSender;
 use Object::Remote::Handle;
-use IPC::Open2;
+use String::ShellQuote;
 use Moo;
 
-with 'Object::Remote::Role::Connector';
+with 'Object::Remote::Role::Connector::PerlInterpreter';
 
-sub _open2_for {
-  my $self = shift;
-  my $pid = open2(my $ssh_stdout, my $ssh_stdin, 'ssh', $_[0], 'perl', '-')
-    or die "Failed to start ssh connection: $!";;
-  print $ssh_stdin $Object::Remote::FatNode::DATA, "__END__\n";
-  return ($ssh_stdin, $ssh_stdout, $pid);
-}
+has ssh_to => (is => 'ro', required => 1);
 
-around connect => sub {
-  my ($orig, $self) = (shift, shift);
-  my $conn = $self->$orig(@_);
-  Object::Remote::Handle->new(
-    connection => $conn,
-    class => 'Object::Remote::ModuleLoader',
-    args => { module_sender => Object::Remote::ModuleSender->new }
-  )->disarm_free;
-  return $conn;
-};
+has ssh_perl_command => (is => 'lazy');
+
+has ssh_options => (is => 'ro', default => sub { [ '-A' ] });
+
+has ssh_command => (is => 'ro', default => sub { 'ssh' });
 
-sub _ssh_object_for {
-  my ($self, $on) = @_;
-  $self->ssh_masters->{$on} ||= Net::OpenSSH->new($on);
+sub _build_ssh_perl_command {
+  my ($self) = @_;
+  my $perl_command = $self->perl_command;
+
+  return [
+    do { my $c = $self->ssh_command; ref($c) ? @$c : $c },
+    @{$self->ssh_options}, $self->ssh_to,
+    shell_quote(@$perl_command),
+  ];
 }
 
-push @Object::Remote::Connection::Guess, sub { 
+sub final_perl_command { shift->ssh_perl_command }
+
+no warnings 'once';
+
+push @Object::Remote::Connection::Guess, sub {
   for ($_[0]) {
     # 0-9 a-z _ - first char, those or . subsequent - hostnamish
-    if (defined and !ref and /^(?:.*?\@)?[\w\-][\w\-\.]*/) {
-      return __PACKAGE__->new->connect($_[0]);
+    if (defined and !ref and /^(?:.*?\@)?[\w\-][\w\-\.]/) {
+      my $host = shift(@_);
+      return __PACKAGE__->new(@_, ssh_to => $host);
     }
   }
   return;