summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog5
-rw-r--r--MANIFEST7
-rw-r--r--MANIFEST.SKIP78
-rw-r--r--META.yml2
-rw-r--r--SIGNATURE27
-rw-r--r--lib/GnuPG/Interface.pm2
-rw-r--r--lib/GnuPG/Options.pm18
-rw-r--r--lib/GnuPG/PrimaryKey.pm8
-rw-r--r--test/public-keys-sigs/1.out31
-rw-r--r--test/public-keys-sigs/2.out13
-rw-r--r--test/public-keys/1.out13
-rw-r--r--test/public-keys/2.out13
-rw-r--r--test/secret-keys/1.out7
-rw-r--r--test/secret-keys/2.out5
-rw-r--r--test/temp0
15 files changed, 101 insertions, 128 deletions
diff --git a/ChangeLog b/ChangeLog
index cfa49d1..7cca2bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.49 Thu Mar 13 13:05:17 EDT 2014
+ Restore context-sensitive (array/arrayref) behavior of multiple
+ array methods from 0.46.
+ Fix MANIFEST/.gitignore inconsistency
+
0.48 Mon Mar 10 11:26:17 EDT 2014
Switch from --always-trust to --trust-model=always
diff --git a/MANIFEST b/MANIFEST
index 14a2164..93daea5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -58,22 +58,15 @@ test/passphrase
test/plain.1.txt
test/public-keys-sigs/1.0.test
test/public-keys-sigs/1.1.test
-test/public-keys-sigs/1.out
test/public-keys-sigs/2.0.test
test/public-keys-sigs/2.1.test
-test/public-keys-sigs/2.out
test/public-keys/1.0.test
test/public-keys/1.1.test
-test/public-keys/1.out
test/public-keys/2.0.test
test/public-keys/2.1.test
-test/public-keys/2.out
test/pubring.gpg
test/secret-keys/1.0.test
-test/secret-keys/1.out
test/secret-keys/2.0.test
-test/secret-keys/2.out
test/secring.gpg
test/signed.1.asc
-test/temp
THANKS
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index c4c77e7..0e5542f 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -1,14 +1,66 @@
-TODO
-Makefile$
-Makefile.old$
-blib
-pm_to_blib
-.swp$
+
+#!start included /home/chmrr/prog/perlbrew/perls/perl-5.16.0/lib/5.16.0/ExtUtils/MANIFEST.SKIP
+# Avoid version control files.
+\bRCS\b
+\bCVS\b
+\bSCCS\b
+,v$
+\B\.svn\b
+\B\.git\b
+\B\.gitignore\b
+\b_darcs\b
+\B\.cvsignore$
+
+# Avoid VMS specific MakeMaker generated files
+\bDescrip.MMS$
+\bDESCRIP.MMS$
+\bdescrip.mms$
+
+# Avoid Makemaker generated and utility files.
+\bMANIFEST\.bak
+\bMakefile$
+\bblib/
+\bMakeMaker-\d
+\bpm_to_blib\.ts$
+\bpm_to_blib$
+\bblibdirs\.ts$ # 6.18 through 6.25 generated this
+
+# Avoid Module::Build generated and utility files.
+\bBuild$
+\b_build/
+\bBuild.bat$
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
+
+# Avoid temp and backup files.
~$
-.tmp$
-.bak$
-.git/
-.gitignore$
-.shipit$
-test/random_seed$
-test/trustdb.gpg$
+\.old$
+\#$
+\b\.#
+\.bak$
+\.tmp$
+\.#
+\.rej$
+
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._
+
+# Avoid Devel::Cover and Devel::CoverX::Covered files.
+\bcover_db\b
+\bcovered\b
+
+# Avoid MYMETA files
+^MYMETA\.
+#!end included /home/chmrr/prog/perlbrew/perls/perl-5.16.0/lib/5.16.0/ExtUtils/MANIFEST.SKIP
+
+
+.shipit
+.*\.tar\.gz
+test/.*/.*\.out
+test/random_seed
+test/temp
+test/trustdb.gpg
diff --git a/META.yml b/META.yml
index b2a2d77..a819c11 100644
--- a/META.yml
+++ b/META.yml
@@ -26,4 +26,4 @@ requires:
MooX::late: 0.014
resources:
license: http://dev.perl.org/licenses/
-version: 0.48
+version: 0.49
diff --git a/SIGNATURE b/SIGNATURE
index db6326b..1d802cf 100644
--- a/SIGNATURE
+++ b/SIGNATURE
@@ -15,10 +15,10 @@ not run its Makefile.PL or Build.PL.
Hash: SHA1
SHA1 187c2cfc1fc31d42c18d5b1653afa1a905bf266c COPYING
-SHA1 5179420a47d48d9093e9c143c3994c93eb353d54 ChangeLog
-SHA1 37e4d07c43f08f41a24fd1157ab530a4a06aab37 MANIFEST
-SHA1 0c5f7bda8a3ce57e27dcd7f32459d8b286f1339e MANIFEST.SKIP
-SHA1 9cb2bf3583bf3108d7b028ce236b06233a030e08 META.yml
+SHA1 5a439682b0085417476ef6022e22a41cbb3122b2 ChangeLog
+SHA1 7cc2c17977a74ca91b124e05f92241a307b738c1 MANIFEST
+SHA1 01aaeb25c70093c04dd0b27f8619332393830652 MANIFEST.SKIP
+SHA1 9c55af63cc6c97daa351d899ac7527e76e7b4ae4 META.yml
SHA1 5bc6888b1495f726acc49d82aebd6ddf1ed5757a Makefile.PL
SHA1 d6e32c5128419cdbfe6e6f846ff7f64fc0adac2f NEWS
SHA1 1047dc54823b1321e939274dd261d8e40febee24 README
@@ -34,10 +34,10 @@ SHA1 c3a6d0d5b84feb3280622e9599e86247d58b0d18 inc/Module/Install/WriteAll.pm
SHA1 d1cf614274e3b01254379758123b75034e1d2e80 lib/GnuPG/Fingerprint.pm
SHA1 9508207dbd2a4b36a38e08b72f39fc4d26c49615 lib/GnuPG/Handles.pm
SHA1 b2fe771ca9a1d719b222013e08b93ab57f7452e8 lib/GnuPG/HashInit.pm
-SHA1 2d9e899583fd104259014bfaaf3aa492f34abd6e lib/GnuPG/Interface.pm
+SHA1 45463ed4765e338ab2fd3530efe199211fb9a35f lib/GnuPG/Interface.pm
SHA1 41cc5278e62c3298248cefbd27179d0322e65011 lib/GnuPG/Key.pm
-SHA1 ab854f7ad53de12fd247730342ee1c1b2df252ea lib/GnuPG/Options.pm
-SHA1 01db712289625326853f662fe8c332f562e8d6f0 lib/GnuPG/PrimaryKey.pm
+SHA1 09f36e1d7ef3a0a4ac409b3e89597b69fbcdd583 lib/GnuPG/Options.pm
+SHA1 1c3715fde1d1a5e8b8d058333306b7c96eefe940 lib/GnuPG/PrimaryKey.pm
SHA1 a38e294729aac733fafcf9d7e4b7ef5fcb50e685 lib/GnuPG/PublicKey.pm
SHA1 4b917013b36c4e66bdf3ae27cc8e056c9bd6be64 lib/GnuPG/Revoker.pm
SHA1 3dbf6667b73b61dff5bc8db30b6dd81415297c09 lib/GnuPG/SecretKey.pm
@@ -74,28 +74,21 @@ SHA1 4e1243bd22c66e76c2ba9eddc1f91394e57f9f83 test/passphrase
SHA1 59c0e6436b38645144d17ce11ac4aabfdd43e960 test/plain.1.txt
SHA1 7d94ea032bdbb0104c1dc73583ec64ade6294495 test/public-keys-sigs/1.0.test
SHA1 63d93054decf9ff6c2dc99eb03f131b55af4ee43 test/public-keys-sigs/1.1.test
-SHA1 a007df3963780784b12a31408bf7972c9686220f test/public-keys-sigs/1.out
SHA1 bd9892a93f802c68109b11b756f79f6b0292eb1a test/public-keys-sigs/2.0.test
SHA1 73d90696020a01753cda984262a2831dcc6ac0d7 test/public-keys-sigs/2.1.test
-SHA1 343df38fd93847e5646f84679fe50e277b0a12c5 test/public-keys-sigs/2.out
SHA1 82d483adc6d203c79856a70dd259370f6efdeef7 test/public-keys/1.0.test
SHA1 86056ad37b8bb67d55ac61b5d5a27ac4bbd1cceb test/public-keys/1.1.test
-SHA1 18365fae169164b18e855861e74fa2a84031b53b test/public-keys/1.out
SHA1 a8e97a2439671dae0dd29a2404c321ccb686ba7a test/public-keys/2.0.test
SHA1 54d2c13bf3b73b7582edef091175dfe3763ddf59 test/public-keys/2.1.test
-SHA1 18365fae169164b18e855861e74fa2a84031b53b test/public-keys/2.out
SHA1 4349906c08f65af3b13e7b441ac4dd2e637bfeae test/pubring.gpg
SHA1 e740841597775e3da265ec14e411ed0432bae5e2 test/secret-keys/1.0.test
-SHA1 e740841597775e3da265ec14e411ed0432bae5e2 test/secret-keys/1.out
SHA1 3bd6135279f9ae23e32680707c6170910421e5de test/secret-keys/2.0.test
-SHA1 d15fbde50ae625d033b9cb903a03596fe3cb7e2e test/secret-keys/2.out
SHA1 9ce5508cd8cefadc4c9bf2842864b52e87b1826e test/secring.gpg
SHA1 981418a80bf7dab91b63608cfd1ddf5091f89ad7 test/signed.1.asc
-SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 test/temp
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
-iEYEARECAAYFAlMd2vgACgkQMflWJZZAbqB8cgCgl1t3q9l23eOcpdFJnoBJWAi8
-t/gAnRHdiR1CJSk0BlOmUrxOySi9lkaO
-=u0tM
+iEYEARECAAYFAlMh53MACgkQMflWJZZAbqBnqQCePEHmOTKvosAaSKXeBRR1O3jj
+qwMAn3FfEuPGerMjPzrV7Nx0b3RLZa6U
+=Kv2N
-----END PGP SIGNATURE-----
diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
index 5a28f8a..bfa2ec4 100644
--- a/lib/GnuPG/Interface.pm
+++ b/lib/GnuPG/Interface.pm
@@ -28,7 +28,7 @@ use Math::BigInt try => 'GMP';
use GnuPG::Options;
use GnuPG::Handles;
-$VERSION = '0.48';
+$VERSION = '0.49';
has $_ => (
isa => 'Any',
diff --git a/lib/GnuPG/Options.pm b/lib/GnuPG/Options.pm
index 51f9a43..a7c4203 100644
--- a/lib/GnuPG/Options.pm
+++ b/lib/GnuPG/Options.pm
@@ -72,7 +72,8 @@ has $_ => (
) for SCALARS;
for my $list (LISTS) {
- has $list => (
+ my $ref = $list . "_ref";
+ has $ref => (
handles_via => 'Array',
is => 'rw',
lazy => 1,
@@ -82,6 +83,11 @@ for my $list (LISTS) {
"push_$list" => 'push',
},
);
+
+ __PACKAGE__->meta->add_method($list => sub {
+ my $self = shift;
+ return wantarray ? @{$self->$ref(@_)} : $self->$ref(@_);
+ });
}
sub BUILD {
@@ -110,7 +116,7 @@ sub get_args {
return (
$self->get_meta_args(),
$self->get_option_args(),
- @{$self->extra_args()},
+ $self->extra_args(),
);
}
@@ -147,8 +153,8 @@ sub get_option_args {
push @args, '--command-fd', $self->command_fd()
if defined $self->command_fd();
- push @args, map { ( '--recipient', $_ ) } @{$self->recipients};
- push @args, map { ( '--encrypt-to', $_ ) } @{$self->encrypt_to};
+ push @args, map { ( '--recipient', $_ ) } $self->recipients();
+ push @args, map { ( '--encrypt-to', $_ ) } $self->encrypt_to();
return @args;
}
@@ -172,9 +178,9 @@ sub get_meta_args {
if $self->meta_signing_key();
push @args,
- map { ( '--recipient', $_ ) } @{$self->meta_recipients_key_ids};
+ map { ( '--recipient', $_ ) } $self->meta_recipients_key_ids();
push @args,
- map { ( '--recipient', $_->hex_id() ) } @{$self->meta_recipients_keys};
+ map { ( '--recipient', $_->hex_id() ) } $self->meta_recipients_keys();
return @args;
}
diff --git a/lib/GnuPG/PrimaryKey.pm b/lib/GnuPG/PrimaryKey.pm
index d3c745e..bc84349 100644
--- a/lib/GnuPG/PrimaryKey.pm
+++ b/lib/GnuPG/PrimaryKey.pm
@@ -21,7 +21,8 @@ use MooX::HandlesVia;
BEGIN { extends qw( GnuPG::Key ) }
for my $list (qw(user_ids subkeys user_attributes)) {
- has $list => (
+ my $ref = $list . "_ref";
+ has $ref => (
handles_via => 'Array',
is => 'rw',
default => sub { [] },
@@ -29,6 +30,11 @@ for my $list (qw(user_ids subkeys user_attributes)) {
"push_$list" => 'push',
},
);
+
+ __PACKAGE__->meta->add_method($list => sub {
+ my $self = shift;
+ return wantarray ? @{$self->$ref(@_)} : $self->$ref(@_);
+ });
}
has $_ => (
diff --git a/test/public-keys-sigs/1.out b/test/public-keys-sigs/1.out
deleted file mode 100644
index b1cb95c..0000000
--- a/test/public-keys-sigs/1.out
+++ /dev/null
@@ -1,31 +0,0 @@
-test/pubring.gpg
-----------------
-pub 1024D/F950DA9C 2000-02-06
-sig R F950DA9C 2001-01-01 GnuPG test key (for testing purposes only)
-uid GnuPG test key (for testing purposes only)
-sig 3 F950DA9C 2007-04-20 GnuPG test key (for testing purposes only)
-sig 260C4FA3 2000-03-16 Frank J. Tobin <ftobin@neverending.org>
-sig 3 F950DA9C 2000-02-06 GnuPG test key (for testing purposes only)
-uid Foo Bar (1)
-sig 3 F950DA9C 2007-04-20 GnuPG test key (for testing purposes only)
-sig 260C4FA3 2000-03-16 Frank J. Tobin <ftobin@neverending.org>
-sig 3 F950DA9C 2000-03-16 GnuPG test key (for testing purposes only)
-sub 768g/2E854A6B 2000-02-06
-sig F950DA9C 2007-04-20 GnuPG test key (for testing purposes only)
-
-pub 1024D/260C4FA3 1999-04-22 [expired: 2001-04-21]
-uid Frank J. Tobin <ftobin@neverending.org>
-sig 3 260C4FA3 1999-07-02 Frank J. Tobin <ftobin@neverending.org>
-sig 164BDBAE 1999-11-16 [User ID not found]
-uid Frank J. Tobin <ftobin@bigfoot.com>
-sig 3 260C4FA3 1999-04-22 Frank J. Tobin <ftobin@neverending.org>
-sig F40EB65E 1999-04-22 [User ID not found]
-sig 164BDBAE 1999-11-16 [User ID not found]
-uid Dekan
-sig 3 260C4FA3 1999-04-22 Frank J. Tobin <ftobin@neverending.org>
-sig F40EB65E 1999-04-22 [User ID not found]
-sig 164BDBAE 1999-11-16 [User ID not found]
-uid Frank J. Tobin <ftobin@uiuc.edu>
-sig 3 260C4FA3 1999-06-29 Frank J. Tobin <ftobin@neverending.org>
-sig 164BDBAE 1999-11-16 [User ID not found]
-
diff --git a/test/public-keys-sigs/2.out b/test/public-keys-sigs/2.out
deleted file mode 100644
index 78fb9ed..0000000
--- a/test/public-keys-sigs/2.out
+++ /dev/null
@@ -1,13 +0,0 @@
-pub 1024D/F950DA9C 2000-02-06
-sig R F950DA9C 2001-01-01 GnuPG test key (for testing purposes only)
-uid GnuPG test key (for testing purposes only)
-sig 3 F950DA9C 2007-04-20 GnuPG test key (for testing purposes only)
-sig 260C4FA3 2000-03-16 Frank J. Tobin <ftobin@neverending.org>
-sig 3 F950DA9C 2000-02-06 GnuPG test key (for testing purposes only)
-uid Foo Bar (1)
-sig 3 F950DA9C 2007-04-20 GnuPG test key (for testing purposes only)
-sig 260C4FA3 2000-03-16 Frank J. Tobin <ftobin@neverending.org>
-sig 3 F950DA9C 2000-03-16 GnuPG test key (for testing purposes only)
-sub 768g/2E854A6B 2000-02-06
-sig F950DA9C 2007-04-20 GnuPG test key (for testing purposes only)
-
diff --git a/test/public-keys/1.out b/test/public-keys/1.out
deleted file mode 100644
index 2102afa..0000000
--- a/test/public-keys/1.out
+++ /dev/null
@@ -1,13 +0,0 @@
-test/pubring.gpg
-----------------
-pub 1024D/F950DA9C 2000-02-06
-uid GnuPG test key (for testing purposes only)
-uid Foo Bar (1)
-sub 768g/2E854A6B 2000-02-06
-
-pub 1024D/260C4FA3 1999-04-22 [expired: 2001-04-21]
-uid Frank J. Tobin <ftobin@neverending.org>
-uid Frank J. Tobin <ftobin@bigfoot.com>
-uid Dekan
-uid Frank J. Tobin <ftobin@uiuc.edu>
-
diff --git a/test/public-keys/2.out b/test/public-keys/2.out
deleted file mode 100644
index 2102afa..0000000
--- a/test/public-keys/2.out
+++ /dev/null
@@ -1,13 +0,0 @@
-test/pubring.gpg
-----------------
-pub 1024D/F950DA9C 2000-02-06
-uid GnuPG test key (for testing purposes only)
-uid Foo Bar (1)
-sub 768g/2E854A6B 2000-02-06
-
-pub 1024D/260C4FA3 1999-04-22 [expired: 2001-04-21]
-uid Frank J. Tobin <ftobin@neverending.org>
-uid Frank J. Tobin <ftobin@bigfoot.com>
-uid Dekan
-uid Frank J. Tobin <ftobin@uiuc.edu>
-
diff --git a/test/secret-keys/1.out b/test/secret-keys/1.out
deleted file mode 100644
index 5999484..0000000
--- a/test/secret-keys/1.out
+++ /dev/null
@@ -1,7 +0,0 @@
-test/secring.gpg
-----------------
-sec 1024D/F950DA9C 2000-02-06
-uid GnuPG test key (for testing purposes only)
-uid Foo Bar (1)
-ssb 768g/2E854A6B 2000-02-06
-
diff --git a/test/secret-keys/2.out b/test/secret-keys/2.out
deleted file mode 100644
index 3d2f61d..0000000
--- a/test/secret-keys/2.out
+++ /dev/null
@@ -1,5 +0,0 @@
-sec 1024D/F950DA9C 2000-02-06
-uid GnuPG test key (for testing purposes only)
-uid Foo Bar (1)
-ssb 768g/2E854A6B 2000-02-06
-
diff --git a/test/temp b/test/temp
deleted file mode 100644
index e69de29..0000000
--- a/test/temp
+++ /dev/null
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 08:58:38 +0000