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=dbc988a906b798f706a96b892724cedfb28683b4;hp=0821c967938c6aadc7c6732a4c29f98e964daf25;hb=8506bc0849fa561ef232a09e0394c417bc437aa2;hpb=a9fdb55e205b30cfca1cee5f61ab0f1107f750d1

diff --git a/lib/Object/Remote/Connector/SSH.pm b/lib/Object/Remote/Connector/SSH.pm
index 0821c96..dbc988a 100644
--- a/lib/Object/Remote/Connector/SSH.pm
+++ b/lib/Object/Remote/Connector/SSH.pm
@@ -2,25 +2,40 @@ package Object::Remote::Connector::SSH;
 
 use Object::Remote::ModuleSender;
 use Object::Remote::Handle;
+use String::ShellQuote;
 use Moo;
 
 with 'Object::Remote::Role::Connector::PerlInterpreter';
 
-around _perl_command => sub {
-  my ($orig, $self, $target) = @_;
-  return 'ssh', $target, $self->$orig($target);
-};
+has ssh_to => (is => 'ro', required => 1);
+
+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),
+  ];
 }
 
+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]);
+      my $host = shift(@_);
+      return __PACKAGE__->new(@_, ssh_to => $host);
     }
   }
   return;