[SCM] libmessage-passing-perl Debian packaging branch, master, updated. debian/0.111-3-14-g44f6e88

Tomas Doran bobtfish at bobtfish.net
Mon May 6 11:57:21 UTC 2013


The following commit has been merged in the master branch:
commit f4f7e895192537fdd9c3f1e06ee091da8acaa562
Author: Tomas Doran <bobtfish at bobtfish.net>
Date:   Sat Jul 7 14:57:51 2012 +0100

    Mostly change everything over

diff --git a/Makefile.PL b/Makefile.PL
index 4b70e73..6e57644 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -15,13 +15,14 @@ resources(
 
 requires 'Moo';
 requires 'Moose';
-requires 'namespace::autoclean';
+requires 'namespace::clean';
+requires 'Module::Runtime';
 requires 'AnyEvent';
 requires 'MooseX::ConfigFromFile';
 requires 'Config::Any';
+requires 'MooX::Types::MooseLike';
 requires 'MooseX::Types';
 requires 'MooseX::Types::Common';
-requires 'MooseX::Types::LoadableClass';
 requires 'String::RewritePrefix';
 requires 'JSON' => '2.0';
 requires 'MooseX::Getopt';
diff --git a/lib/Message/Passing.pm b/lib/Message/Passing.pm
index f97358c..32d3189 100644
--- a/lib/Message/Passing.pm
+++ b/lib/Message/Passing.pm
@@ -2,7 +2,7 @@ package Message::Passing;
 use Moose;
 use Getopt::Long qw(:config pass_through);
 use Config::Any;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 use 5.8.4;
 
 use Message::Passing::DSL;
@@ -64,7 +64,7 @@ sub build_chain {
         };
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/DSL.pm b/lib/Message/Passing/DSL.pm
index 23c7910..59bdc00 100644
--- a/lib/Message/Passing/DSL.pm
+++ b/lib/Message/Passing/DSL.pm
@@ -120,7 +120,7 @@ Message::Passing::DSL - An easy way to make chains of Message::Passing component
     has socket_bind => (
         is => 'ro',
         isa => 'Str',
-        default => 'tcp://*:5558',
+        default => sub { 'tcp://*:5558' },
     );
 
     sub build_chain {
diff --git a/lib/Message/Passing/DSL/Factory.pm b/lib/Message/Passing/DSL/Factory.pm
index 309da4e..4cd7d01 100644
--- a/lib/Message/Passing/DSL/Factory.pm
+++ b/lib/Message/Passing/DSL/Factory.pm
@@ -2,7 +2,7 @@ package Message::Passing::DSL::Factory;
 use Moose;
 use String::RewritePrefix;
 use Message::Passing::Output::STDERR;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 sub expand_class_name {
     my ($self, $type, $name) = @_;
@@ -84,7 +84,7 @@ sub make {
     return $out;
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/All.pm b/lib/Message/Passing/Filter/All.pm
index c8096d5..2c414ac 100644
--- a/lib/Message/Passing/Filter/All.pm
+++ b/lib/Message/Passing/Filter/All.pm
@@ -1,6 +1,6 @@
 package Message::Passing::Filter::All;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
@@ -8,7 +8,7 @@ sub filter {
     return;
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/Decoder/Bzip2.pm b/lib/Message/Passing/Filter/Decoder/Bzip2.pm
index 856dc09..21d8069 100644
--- a/lib/Message/Passing/Filter/Decoder/Bzip2.pm
+++ b/lib/Message/Passing/Filter/Decoder/Bzip2.pm
@@ -1,7 +1,7 @@
 package Message::Passing::Filter::Decoder::Bzip2;
-use Moose;
+use Moo;
 use Compress::Bzip2;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
@@ -10,6 +10,6 @@ sub filter {
     Compress::Bzip2::memBunzip($message);
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
diff --git a/lib/Message/Passing/Filter/Decoder/Crypt/CBC.pm b/lib/Message/Passing/Filter/Decoder/Crypt/CBC.pm
index 61ba828..0a5fc48 100644
--- a/lib/Message/Passing/Filter/Decoder/Crypt/CBC.pm
+++ b/lib/Message/Passing/Filter/Decoder/Crypt/CBC.pm
@@ -1,7 +1,7 @@
 package Message::Passing::Filter::Decoder::Crypt::CBC;
-use Moose;
+use Moo;
 use Compress::Zlib;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with qw/
     Message::Passing::Role::Filter
@@ -13,6 +13,6 @@ sub filter {
     $self->cbc->decrypt($message);
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
diff --git a/lib/Message/Passing/Filter/Decoder/Gzip.pm b/lib/Message/Passing/Filter/Decoder/Gzip.pm
index 455d8d6..932499c 100644
--- a/lib/Message/Passing/Filter/Decoder/Gzip.pm
+++ b/lib/Message/Passing/Filter/Decoder/Gzip.pm
@@ -1,7 +1,7 @@
 package Message::Passing::Filter::Decoder::Gzip;
-use Moose;
+use Moo;
 use Compress::Zlib;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
@@ -10,6 +10,6 @@ sub filter {
     Compress::Zlib::memGunzip($message);
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
diff --git a/lib/Message/Passing/Filter/Decoder/JSON.pm b/lib/Message/Passing/Filter/Decoder/JSON.pm
index 918c243..935fe1d 100644
--- a/lib/Message/Passing/Filter/Decoder/JSON.pm
+++ b/lib/Message/Passing/Filter/Decoder/JSON.pm
@@ -1,13 +1,13 @@
 package Message::Passing::Filter::Decoder::JSON;
-use Moose;
+use Moo;
 use JSON qw/ from_json /;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
 sub filter { ref($_[1]) ? $_[1] : from_json( $_[1], { utf8  => 1 } ) }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/Decoder/Null.pm b/lib/Message/Passing/Filter/Decoder/Null.pm
index c1af08d..8544aa6 100644
--- a/lib/Message/Passing/Filter/Decoder/Null.pm
+++ b/lib/Message/Passing/Filter/Decoder/Null.pm
@@ -1,10 +1,10 @@
 package Message::Passing::Filter::Decoder::Null;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use namespace::clean -except => 'meta';
 
 extends 'Message::Passing::Filter::Null';
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/Delay.pm b/lib/Message/Passing/Filter/Delay.pm
index e0d1d94..ca18c03 100644
--- a/lib/Message/Passing/Filter/Delay.pm
+++ b/lib/Message/Passing/Filter/Delay.pm
@@ -1,8 +1,9 @@
 package Message::Passing::Filter::Delay;
-use Moose;
+use Moo;
+use MooX::Types::MooseLike::Base qw( :all );
 use AnyEvent;
 use Scalar::Util qw/ weaken /;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with qw/
     Message::Passing::Role::Input
@@ -10,7 +11,7 @@ with qw/
 /;
 
 has delay_for => (
-    isa => 'Num',
+    isa => Num,
     is => 'ro',
     required => 1,
 );
@@ -27,7 +28,7 @@ sub consume {
     );
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/Encoder/Bzip2.pm b/lib/Message/Passing/Filter/Encoder/Bzip2.pm
index 29f5fd0..93533a0 100644
--- a/lib/Message/Passing/Filter/Encoder/Bzip2.pm
+++ b/lib/Message/Passing/Filter/Encoder/Bzip2.pm
@@ -1,7 +1,7 @@
 package Message::Passing::Filter::Encoder::Bzip2;
-use Moose;
+use Moo;
 use Compress::Bzip2;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
@@ -10,6 +10,6 @@ sub filter {
     Compress::Bzip2::memBzip($message);
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
diff --git a/lib/Message/Passing/Filter/Encoder/Crypt/CBC.pm b/lib/Message/Passing/Filter/Encoder/Crypt/CBC.pm
index c7e3b1f..86b8a7d 100644
--- a/lib/Message/Passing/Filter/Encoder/Crypt/CBC.pm
+++ b/lib/Message/Passing/Filter/Encoder/Crypt/CBC.pm
@@ -1,7 +1,7 @@
 package Message::Passing::Filter::Encoder::Crypt::CBC;
-use Moose;
+use Moo;
 use Compress::Zlib;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with qw/
     Message::Passing::Role::Filter
@@ -13,6 +13,6 @@ sub filter {
     $self->cbc->encrypt($message);
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
diff --git a/lib/Message/Passing/Filter/Encoder/Gzip.pm b/lib/Message/Passing/Filter/Encoder/Gzip.pm
index 3b4b430..16583f1 100644
--- a/lib/Message/Passing/Filter/Encoder/Gzip.pm
+++ b/lib/Message/Passing/Filter/Encoder/Gzip.pm
@@ -1,7 +1,7 @@
 package Message::Passing::Filter::Encoder::Gzip;
-use Moose;
+use Moo;
 use Compress::Zlib;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
@@ -10,6 +10,6 @@ sub filter {
     Compress::Zlib::memGzip($message);
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
diff --git a/lib/Message/Passing/Filter/Encoder/JSON.pm b/lib/Message/Passing/Filter/Encoder/JSON.pm
index 2e3def5..4a97340 100644
--- a/lib/Message/Passing/Filter/Encoder/JSON.pm
+++ b/lib/Message/Passing/Filter/Encoder/JSON.pm
@@ -1,14 +1,15 @@
 package Message::Passing::Filter::Encoder::JSON;
-use Moose;
+use Moo;
+use MooX::Types::MooseLike::Base qw/ Bool /;
 use JSON qw/ to_json /;
 use Scalar::Util qw/ blessed /;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
 has pretty => (
-    isa => 'Bool',
-    default => 0,
+    isa => Bool,
+    default => sub { 0 },
     is => 'ro',
 );
 
@@ -26,7 +27,7 @@ sub filter {
     to_json( $message, { utf8  => 1, $self->pretty ? (pretty => 1) : () } )
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/Encoder/Null.pm b/lib/Message/Passing/Filter/Encoder/Null.pm
index 0ad73b3..1762763 100644
--- a/lib/Message/Passing/Filter/Encoder/Null.pm
+++ b/lib/Message/Passing/Filter/Encoder/Null.pm
@@ -1,10 +1,10 @@
 package Message::Passing::Filter::Encoder::Null;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use namespace::clean -except => 'meta';
 
 extends 'Message::Passing::Filter::Null';
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/Key.pm b/lib/Message/Passing/Filter/Key.pm
index 5332c9e..39728c6 100644
--- a/lib/Message/Passing/Filter/Key.pm
+++ b/lib/Message/Passing/Filter/Key.pm
@@ -1,26 +1,26 @@
 package Message::Passing::Filter::Key;
-use Moose;
-use Moose::Util::TypeConstraints;
-use namespace::autoclean;
+use Moo;
+use MooX::Types::MooseLike::Base qw/ Str /;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
 has key => (
-    isa => 'Str',
+    isa => Str,
     is => 'ro',
     required => 1,
 );
 
 has match => (
-    isa => 'Str',
+    isa => Str,
     is => 'ro',
     required => 1,
 );
 
 has match_type => (
     is => 'ro',
-    isa => enum(['regex', 'eq']),
-    default => 'eq',
+#    isa => enum(['regex', 'eq']),
+    default => sub { 'eq' },
 );
 
 has _re => (
@@ -51,7 +51,7 @@ sub filter {
     return $message;
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/Null.pm b/lib/Message/Passing/Filter/Null.pm
index 7b0066e..672a419 100644
--- a/lib/Message/Passing/Filter/Null.pm
+++ b/lib/Message/Passing/Filter/Null.pm
@@ -1,12 +1,12 @@
 package Message::Passing::Filter::Null;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Filter';
 
 sub filter { $_[1] }
 
-__PACKAGE__->meta->make_immutable;
+#
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Filter/T.pm b/lib/Message/Passing/Filter/T.pm
index 3c0c94c..b7aedb4 100644
--- a/lib/Message/Passing/Filter/T.pm
+++ b/lib/Message/Passing/Filter/T.pm
@@ -1,14 +1,13 @@
 package Message::Passing::Filter::T;
-use Moose;
-use MooseX::Types::Moose qw/ ArrayRef /;
-use Moose::Util::TypeConstraints;
-use namespace::autoclean;
+use Moo;
+use MooX::Types::MooseLike::Base qw/ ArrayRef /;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Input';
 with 'Message::Passing::Role::Output';
 
 has '+output_to' => (
-    isa => ArrayRef[role_type('Message::Passing::Role::Output')],
+#    isa => ArrayRef[role_type('Message::Passing::Role::Output')],
     is => 'ro',
     required => 1,
 );
@@ -20,7 +19,7 @@ sub consume {
     }
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Input/FileTail.pm b/lib/Message/Passing/Input/FileTail.pm
index 097c695..ce738c8 100644
--- a/lib/Message/Passing/Input/FileTail.pm
+++ b/lib/Message/Passing/Input/FileTail.pm
@@ -1,14 +1,15 @@
 package Message::Passing::Input::FileTail;
-use Moose;
+use Moo;
+use MooX::Types::MooseLike::Base qw/ Str Int /;
 use AnyEvent;
 use Scalar::Util qw/ weaken /;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Input';
 
 has filename => (
     is => 'ro',
-    isa => 'Str',
+    isa => Str,
     required => 1,
 );
 
@@ -45,7 +46,7 @@ sub BUILD {
     $self->_tail_handle;
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Input/Null.pm b/lib/Message/Passing/Input/Null.pm
index 749414d..2ed2e66 100644
--- a/lib/Message/Passing/Input/Null.pm
+++ b/lib/Message/Passing/Input/Null.pm
@@ -1,12 +1,12 @@
 package Message::Passing::Input::Null;
-use Moose;
+use Moo;
 use AnyEvent;
 use Try::Tiny;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Input';
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Input/STDIN.pm b/lib/Message/Passing/Input/STDIN.pm
index c1b0f40..f05e7f1 100644
--- a/lib/Message/Passing/Input/STDIN.pm
+++ b/lib/Message/Passing/Input/STDIN.pm
@@ -1,9 +1,9 @@
 package Message::Passing::Input::STDIN;
-use Moose;
+use Moo;
 use AnyEvent;
 use Try::Tiny;
 use Scalar::Util qw/ weaken /;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 with qw/
     Message::Passing::Role::Input
@@ -30,7 +30,7 @@ sub BUILD {
     $self->reader;
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Manual/Components.pod b/lib/Message/Passing/Manual/Components.pod
index 343f005..552d7e1 100644
--- a/lib/Message/Passing/Manual/Components.pod
+++ b/lib/Message/Passing/Manual/Components.pod
@@ -18,7 +18,7 @@ An example of doing this is:
 
     package Message::Passing::Script::WebHooks;
     use Moose;
-    use namespace::autoclean;
+    use namespace::clean -except => 'meta';
 
     extends 'Message::Passing';
 
diff --git a/lib/Message/Passing/Output/Callback.pm b/lib/Message/Passing/Output/Callback.pm
index 70cc945..7847519 100644
--- a/lib/Message/Passing/Output/Callback.pm
+++ b/lib/Message/Passing/Output/Callback.pm
@@ -1,9 +1,10 @@
 package Message::Passing::Output::Callback;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use MooX::Types::MooseLike::Base qw/ CodeRef /;
+use namespace::clean -except => 'meta';
 
 has cb => (
-    isa => 'CodeRef',
+    isa => CodeRef,
     is => 'ro',
 );
 
@@ -14,7 +15,7 @@ sub consume {
 
 with 'Message::Passing::Role::Output';
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Output/File.pm b/lib/Message/Passing/Output/File.pm
index 459b560..26b88e5 100644
--- a/lib/Message/Passing/Output/File.pm
+++ b/lib/Message/Passing/Output/File.pm
@@ -1,11 +1,12 @@
 package Message::Passing::Output::File;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use MooX::Types::MooseLike::Base qw/ Str Bool /;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Output';
 
 has filename => (
-    isa => 'Str',
+    isa => Str,
     is => 'ro',
     predicate => '_has_filename',
 );
@@ -18,8 +19,8 @@ has fh => (
 
 has append => (
     is => 'ro',
-    isa => 'Bool',
-    default => 1,
+    isa => Bool,
+    default => sub { 1 },
 );
 
 sub _build_fh {
@@ -45,7 +46,7 @@ sub consume {
     return 1;
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Output/IO/Handle.pm b/lib/Message/Passing/Output/IO/Handle.pm
index 11da874..a3a5c05 100644
--- a/lib/Message/Passing/Output/IO/Handle.pm
+++ b/lib/Message/Passing/Output/IO/Handle.pm
@@ -1,12 +1,12 @@
 package Message::Passing::Output::IO::Handle;
-use Moose;
-use Moose::Util::TypeConstraints;
-use namespace::autoclean;
+use Moo;
+#use Moose::Util::TypeConstraints;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Output';
 
 has fh => (
-    isa => duck_type([qw/ print /]),
+#    isa => duck_type([qw/ print /]),
     is => 'ro',
     required => 1,
 );
@@ -21,7 +21,7 @@ sub consume {
     $self->fh->print(shift() . $self->append);
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Output/Null.pm b/lib/Message/Passing/Output/Null.pm
index 37552b9..6fb8549 100644
--- a/lib/Message/Passing/Output/Null.pm
+++ b/lib/Message/Passing/Output/Null.pm
@@ -1,12 +1,12 @@
 package Message::Passing::Output::Null;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Output';
 
 sub consume {}
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Output/STDERR.pm b/lib/Message/Passing/Output/STDERR.pm
index dbc6658..5e4402a 100644
--- a/lib/Message/Passing/Output/STDERR.pm
+++ b/lib/Message/Passing/Output/STDERR.pm
@@ -1,6 +1,6 @@
 package Message::Passing::Output::STDERR;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Output';
 
@@ -10,7 +10,7 @@ sub consume {
     print STDERR shift() . "\n";
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Output/STDOUT.pm b/lib/Message/Passing/Output/STDOUT.pm
index 8d9a4e9..bd9a873 100644
--- a/lib/Message/Passing/Output/STDOUT.pm
+++ b/lib/Message/Passing/Output/STDOUT.pm
@@ -1,6 +1,6 @@
 package Message::Passing::Output::STDOUT;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use namespace::clean -except => 'meta';
 
 with 'Message::Passing::Role::Output';
 
@@ -10,7 +10,7 @@ sub consume {
     print STDOUT shift() . "\n";
 }
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Output/Test.pm b/lib/Message/Passing/Output/Test.pm
index cbb3750..3989288 100644
--- a/lib/Message/Passing/Output/Test.pm
+++ b/lib/Message/Passing/Output/Test.pm
@@ -1,6 +1,7 @@
 package Message::Passing::Output::Test;
-use Moose;
-use namespace::autoclean;
+use Moo;
+use MooX::Types::MooseLike::Base qw/ ArrayRef /;
+use namespace::clean -except => 'meta';
 
 extends 'Message::Passing::Output::Callback';
 
@@ -8,24 +9,24 @@ has '+cb' => (
     default => sub { sub {} },
 );
 
-has messages => (
-    isa => 'ArrayRef',
+has _messages => (
+    is => 'ro',
+    isa => ArrayRef,
     default => sub { [] },
-    traits => ['Array'],
-    handles => {
-        consume_test => 'push',
-        message_count => 'count',
-        messages => 'elements',
-    },
     clearer => 'clear_messages',
     lazy => 1,
 );
 
+sub messages { @{ $_[0]->_messages } }
+sub consume_test { push(@{$_[0]->_messages }, $_[1]) }
+sub message_count { scalar @{ $_[0]->_messages } }
+
+
 after consume => sub {
     shift()->consume_test(@_);
 };
 
-__PACKAGE__->meta->make_immutable;
+
 1;
 
 =head1 NAME
diff --git a/lib/Message/Passing/Role/CLIComponent.pm b/lib/Message/Passing/Role/CLIComponent.pm
index b26a362..077dd11 100644
--- a/lib/Message/Passing/Role/CLIComponent.pm
+++ b/lib/Message/Passing/Role/CLIComponent.pm
@@ -4,7 +4,7 @@ use Moose::Util::TypeConstraints;
 use Message::Passing::Types qw/
     Hash_from_JSON
 /;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 parameter name => (
     isa      => 'Str',
diff --git a/lib/Message/Passing/Role/ConnectionManager.pm b/lib/Message/Passing/Role/ConnectionManager.pm
index 11be2ed..3f7610f 100644
--- a/lib/Message/Passing/Role/ConnectionManager.pm
+++ b/lib/Message/Passing/Role/ConnectionManager.pm
@@ -1,7 +1,7 @@
 package Message::Passing::Role::ConnectionManager;
 use Moose::Role;
 use Scalar::Util qw/ blessed weaken /;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 requires '_build_connection';
 
diff --git a/lib/Message/Passing/Role/Crypt/CBC.pm b/lib/Message/Passing/Role/Crypt/CBC.pm
index f385cde..44f593f 100644
--- a/lib/Message/Passing/Role/Crypt/CBC.pm
+++ b/lib/Message/Passing/Role/Crypt/CBC.pm
@@ -1,16 +1,19 @@
 package Message::Passing::Role::Crypt::CBC;
-use Moose::Role;
+use Moo::Role;
+use MooX::Types::MooseLike::Base qw/ Str /;
 use Crypt::CBC;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
-has [qw/
+foreach my $name (qw/
     encryption_key
     encryption_cipher
-/] => (
-    isa => 'Str',
-    is => 'ro',
-    required => 1,
-);
+/) {
+    has $name => (
+        isa => Str,
+        is => 'ro',
+        required => 1,
+    );
+}
 
 # NOTE - We need a new CBC object per message, otherwise if we _EVER_ drop
 #        messages then we totally screw ourselves!
diff --git a/lib/Message/Passing/Role/Filter.pm b/lib/Message/Passing/Role/Filter.pm
index bfe1515..5acb9f1 100644
--- a/lib/Message/Passing/Role/Filter.pm
+++ b/lib/Message/Passing/Role/Filter.pm
@@ -1,6 +1,6 @@
 package Message::Passing::Role::Filter;
-use Moose::Role;
-use namespace::autoclean;
+use Moo::Role;
+use namespace::clean -except => 'meta';
 
 requires 'filter';
 
@@ -25,8 +25,8 @@ Message::Passing::Role::Filter - Simple abstraction for filtering messages
 =head1 SYNOPSIS
 
     package My::Filter;
-    use Moose;
-    use namespace::autoclean;
+    use Moo;
+    use namespace::clean -except => 'meta';
 
     with 'Message::Passing::Role::Filter';
 
diff --git a/lib/Message/Passing/Role/HasAConnection.pm b/lib/Message/Passing/Role/HasAConnection.pm
index 2e47490..a563607 100644
--- a/lib/Message/Passing/Role/HasAConnection.pm
+++ b/lib/Message/Passing/Role/HasAConnection.pm
@@ -1,7 +1,8 @@
 package Message::Passing::Role::HasAConnection;
-use Moose::Role;
-use Moose::Util::TypeConstraints;
-use namespace::autoclean;
+use Moo::Role;
+use Module::Runtime qw/ require_module /;
+use Carp qw/ confess /;
+use namespace::clean -except => 'meta';
 
 with qw/
     Message::Passing::Role::HasTimeoutAndReconnectAfter
@@ -14,7 +15,7 @@ requires 'connected';
 has connection_manager => (
     is => 'ro',
     lazy => 1,
-    isa => duck_type([qw/subscribe_to_connect/]),
+#    isa => duck_type([qw/subscribe_to_connect/]),
     builder => '_build_connection_manager',
 );
 
@@ -25,7 +26,7 @@ sub _build_connection_manager {
             && $self->can('_connection_manager_class');
     my %attrs = map { $_ => $self->$_ } (@{ $self->_connection_manager_attributes }, qw/timeout reconnect_after error/);
     my $class = $self->_connection_manager_class;
-    Class::MOP::load_class($class);
+    require_module($class);
     $class->new(%attrs);
 }
 
diff --git a/lib/Message/Passing/Role/HasErrorChain.pm b/lib/Message/Passing/Role/HasErrorChain.pm
index f706933..0ed62e2 100644
--- a/lib/Message/Passing/Role/HasErrorChain.pm
+++ b/lib/Message/Passing/Role/HasErrorChain.pm
@@ -1,10 +1,10 @@
 package Message::Passing::Role::HasErrorChain;
-use Moose::Role;
+use Moo::Role;
 use Message::Passing::Output::STDERR;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 has error => (
-    does => 'Message::Passing::Role::Output',
+#    does => 'Message::Passing::Role::Output',
     is => 'ro',
     default => sub {
         Message::Passing::Output::STDERR->new;
@@ -22,18 +22,18 @@ Message::Passing::Role::HasErrorChain - A role for components which can report e
     # Note this is an example package, and does not really exist!
     package Message::Passing::Output::ErrorAllMessages;
     use Moose;
-    use namespace::autoclean;
-    
+    use namespace::clean -except => 'meta';
+
     with qw/
         Message::Passing::Role::Output
         Message::Passing::Role::HasErrorChain
     /;
-    
+
     sub consume {
         my ($self, $message) = @_;
         $self->error->consume($message);
     }
-    
+
 =head1 DESCRIPTION
 
 Some components can create an error stream in addition to a message stream.
diff --git a/lib/Message/Passing/Role/HasHostnameAndPort.pm b/lib/Message/Passing/Role/HasHostnameAndPort.pm
index 631ffba..3b81247 100644
--- a/lib/Message/Passing/Role/HasHostnameAndPort.pm
+++ b/lib/Message/Passing/Role/HasHostnameAndPort.pm
@@ -1,18 +1,19 @@
 package Message::Passing::Role::HasHostnameAndPort;
-use Moose::Role;
-use namespace::autoclean;
+use Moo::Role;
+use MooX::Types::MooseLike::Base qw/ Str Int /;
+use namespace::clean -except => 'meta';
 
 requires '_default_port';
 
 has hostname => (
     is => 'ro',
-    isa => 'Str',
+    isa => Str,
     required => 1,
 );
 
 has port => (
     is => 'ro',
-    isa => 'Int',
+    isa => Int,
     builder => '_default_port',
 );
 
diff --git a/lib/Message/Passing/Role/HasTimeoutAndReconnectAfter.pm b/lib/Message/Passing/Role/HasTimeoutAndReconnectAfter.pm
index 208bd91..71d0b66 100644
--- a/lib/Message/Passing/Role/HasTimeoutAndReconnectAfter.pm
+++ b/lib/Message/Passing/Role/HasTimeoutAndReconnectAfter.pm
@@ -1,15 +1,16 @@
 package Message::Passing::Role::HasTimeoutAndReconnectAfter;
-use Moose::Role;
-use namespace::autoclean;
+use Moo::Role;
+use MooX::Types::MooseLike::Base qw/ Num /;
+use namespace::clean -except => 'meta';
 
 has timeout => (
-    isa => 'Num',
+    isa => Num,
     is => 'ro',
     default => sub { 30 },
 );
 
 has reconnect_after => (
-    isa => 'Num',
+    isa => Num,
     is => 'ro',
     default => sub { 2 },
 );
diff --git a/lib/Message/Passing/Role/HasUsernameAndPassword.pm b/lib/Message/Passing/Role/HasUsernameAndPassword.pm
index 4325062..2febef8 100644
--- a/lib/Message/Passing/Role/HasUsernameAndPassword.pm
+++ b/lib/Message/Passing/Role/HasUsernameAndPassword.pm
@@ -1,12 +1,15 @@
 package Message::Passing::Role::HasUsernameAndPassword;
-use Moose::Role;
-use namespace::autoclean;
+use Moo::Role;
+use MooX::Types::MooseLike::Base qw/ Str /;
+use namespace::clean -except => 'meta';
 
-has [qw/ username password /] => (
-    is => 'ro',
-    isa => 'Str',
-    required => 1,
-);
+foreach my $name (qw/ username password /) {
+    has $name  => (
+        is => 'ro',
+        isa => Str,
+        required => 1,
+    );
+}
 
 1;
 
diff --git a/lib/Message/Passing/Role/Input.pm b/lib/Message/Passing/Role/Input.pm
index 0f61b57..5a7bfc0 100644
--- a/lib/Message/Passing/Role/Input.pm
+++ b/lib/Message/Passing/Role/Input.pm
@@ -1,16 +1,16 @@
 package Message::Passing::Role::Input;
-use Moose::Role;
+use Moo::Role;
 use JSON qw/ from_json /;
-use Message::Passing::Types qw/
-    Output_Type
-/;
-use namespace::autoclean;
+#use Message::Passing::Types qw/
+#    Output_Type
+#/;
+use namespace::clean -except => 'meta';
 
 has output_to => (
-    isa => Output_Type,
+#    isa => Output_Type,
     is => 'ro',
     required => 1,
-    coerce => 1,
+#    coerce => 1,
 );
 
 1;
diff --git a/lib/Message/Passing/Role/Script.pm b/lib/Message/Passing/Role/Script.pm
index 250417a..1b443a7 100644
--- a/lib/Message/Passing/Role/Script.pm
+++ b/lib/Message/Passing/Role/Script.pm
@@ -4,7 +4,7 @@ use Getopt::Long qw(:config pass_through);
 use POSIX qw(setuid setgid);
 use Moose::Util::TypeConstraints;
 use Message::Passing::DSL;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 requires 'build_chain';
 
diff --git a/lib/Message/Passing/Types.pm b/lib/Message/Passing/Types.pm
index 5b49659..3de85ca 100644
--- a/lib/Message/Passing/Types.pm
+++ b/lib/Message/Passing/Types.pm
@@ -6,7 +6,7 @@ use MooseX::Types::Moose qw/ Str HashRef ArrayRef /;
 use MooseX::Types::Common::String qw/ NonEmptySimpleStr /;
 use MooseX::Getopt;
 use Try::Tiny;
-use namespace::autoclean;
+use namespace::clean -except => 'meta';
 
 use MooseX::Types -declare => [qw{
     Output_Type

-- 
libmessage-passing-perl Debian packaging



More information about the Pkg-perl-cvs-commits mailing list