Released version 0.04

       * Add support for callbacks
       * Fix failing tests

Author: Jan Henning Thorsen

Changes

@@ -1,5 +1,9 @@
 Revision history for Mojo-IOLoop-ReadWriteFork
 
+0.04     Fri Nov 22 19:52:52 2013
+       * Add support for callbacks
+       * Fix failing tests
+
 0.03     Fri Nov 22 08:35:43 2013
        * A bit more relaxed test for cat.t: Running it on BSD results in
          "^D" at the end.

README

@@ -2,7 +2,7 @@ NAME
     Mojo::IOLoop::ReadWriteFork - Fork a process and read/write from it
 
 VERSION
-    0.03
+    0.04
 
 DESCRIPTION
     This class enable you to fork children which you can write data to and
@@ -31,8 +31,8 @@ SYNOPSIS
       });
 
       $fork->start(
-        program => 'cat',
-        program_args => [ '-' ],
+        program => 'bash',
+        program_args => [ -c => 'echo $YIKES foo bar baz' ],
         conduit => 'pty',
       );
 
@@ -63,6 +63,11 @@ ATTRIBUTES
 
 METHODS
   start
+      $self->start(
+        program => sub { my @program_args = @_; ... },
+        program_args => [ @data ],
+      );
+
       $self->start(
         program => $str,
         program_args => [@str],

lib/Mojo/IOLoop/ReadWriteFork.pm

@@ -6,7 +6,7 @@ Mojo::IOLoop::ReadWriteFork - Fork a process and read/write from it
 
 =head1 VERSION
 
-0.03
+0.04
 
 =head1 DESCRIPTION
 
@@ -38,8 +38,8 @@ and STDOUT are more than welcome.
   });
 
   $fork->start(
-    program => 'cat',
-    program_args => [ '-' ],
+    program => 'bash',
+    program_args => [ -c => 'echo $YIKES foo bar baz' ],
     conduit => 'pty',
   );
 
@@ -58,7 +58,7 @@ use constant CHUNK_SIZE => $ENV{MOJO_CHUNK_SIZE} || 131072;
 use constant DEBUG => $ENV{MOJO_READWRITE_FORK_DEBUG} || 0;
 use constant WAIT_PID_INTERVAL => $ENV{WAIT_PID_INTERVAL} || 0.01;
 
-our $VERSION = '0.03';
+our $VERSION = '0.04';
 
 =head1 EVENTS
 
@@ -102,6 +102,11 @@ has reactor => sub {
 
 =head2 start
 
+  $self->start(
+    program => sub { my @program_args = @_; ... },
+    program_args => [ @data ],
+  );
+
   $self->start(
     program => $str,
     program_args => [@str],
@@ -198,9 +203,6 @@ sub _start {
     warn "[$$] Starting $args->{program} @{ $args->{program_args} }\n" if DEBUG;
     close $stdin_write;
     close $stdout_read;
-    close STDIN;
-    close STDOUT;
-    close STDERR;
     open STDIN, '<&' . fileno $stdin_read or die $!;
     open STDOUT, '>&' . fileno $stdout_write or die $!;
     open STDERR, '>&' . fileno $stdout_write or die $!;
@@ -211,6 +213,7 @@ sub _start {
 
     if(ref $args->{program} eq 'CODE') {
       $args->{program}->(@{ $args->{program_args} });
+      exit 0;
     }
     else {
       exec $args->{program}, @{ $args->{program_args} };
@@ -260,8 +263,9 @@ sub write {
   my($self, $buffer) = @_;
 
   $self->{stdin_write} or return;
-  warn "[${ \$self->pid }] Write buffer (" .url_escape($buffer) .")\n" if DEBUG;
   print { $self->{stdin_write} } $buffer;
+  $self->{stdin_write}->flush or die "Write buffer (" .url_escape($buffer) .") failed: $!";
+  warn "[${ \$self->pid }] Wrote buffer (" .url_escape($buffer) .")\n" if DEBUG;
 }
 
 =head2 kill

t/bash.t

@@ -33,7 +33,7 @@ plan tests => 4;
     $run->start(
       program => 'bash',
       program_args => [ -c => 'echo $YIKES foo bar baz' ],
-      conduit => 'pipe',
+      conduit => 'pty',
     );
   }
 

t/cat.t renamed to t/callback.t

@@ -3,15 +3,13 @@ use Mojo::IOLoop::ReadWriteFork;
 use Test::More;
 use Test::Memory::Cycle;
 
-$ENV{PATH} ||= '';
-plan skip_all => 'cat is missing' unless grep { -x "$_/cat" } split /:/, $ENV{PATH};
 plan tests => 10;
 
 {
   my $run = Mojo::IOLoop::ReadWriteFork->new;
   my $output = '';
   my $closed = 0;
-  my $cycled;
+  my $read;
 
   memory_cycle_ok $run, 'no cycle after new()';
   $run->on(error => sub {
@@ -25,26 +23,30 @@ plan tests => 10;
   $run->on(read => sub {
     my($run, $buffer, $writer) = @_;
     $output .= $buffer;
-    memory_cycle_ok $run, 'no cycle inside read' unless $cycled++;
+    $run->write("line one\n") unless $read;
+    memory_cycle_ok $run, 'no cycle inside read' unless $read++;
   });
   memory_cycle_ok $run, 'no cycle after on()';
 
   eval { $run->start({ program_args => [] }) };
   like $@, qr{program is required input}, 'program is required';
   $run->start(
-    program => 'cat',
-    program_args => [ '-' ],
-    conduit => 'pty',
+    program => sub {
+      print join(" ", @_), "\n";
+      my $input = <STDIN>;
+      print $input;
+      print "line two\n";
+    },
+    program_args => [qw( some args )],
   );
 
   memory_cycle_ok $run, 'no cycle after start()';
   is $run->pid, 0, 'no pid' or diag $run->pid;
-  Mojo::IOLoop->timer(0.1, sub { $run->write("hello world\n\x04") });
   Mojo::IOLoop->timer(3 => sub { Mojo::IOLoop->stop }); # guard
   Mojo::IOLoop->start;
   memory_cycle_ok $run, 'no cycle after Mojo::IOLoop->start';
 
   like $run->pid, qr{^[1-9]\d+$}, 'got pid' or diag $run->pid;
-  like $output, qr/^hello world\W{1,2}hello world\W{1,2}/, 'got stdout from "cat -"' or diag $output;
+  like $output, qr/^some args\nline one\nline two\n/, 'got stdout from callback' or diag $output;
   is $closed, 1, "got close event";
 }