merge from trunk

diff --cc lib/Catalyst/Restarter.pm
index a31c638,0000000..33b3d17
mode 100644,000000..100644
--- 1/lib/Catalyst/Restarter.pm
--- /dev/null
+++ b/lib/Catalyst/Restarter.pm
@@@ -1,93 -1,0 +1,145 @@@
 +package Catalyst::Restarter;
 +
 +use Moose;
 +
 +use Catalyst::Watcher;
 +use File::Spec;
 +use FindBin;
 +use namespace::clean -except => 'meta';
 +
 +has restart_sub => (
 +    is       => 'ro',
 +    isa      => 'CodeRef',
 +    required => 1,
 +);
 +
 +has _watcher => (
 +    is  => 'rw',
 +    isa => 'Catalyst::Watcher',
 +);
 +
 +has _child => (
 +    is  => 'rw',
 +    isa => 'Int',
 +);
 +
 +sub BUILD {
 +    my $self = shift;
 +    my $p    = shift;
 +
 +    delete $p->{restart_sub};
 +
 +    # We could make this lazily, but this lets us check that we
 +    # received valid arguments for the watcher up front.
 +    $self->_watcher( Catalyst::Watcher->new( %{$p} ) );
 +}
 +
 +sub run_and_watch {
 +    my $self = shift;
 +
 +    $self->_fork_and_start;
 +
 +    return unless $self->_child;
 +
 +    $self->_restart_on_changes;
 +}
 +
 +sub _fork_and_start {
 +    my $self = shift;
 +
 +    if ( my $pid = fork ) {
 +        $self->_child($pid);
 +    }
 +    else {
 +        $self->restart_sub->();
 +    }
 +}
 +
 +sub _restart_on_changes {
 +    my $self = shift;
 +
 +    my $watcher = $self->_watcher;
 +
 +    while (1) {
 +        my @files = $watcher->find_changed_files
 +            or next;
 +
 +        print STDERR "Saw changes to the following files:\n";
 +        print STDERR " - $_->{file} ($_->{status})\n" for @files;
 +        print STDERR "\n";
 +        print STDERR "Attempting to restart the server\n\n";
 +
 +        if ( $self->_child ) {
 +            kill 2, $self->_child
 +                or die "Cannot send INT to child (" . $self->_child . "): $!";
 +        }
 +
 +        $self->_fork_and_start;
 +
 +        return unless $self->_child;
 +    }
 +}
 +
 +sub DEMOLISH {
 +    my $self = shift;
 +
 +    if ( $self->_child ) {
 +        kill 2, $self->_child;
 +    }
 +}
 +
 +__PACKAGE__->meta->make_immutable;
 +
 +1;
++
++__END__
++
++=head1 NAME
++
++Catalyst::Restarter - Uses Catalyst::Watcher to check for changed files and restart the server
++
++=head1 SYNOPSIS
++
++    my $watcher = Catalyst::Watcher->new(
++        directory => '/path/to/MyApp',
++        regex     => '\.yml$|\.yaml$|\.conf|\.pm$',
++        interval  => 3,
++    );
++
++    while (1) {
++        my @changed_files = $watcher->watch();
++    }
++
++=head1 DESCRIPTION
++
++This class monitors a directory of files for changes made to any file
++matching a regular expression. It correctly handles new files added to the
++application as well as files that are deleted.
++
++=head1 METHODS
++
++=head2 new ( directory => $path [, regex => $regex, delay => $delay ] )
++
++Creates a new Watcher object.
++
++=head2 find_changed_files
++
++Returns a list of files that have been added, deleted, or changed
++since the last time watch was called. Each element returned is a hash
++reference with two keys. The C<file> key contains the filename, and
++the C<status> key contains one of "modified", "added", or "deleted".
++
++=head1 SEE ALSO
++
++L<Catalyst>, L<Catalyst::Restarter>, <File::Modified>
++
++=head1 AUTHORS
++
++Catalyst Contributors, see Catalyst.pm
++
++=head1 COPYRIGHT
++
++This program is free software, you can redistribute it and/or modify
++it under the same terms as Perl itself.
++
++=cut