From: Florian Ragwitz <rafl@debian.org>
Date: Sun, 5 Dec 2010 13:00:18 +0000 (+0000)
Subject: Merge remote branch 'svn/trunk' into psgi
X-Git-Tag: 5.89000~14
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=182f8b1e3c426d62337e186c2409c555794152d7

Merge remote branch 'svn/trunk' into psgi

svn/trunk:
Rename --title to --proc_title as that makes more sense. Remove -t option as it's confusing..
Update changelog

Conflicts:
lib/Catalyst/Engine/FastCGI.pm
lib/Catalyst/Script/FastCGI.pm
t/aggregate/unit_core_script_fastcgi.t
---

182f8b1e3c426d62337e186c2409c555794152d7
diff --cc lib/Catalyst/Script/FastCGI.pm
index 02ff9bd,bad4af6..a67aa57
--- a/lib/Catalyst/Script/FastCGI.pm
+++ b/lib/Catalyst/Script/FastCGI.pm
@@@ -56,49 -55,24 +56,47 @@@ has nproc => 
      documentation => 'Specify a number of child processes',
  );
  
- has title => (
+ has proc_title => (
      traits        => [qw(Getopt)],
-     cmd_aliases   => 't',
      isa           => Str,
      is            => 'ro',
 +    lazy          => 1,
 +    builder       => '_build_proc_title',
      documentation => 'Set the process title',
  );
  
 +sub _build_proc_title {
 +    my ($self) = @_;
 +    return sprintf 'perl-fcgi-pm [%s]', $self->application_name;
 +}
 +
 +sub BUILD {
 +    my ($self) = @_;
-     $self->title;
++    $self->proc_title;
 +}
 +
 +sub _plack_loader_args {
 +    my ($self) = shift;
 +    return (
 +        map { $_->[0] => $self->${ \($_->[1] ? $_->[1]->[0] : $_->[0]) } }
 +        Data::OptList::mkopt([
-             qw/pidfile listen manager nproc keep_stderr/,
++            qw/pidfile listen manager nproc keep_stderr proc_title/,
 +            detach     => [ 'daemon' ],
-             proc_title => [ 'title'  ],
 +        ])
 +    );
 +}
 +
  sub _application_args {
      my ($self) = shift;
      return (
          $self->listen,
          {
 -            nproc   => $self->nproc,
 -            pidfile => $self->pidfile,
 -            manager => $self->manager,
 -            detach  => $self->daemon,
 +            nproc       => $self->nproc,
 +            pidfile     => $self->pidfile,
 +            manager     => $self->manager,
 +            detach      => $self->daemon,
              keep_stderr => $self->keeperr,
-             title       => $self->title,
 -            proc_title => $self->proc_title,
++            proc_title  => $self->proc_title,
          }
      );
  }
diff --cc t/aggregate/unit_core_script_fastcgi.t
index 06300f5,27f245a..7201385
--- a/t/aggregate/unit_core_script_fastcgi.t
+++ b/t/aggregate/unit_core_script_fastcgi.t
@@@ -63,8 -60,12 +62,8 @@@ sub testOption 
  # Returns the hash expected when no flags are passed
  sub opthash {
      return {
 -        pidfile => undef,
 -        keep_stderr => undef,
 -        detach => undef,
 -        nproc => undef,
 -        manager => undef,
 -        proc_title => undef,
 +        (map { ($_ => undef) } qw(pidfile keep_stderr detach nproc manager)),
-         title => 'perl-fcgi-pm [TestAppToTestScripts]',
++        proc_title => 'perl-fcgi-pm [TestAppToTestScripts]',
          @_,
      };
  }