[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 ff22dce7cd25ad50ac898ac16fd1bb4c8dc16fa1
Merge: 1f5dd28fc4f84120f44521c0709f1629f4594811 02c310060bd9e3928c0808b4b75a2b1ff5a01b28
Author: Tomas Doran <bobtfish at bobtfish.net>
Date: Sun Jul 15 10:51:22 2012 +0100
Merge branch 'moo'
* moo:
Really no more Moose
Fix lots of stuff so the script works again
Get shit almost working
Fix more bugs
Fix deps
Start converting remaining bits
Move CLIComponent over to Package::Variant
Mostly change everything over
Start porting to Moo
diff --combined lib/Message/Passing.pm
index ac7ce7d,1c07585..5d5b718
--- a/lib/Message/Passing.pm
+++ b/lib/Message/Passing.pm
@@@ -1,26 -1,46 +1,46 @@@
package Message::Passing;
- use Moose;
+ use Moo;
use Getopt::Long qw(:config pass_through);
use Config::Any;
- use namespace::autoclean;
+ use Message::Passing::Role::CLIComponent;
+ use Message::Passing::DSL;
+ use Carp qw/ confess /;
+ use namespace::clean -except => [qw/ meta new_with_options has /];
use 5.8.4;
- use Message::Passing::DSL;
+ sub new_with_config {
+ my ($class, %args) = @_;
+
+ if (my $conf = $args{configfile}) {
+ my $cfg = $class->get_config_from_file($conf);
+ foreach my $k (keys %$cfg) {
+ if (!exists $args{$k}) {
+ $args{$k} = $cfg->{$k};
+ }
+ }
+ }
+ $class->new(%args);
+ }
+
+ use MooX::Options creation_chain_method => 'new_with_config';
with
- 'MooseX::Getopt',
- 'MooseX::ConfigFromFile',
- 'Message::Passing::Role::CLIComponent' => { name => 'input' },
- 'Message::Passing::Role::CLIComponent' => { name => 'output' },
- 'Message::Passing::Role::CLIComponent' => { name => 'filter', default => 'Null' },
- 'Message::Passing::Role::CLIComponent' => { name => 'decoder', default => 'JSON' },
- 'Message::Passing::Role::CLIComponent' => { name => 'encoder', default => 'JSON' },
- 'Message::Passing::Role::CLIComponent' => { name => 'error', default => 'STDERR' },
+ CLIComponent( name => 'input', option => __PACKAGE__->can('option') ),
+ CLIComponent( name => 'output', option => __PACKAGE__->can('option') ),
+ CLIComponent( name => 'filter', default => 'Null', option => __PACKAGE__->can('option') ),
+ CLIComponent( name => 'decoder', default => 'JSON', option => __PACKAGE__->can('option') ),
+ CLIComponent( name => 'encoder', default => 'JSON', option => __PACKAGE__->can('option') ),
+ CLIComponent( name => 'error', default => 'STDERR', option => __PACKAGE__->can('option') ),
'Message::Passing::Role::Script';
-our $VERSION = '0.009';
+our $VERSION = '0.010';
$VERSION = eval $VERSION;
+ option configfile => (
+ is => 'ro',
+ format => 's',
+ );
+
sub get_config_from_file {
my ($class, $filename) = @_;
my ($fn, $cfg) = %{ Config::Any->load_files({
@@@ -34,37 -54,37 +54,37 @@@ sub build_chain
my $self = shift;
message_chain {
error_log(
- $self->error_options,
+ %{ $self->error_options },
class => $self->error,
);
output output => (
- $self->output_options,
+ %{ $self->output_options },
class => $self->output,
);
encoder("encoder",
- $self->encoder_options,
+ %{ $self->encoder_options },
class => $self->encoder,
output_to => 'output',
);
filter filter => (
- $self->filter_options,
+ %{ $self->filter_options },
class => $self->filter,
output_to => 'encoder',
);
decoder("decoder",
- $self->decoder_options,
+ %{ $self->decoder_options },
class => $self->decoder,
output_to => 'filter',
);
input input => (
- $self->input_options,
+ %{ $self->input_options },
class => $self->input,
output_to => 'decoder',
);
};
}
- __PACKAGE__->meta->make_immutable;
+
1;
=head1 NAME
diff --combined lib/Message/Passing/Filter/Decoder/Bzip2.pm
index 6d08e9d,21d8069..3d1954a
--- a/lib/Message/Passing/Filter/Decoder/Bzip2.pm
+++ b/lib/Message/Passing/Filter/Decoder/Bzip2.pm
@@@ -1,7 -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,40 -10,6 +10,40 @@@ sub filter
Compress::Bzip2::memBunzip($message);
}
- __PACKAGE__->meta->make_immutable;
+
1;
+=head1 NAME
+
+Message::Passing::Decoder::Bzip2 - Use Compress:Bzip2 to encrypt messages
+
+
+=head1 SYNOPSIS
+
+ message-pass --input STDIN --decoder Bzip2 \
+ --output ZeroMQ --output_options '...'
+
+=head1 DESCRIPTION
+
+Uncompresses messages with Compress::Bzip2.
+
+=head1 METHODS
+
+=head2 filter
+
+Uncompresses the message
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Message::Passing::Role::Filter>
+
+=back
+
+=head1 AUTHOR, COPYRIGHT & LICENSE
+
+See L<Message::Passing>.
+
+=cut
+
diff --combined lib/Message/Passing/Filter/Decoder/Crypt/CBC.pm
index 6dae67d,0a5fc48..87aad50
--- a/lib/Message/Passing/Filter/Decoder/Crypt/CBC.pm
+++ b/lib/Message/Passing/Filter/Decoder/Crypt/CBC.pm
@@@ -1,7 -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,42 -13,6 +13,42 @@@ sub filter
$self->cbc->decrypt($message);
}
- __PACKAGE__->meta->make_immutable;
+
1;
+=head1 NAME
+
+Message::Passing::Decoder::Crypt::CBC - Use Crypt::CBC to decrypt messages
+
+=head1 SYNOPSIS
+
+ message-pass --input STDIN --decoder Crypt::CBC \
+ --decoder_options '{}' \
+ --output ZeroMQ --output_options '...'
+
+=head1 DESCRIPTION
+
+Decrypts messages with Crypt::CBC.
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Message::Passing::Role::Filter>
+
+=item L<Message::Passing::Role::Crypt::CBC>
+
+=back
+
+=head1 METHODS
+
+=head2 filter
+
+Decrypts the message
+
+=head1 AUTHOR, COPYRIGHT & LICENSE
+
+See L<Message::Passing>.
+
+=cut
+
diff --combined lib/Message/Passing/Filter/Decoder/Gzip.pm
index 22d66aa,932499c..4ecba4b
--- a/lib/Message/Passing/Filter/Decoder/Gzip.pm
+++ b/lib/Message/Passing/Filter/Decoder/Gzip.pm
@@@ -1,7 -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,33 -10,6 +10,33 @@@ sub filter
Compress::Zlib::memGunzip($message);
}
- __PACKAGE__->meta->make_immutable;
+
1;
+=head1 NAME
+
+Message::Passing::Filter::Decoder::Gzip - Decompresses messages with Compress::Zlib
+
+=head1 SYNOPSIS
+
+ message-pass --input STDIN --decoder Gzip \
+ --output ZeroMQ --output_options '...'
+
+=head1 DESCRIPTION
+
+Decompresses messages with Compress::Zlib.
+
+=head1 METHODS
+
+=head2 filter
+
+Decompresses the message
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Message::Passing::Role::Filter>
+
+=back
+
diff --combined lib/Message/Passing/Filter/Encoder/Bzip2.pm
index f1d4c90,93533a0..b04991c
--- a/lib/Message/Passing/Filter/Encoder/Bzip2.pm
+++ b/lib/Message/Passing/Filter/Encoder/Bzip2.pm
@@@ -1,7 -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,40 -10,6 +10,40 @@@ sub filter
Compress::Bzip2::memBzip($message);
}
- __PACKAGE__->meta->make_immutable;
+
1;
+=head1 NAME
+
+Message::Passing::Encoder::Bzip2 - Use Compress:Bzip2 to encrypt messages
+
+
+=head1 SYNOPSIS
+
+ message-pass --input STDIN --encoder Bzip2 \
+ --output ZeroMQ --output_options '...'
+
+=head1 DESCRIPTION
+
+Compresses messages with Compress::Bzip2.
+
+=head1 METHODS
+
+=head2 filter
+
+Compresses the message
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Message::Passing::Role::Filter>
+
+=back
+
+=head1 AUTHOR, COPYRIGHT & LICENSE
+
+See L<Message::Passing>.
+
+=cut
+
diff --combined lib/Message/Passing/Filter/Encoder/Crypt/CBC.pm
index 0058ec1,86b8a7d..acf5ee2
--- a/lib/Message/Passing/Filter/Encoder/Crypt/CBC.pm
+++ b/lib/Message/Passing/Filter/Encoder/Crypt/CBC.pm
@@@ -1,7 -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,42 -13,6 +13,42 @@@ sub filter
$self->cbc->encrypt($message);
}
- __PACKAGE__->meta->make_immutable;
+
1;
+=head1 NAME
+
+Message::Passing::Encoder::Crypt::CBC - Use Crypt::CBC to encrypt messages
+
+=head1 SYNOPSIS
+
+ message-pass --input STDIN --encoder Crypt::CBC \
+ --encoder_options '{}' \
+ --output ZeroMQ --output_options '...'
+
+=head1 DESCRIPTION
+
+Encrypts messages with Crypt::CBC.
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Message::Passing::Role::Filter>
+
+=item L<Message::Passing::Role::Crypt::CBC>
+
+=back
+
+=head1 METHODS
+
+=head2 filter
+
+Encrypts the message
+
+=head1 AUTHOR, COPYRIGHT & LICENSE
+
+See L<Message::Passing>.
+
+=cut
+
diff --combined lib/Message/Passing/Filter/Encoder/Gzip.pm
index 62c6c0b,16583f1..b6548c4
--- a/lib/Message/Passing/Filter/Encoder/Gzip.pm
+++ b/lib/Message/Passing/Filter/Encoder/Gzip.pm
@@@ -1,7 -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,33 -10,6 +10,33 @@@ sub filter
Compress::Zlib::memGzip($message);
}
- __PACKAGE__->meta->make_immutable;
+
1;
+=head1 NAME
+
+Message::Passing::Filter::Encoder::Gzip - Compresses messages with Compress::Zlib
+
+=head1 SYNOPSIS
+
+ message-pass --input STDIN --encoder Gzip \
+ --output ZeroMQ --output_options '...'
+
+=head1 DESCRIPTION
+
+Compresses messages with Compress::Zlib.
+
+=head1 METHODS
+
+=head2 filter
+
+Compresses the message
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Message::Passing::Role::Filter>
+
+=back
+
diff --combined lib/Message/Passing/Role/Crypt/CBC.pm
index b167828,44f593f..6145abc
--- a/lib/Message/Passing/Role/Crypt/CBC.pm
+++ b/lib/Message/Passing/Role/Crypt/CBC.pm
@@@ -1,16 -1,19 +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!
@@@ -24,41 -27,3 +27,41 @@@ sub cbc
1;
+=head1 NAME
+
+Message::Passing::Role::Crypt::CBC - Common attributes for encoding or decoding encrypted messages
+
+=head1 ATTRIBUTES
+
+=head2 encryption_key
+
+The key for encryption (this is a shared secret key between both sides)
+
+=head2 encryption_cipher
+
+Any cipher supported by L<Crypt::CBC>.
+
+=head1 METHODS
+
+=head2 cbc
+
+Returns a new L<Crypt::CBC> object.
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Message::Passing::Filter::Encoder::Crypt::CBC>
+
+=item L<Message::Passing::Filter::Decoder::Crypt::CBC>
+
+=item L<Crypt::CBC>
+
+=back
+
+=head1 AUTHOR, COPYRIGHT & LICENSE
+
+See L<Message::Passing>.
+
+=cut
+
--
libmessage-passing-perl Debian packaging
More information about the Pkg-perl-cvs-commits
mailing list