X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnector%2FSSH.pm;h=73bc2fc2630ad7b775b8e49190fc0dde706db92e;hb=dd6e1327e96d5488e34f7519d9d3290627c9bbe8;hp=4a0776289953d3a34f8d7359fe17b04963d004bc;hpb=498c4ad5b1cc2db13c7b581b44ff3f6b9e33eaba;p=scpubgit%2FObject-Remote.git diff --git a/lib/Object/Remote/Connector/SSH.pm b/lib/Object/Remote/Connector/SSH.pm index 4a07762..73bc2fc 100644 --- a/lib/Object/Remote/Connector/SSH.pm +++ b/lib/Object/Remote/Connector/SSH.pm @@ -2,6 +2,7 @@ package Object::Remote::Connector::SSH; use Object::Remote::ModuleSender; use Object::Remote::Handle; +use String::ShellQuote; use Moo; with 'Object::Remote::Role::Connector::PerlInterpreter'; @@ -10,20 +11,31 @@ 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 _build_ssh_perl_command { my ($self) = @_; - return [ 'ssh', '-A', $self->ssh_to, @{$self->perl_command} ]; + 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 { +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(ssh_to => $_[0]); + my $host = shift(@_); + return __PACKAGE__->new(@_, ssh_to => $host); } } return;