[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:25 UTC 2013
The following commit has been merged in the master branch:
commit 02c310060bd9e3928c0808b4b75a2b1ff5a01b28
Author: Tomas Doran <bobtfish at bobtfish.net>
Date: Sun Jul 15 10:49:48 2012 +0100
Really no more Moose
diff --git a/Makefile.PL b/Makefile.PL
index ab09274..e89f043 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -15,18 +15,14 @@ resources(
requires 'Moo' => '0.091011';
requires 'Package::Variant' => '1.001001';
-requires 'Moose';
requires 'namespace::clean' => '0.23';
requires 'Module::Runtime' => '0.013';
requires 'AnyEvent';
-requires 'MooseX::ConfigFromFile';
requires 'Config::Any';
requires 'MooX::Types::MooseLike' => '0.08';
-requires 'MooseX::Types';
-requires 'MooseX::Types::Common';
+requires 'MooX::Options' => '1.6';
requires 'String::RewritePrefix';
requires 'JSON' => '2.0';
-requires 'MooseX::Getopt';
requires 'Try::Tiny';
requires 'Task::Weaken';
diff --git a/lib/Message/Passing.pm b/lib/Message/Passing.pm
index f671ff3..1c07585 100644
--- a/lib/Message/Passing.pm
+++ b/lib/Message/Passing.pm
@@ -11,10 +11,7 @@ use 5.8.4;
sub new_with_config {
my ($class, %args) = @_;
- warn "NEW WITH CONFIG";
-
if (my $conf = $args{configfile}) {
- warn "LOADING config file $conf";
my $cfg = $class->get_config_from_file($conf);
foreach my $k (keys %$cfg) {
if (!exists $args{$k}) {
diff --git a/lib/Message/Passing/DSL.pm b/lib/Message/Passing/DSL.pm
index 9eb92d2..7a5410a 100644
--- a/lib/Message/Passing/DSL.pm
+++ b/lib/Message/Passing/DSL.pm
@@ -3,7 +3,6 @@ use Message::Passing::DSL::Factory;
use Carp qw/ confess /;
use Scalar::Util qw/ blessed weaken /;
use AnyEvent;
-use Moose::Util qw/ does_role /;
use Exporter qw/ import /;
our @EXPORT = qw/
diff --git a/lib/Message/Passing/DSL/Factory.pm b/lib/Message/Passing/DSL/Factory.pm
index db175e0..5cb19c7 100644
--- a/lib/Message/Passing/DSL/Factory.pm
+++ b/lib/Message/Passing/DSL/Factory.pm
@@ -5,6 +5,7 @@ use String::RewritePrefix;
use Message::Passing::Output::STDERR;
use Carp qw/ confess /;
use Scalar::Util qw/ blessed /;
+use Module::Runtime qw/ require_module /;
use namespace::clean -except => 'meta';
sub expand_class_name {
@@ -35,7 +36,7 @@ sub set_error {
my $class = delete $opts{class}
|| confess("Class name needed");
$class = $self->expand_class_name('Output', $class);
- Class::MOP::load_class($class);
+ require_module($class);
$self->_set_error($class->new(%opts));
}
@@ -82,7 +83,7 @@ sub make {
$opts{error} = $self->error;
}
$class = $self->expand_class_name($type, $class);
- Class::MOP::load_class($class);
+ require_module($class);
my $out = $class->new(%opts);
$self->registry_set($name, $out);
return $out;
diff --git a/lib/Message/Passing/Role/HasErrorChain.pm b/lib/Message/Passing/Role/HasErrorChain.pm
index 0ed62e2..066c1f8 100644
--- a/lib/Message/Passing/Role/HasErrorChain.pm
+++ b/lib/Message/Passing/Role/HasErrorChain.pm
@@ -4,7 +4,6 @@ use Message::Passing::Output::STDERR;
use namespace::clean -except => 'meta';
has error => (
-# does => 'Message::Passing::Role::Output',
is => 'ro',
default => sub {
Message::Passing::Output::STDERR->new;
@@ -21,7 +20,7 @@ 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 Moo;
use namespace::clean -except => 'meta';
with qw/
diff --git a/lib/Message/Passing/Role/Input.pm b/lib/Message/Passing/Role/Input.pm
index 5a7bfc0..aa464e1 100644
--- a/lib/Message/Passing/Role/Input.pm
+++ b/lib/Message/Passing/Role/Input.pm
@@ -1,16 +1,23 @@
package Message::Passing::Role::Input;
use Moo::Role;
-use JSON qw/ from_json /;
-#use Message::Passing::Types qw/
-# Output_Type
-#/;
+use Scalar::Util qw/ blessed /;
+use Module::Runtime qw/ require_module /;
use namespace::clean -except => 'meta';
has output_to => (
-# isa => Output_Type,
is => 'ro',
required => 1,
-# coerce => 1,
+ ise => sub { blessed($_[0]) && $_[0]->can('consume') },
+ coerce => sub {
+ my $val = shift;
+ if (ref($val) eq 'HASH') {
+ my %stuff = %$val;
+ my $class = delete($stuff{class});
+ require_module($class);
+ $val = $class->new(%stuff);
+ }
+ $val;
+ },
);
1;
diff --git a/lib/Message/Passing/Role/Script.pm b/lib/Message/Passing/Role/Script.pm
index c38d3c8..857bbc0 100644
--- a/lib/Message/Passing/Role/Script.pm
+++ b/lib/Message/Passing/Role/Script.pm
@@ -15,7 +15,8 @@ has daemonize => (
);
has io_priority => (
-# isa => enum([qw[ none be rt idle ]]),
+ isa => sub { $_[0] =~ /^(none|be|rt|idle)$/ },
+ coerce => sub { lc $_[0] },
is => 'ro',
predicate => "_has_io_priority",
);
diff --git a/lib/Message/Passing/Types.pm b/lib/Message/Passing/Types.pm
deleted file mode 100644
index 771736b..0000000
--- a/lib/Message/Passing/Types.pm
+++ /dev/null
@@ -1,51 +0,0 @@
-package Message::Passing::Types;
-use strict;
-use warnings;
-use MooX::Types::MooseLike::Base qw/ :all /;
-use Scalar::Util qw/ blessed /;
-use JSON ();
-use Try::Tiny qw/ try /;
-use Module::Runtime qw/ require_module /;
-use namespace::clean -except => 'meta';
-
-use base qw(Exporter);
-our @EXPORT_OK = ();
-my $defs = [
- {
- name => 'Output_Type',
- test => sub { blessed($_[0]) && $_[0]->can('consume') },
- coerce => sub {
- my $val = shift;
- if (ref($val) eq 'HASH') {
- my %stuff = %$val;
- my $class = delete($stuff{class});
- require_module($class);
- $val = $class->new(%stuff);
- }
- $val;
- },
- },
- {
- name => 'Input_Type',
- test => sub { blessed($_[0]) && $_[0]->can('output_to') },
- message => sub { "$_[0] cannot ->output_to!" }
- },
- {
- name => 'Filter_Type',
- test => sub { blessed($_[0]) && $_[0]->can('output_to') && $_[0]->can('consume')},
- message => sub { "$_[0] cannot ->output_to or cannot ->consume!" }
- },
- {
- name => 'Hash_from_JSON',
- test => sub { ref($_[0]) eq 'HASH' },
- coerce => sub {
- my $str = shift;
- try {
- JSON->new->relaxed->decode($str)
- };
- },
- },
-];
-MooX::Types::MooseLike::register_types($defs, __PACKAGE__);
-
-1;
--
libmessage-passing-perl Debian packaging
More information about the Pkg-perl-cvs-commits
mailing list