1 files changed, 86 insertions, 0 deletions
diff --git a/client/Scire.pm b/client/Scire.pm
index 8ae5973..5530ff3 100644
--- a/client/Scire.pm
+++ b/client/Scire.pm
@@ -33,5 +33,91 @@ sub set_filename {
 	}
 }
 
+package Scire::Communicator;
+
+use IPC::Open2;
+
+my ($SERVER_STDIN, $SERVER_STDOUT);
+
+sub new {
+	my $proto = shift;
+	my $class = ref($proto) || $proto;
+	my $self = {
+		port => 22,
+		user => scire,
+		server_script => "/usr/bin/scireserver.pl",
+#		SERVER_STDOUT => undef,
+#		SERVER_STDIN => undef,
+ 		@_ 
+	};
+	bless ($self, $class);
+	$self->build_connection_command();
+	return $self;
+}
+
+sub send_command {
+	my $self = shift;
+	my $cmd = shift;
+	my @args = @_;
+	my $tosend = "${cmd}";
+
+	for my $arg (@args) {
+		if($arg =~ /^[0-9]+$/) {
+			$tosend .= " ${arg}";
+		} else {
+			$arg =~ s/"/\\"/g;
+			$tosend .= " \"${arg}\"";
+		}
+	}
+#	debug("Sending: ${tosend}");
+	print SERVER_STDIN "${tosend}\n";
+	#FIXME WE NEED A TIMEOUT HERE OF SOME SORT!!
+	#if the server doesn't give you a newline this just hangs!
+	my $response = <SERVER_STDOUT>;
+#	debug("Got response: ${response}");
+	return $self->parse_response($response);
+}
+
+sub parse_response {
+	my $self = shift;
+	my $response = shift;
+	$response =~ /^(OK|ERROR)(?: (.+?))?\s*$/;
+	my ($status, $message) = ($1, $2);
+	return ($status, $message);
+}
+
+sub create_connection {
+	my $self = shift;
+	# XXX: How do we capture this error? $pid has a valid value even if the
+	# process fails to run, since it just returns the PID of the forked perl
+	# process. I tried adding 'or die' after it, but it didn't help since it
+	# doesn't fail in the main process. When it fails, it outputs an error
+	# to STDERR:
+	# open2: exec of ../server/scireserver.pl failed at ./scireclient.pl line 116
+	$self->{connection_pid} = open2(*SERVER_STDOUT, *SERVER_STDIN, $self->{connection_command});
+}
+
+sub build_connection_command {
+	my $self = shift;
+	# This will eventually be something like "ssh scire@${scireserver} /usr/bin/scireserver.pl"
+	my $connection_command = "ssh ";
+	$connection_command .= "-o BatchMode yes ";
+	$connection_command .= "-o SendEnv 'SCIRE_*' ";
+	$connection_command .= "-o ServerAliveInterval 15 -o ServerAliveCountMax 4 ";
+	if(defined($self->{port})) {
+		$connection_command .= "-o Port=$conf{port} ";
+	}
+	$connection_command .= "$self->{user}\@$self->{host} $self->{server_script}";
+
+	if (-d ".svn") {
+		# Overwrite $connection_command in the case of a dev environment for now
+		$connection_command = "../server/scireserver.pl";
+	}
+
+#	return $connection_command;
+	$self->{connection_command} = $connection_command;
+}
+
+
 1;