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

[Tomas Doran]

The following commit has been merged in the master branch:
commit fcf04669249acfafa6f17c0df0848c61f7fb8a76
Author: Tomas Doran <bobtfish at bobtfish.net>
Date:   Sat Jul 7 15:26:39 2012 +0100

    Start converting remaining bits

diff --git a/lib/Message/Passing/DSL.pm b/lib/Message/Passing/DSL.pm
index 59bdc00..500a24a 100644
--- a/lib/Message/Passing/DSL.pm
+++ b/lib/Message/Passing/DSL.pm
@@ -1,16 +1,14 @@
 package Message::Passing::DSL;
-
-use Moose ();
-use Moose::Exporter;
 use Message::Passing::DSL::Factory;
 use Carp qw/ confess /;
 use Scalar::Util qw/weaken/;
 use AnyEvent;
 use Moose::Util qw/ does_role /;
+use Exporter qw/ import /;
 
-Moose::Exporter->setup_import_methods(
-    as_is     => [qw/ run_message_server message_chain input filter output decoder encoder error_log /],
-);
+our @EXPORT = qw/
+    run_message_server message_chain input filter output decoder encoder error_log
+/;
 
 our $FACTORY;
 sub _check_factory {
@@ -27,15 +25,15 @@ sub message_chain (&) {
     my %items = $FACTORY->registry;
     $FACTORY->clear_registry;
     weaken($items{$_}) for
-        grep { does_role($items{$_}, 'Message::Passing::Role::Output') }
+        grep { blessed($items{$_}) && $items{$_}->can('consume') }
         keys %items;
     foreach my $name (keys %items) {
         next if $items{$name};
         warn "Unused output or filter $name in chain\n";
     }
     return [
-        grep { !does_role($_, 'Message::Passing::Role::Output') }
-        grep { does_role($_, 'Message::Passing::Role::Input') }
+        grep { ! ( blessed($_) && $_->can('consume') ) }
+        grep { blessed($_) && $_->can('output_to') }
         values %items
     ];
 }
diff --git a/lib/Message/Passing/DSL/Factory.pm b/lib/Message/Passing/DSL/Factory.pm
index 4cd7d01..d6f9339 100644
--- a/lib/Message/Passing/DSL/Factory.pm
+++ b/lib/Message/Passing/DSL/Factory.pm
@@ -1,5 +1,6 @@
 package Message::Passing::DSL::Factory;
-use Moose;
+use Moo;
+use MooX::Types::MooseLike::Base qw/ HashRef /;
 use String::RewritePrefix;
 use Message::Passing::Output::STDERR;
 use namespace::clean -except => 'meta';
@@ -13,7 +14,8 @@ sub expand_class_name {
 }
 
 has registry => (
-    isa => 'HashRef',
+    is => 'ro',
+    isa => HashRef,
     default => sub { {} },
     traits => ['Hash'],
     handles => {
diff --git a/lib/Message/Passing/Role/ConnectionManager.pm b/lib/Message/Passing/Role/ConnectionManager.pm
index 3f7610f..a230de5 100644
--- a/lib/Message/Passing/Role/ConnectionManager.pm
+++ b/lib/Message/Passing/Role/ConnectionManager.pm
@@ -1,5 +1,6 @@
 package Message::Passing::Role::ConnectionManager;
-use Moose::Role;
+use Moo::Role;
+use MooX::Types::MooseLike qw/ Bool /;
 use Scalar::Util qw/ blessed weaken /;
 use namespace::clean -except => 'meta';
 
@@ -21,7 +22,7 @@ has _timeout_timer => (
 
 has connected => (
     is => 'ro',
-    isa => 'Bool',
+    isa => Bool,
     default => sub { 0 },
     writer => '_set_connected',
 );
diff --git a/lib/Message/Passing/Role/Script.pm b/lib/Message/Passing/Role/Script.pm
index 1b443a7..73b77c7 100644
--- a/lib/Message/Passing/Role/Script.pm
+++ b/lib/Message/Passing/Role/Script.pm
@@ -1,8 +1,8 @@
 package Message::Passing::Role::Script;
-use Moose::Role;
+use Moo::Role;
+use MooX::Types::MooseLike::Base qw/ Bool Str /;
 use Getopt::Long qw(:config pass_through);
 use POSIX qw(setuid setgid);
-use Moose::Util::TypeConstraints;
 use Message::Passing::DSL;
 use namespace::clean -except => 'meta';
 
@@ -10,19 +10,19 @@ requires 'build_chain';
 
 has daemonize => (
     is => 'ro',
-    isa => 'Bool',
+    isa => Bool,
     default => 0,
 );
 
 has io_priority => (
-    isa => enum([qw[ none be rt idle ]]),
+#    isa => enum([qw[ none be rt idle ]]),
     is => 'ro',
     predicate => "_has_io_priority",
 );
 
 foreach my $name (qw/ user pid_file /) {
     has $name => (
-        isa => 'Str',
+        isa => Str,
         is => 'ro',
         predicate => "_has_$name",
     );
@@ -97,7 +97,8 @@ Message::Passing:Role::Script - Handy role for building messaging scripts.
 
     # my_message_passer.pl
     package My::Message::Passer;
-    use Moose;
+    use Moo;
+    use MooX::Types::MooseLike::Base qw/ Bool /;
     use Message::Passing::DSL;
 
     with qw/
@@ -107,7 +108,7 @@ Message::Passing:Role::Script - Handy role for building messaging scripts.
 
     has foo => (
         is => 'ro',
-        isa => 'Bool',
+        isa => Bool,
     );
 
     sub build_chain {

-- 
libmessage-passing-perl Debian packaging