Use new Catalyst features

diff --git a/lib/Gitalist/Script/CGI.pm b/lib/Gitalist/Script/CGI.pm
deleted file mode 100644 (file)
index 9e3e365..0000000
--- a/lib/Gitalist/Script/CGI.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package Gitalist::Script::CGI;
-use Moose;
-use namespace::autoclean;
-
-extends 'Catalyst::Script::CGI';
-with 'Gitalist::ScriptRole';
-
-__PACKAGE__->meta->make_immutable;
-

diff --git a/lib/Gitalist/Script/FastCGI.pm b/lib/Gitalist/Script/FastCGI.pm
deleted file mode 100644 (file)
index 1cd1e9f..0000000
--- a/lib/Gitalist/Script/FastCGI.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package Gitalist::Script::FastCGI;
-use Moose;
-use namespace::autoclean;
-
-sub BUILD {
-    require FCGI; # Make IPC::Run happy
-    FCGI->VERSION(0.68);
-}
-
-extends 'Catalyst::Script::FastCGI';
-with 'Gitalist::ScriptRole';
-
-__PACKAGE__->meta->make_immutable;

diff --git a/lib/Gitalist/Script/Server.pm b/lib/Gitalist/Script/Server.pm
deleted file mode 100644 (file)
index 8e9b539..0000000
--- a/lib/Gitalist/Script/Server.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package Gitalist::Script::Server;
-use Moose;
-use namespace::autoclean;
-
-extends 'Catalyst::Script::Server';
-with 'Gitalist::ScriptRole';
-
-__PACKAGE__->meta->make_immutable;
-

diff --git a/lib/Gitalist/ScriptRole.pm b/lib/Gitalist/TraitFor/Script.pm
similarity index 94%
rename from lib/Gitalist/ScriptRole.pm
rename to lib/Gitalist/TraitFor/Script.pm
index 65de673..17ad1f9 100644 (file)
--- a/lib/Gitalist/ScriptRole.pm
+++ b/lib/Gitalist/TraitFor/Script.pm
@@ -1,4 +1,4 @@
-package Gitalist::ScriptRole;
+package Gitalist::TraitFor::Script;
 use Moose::Role;
 use MooseX::Types::Moose qw/ Undef /;
 use MooseX::Types::Common::String qw/NonEmptySimpleStr/;

diff --git a/lib/Gitalist/TraitFor/Script/FastCGI.pm b/lib/Gitalist/TraitFor/Script/FastCGI.pm
new file mode 100644 (file)
index 0000000..0d1c545
--- /dev/null
+++ b/lib/Gitalist/TraitFor/Script/FastCGI.pm
@@ -0,0 +1,13 @@
+package Gitalist::TraitFor::Script::FastCGI;
+use Moose::Role;
+use namespace::autoclean;
+
+sub BUILD {}
+
+after BUILD => sub {
+    require FCGI; # Make IPC::Run happy
+    FCGI->VERSION(0.68);
+};
+
+1;
+