Merge remote branch 'rafl/master'

nothingmuch · Oct 8, 2010 · 1984c70 · 1984c70
2 parents 31fe50f + cab1ab5
commit 1984c70
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ Makefile.old
 pm_to_blib*
 *.tar.gz
 cover_db
+MANIFEST*
+!MANIFEST.SKIP
diff --git a/Changes b/Changes
@@ -1,4 +1,10 @@
-0.48
+0.49
+    - Merge NUFFIN/0.48 and FLORA/0.48
+
+0.48 [FLORA]
+    - Avoid warnings from Moose 1.10
+
+0.48 [NUFFIN]
     - Reupload with proper MANIFEST
 
 0.47

diff --git a/lib/KiokuDB.pm b/lib/KiokuDB.pm
@@ -3,7 +3,7 @@
 package KiokuDB;
 use Moose;
 
-our $VERSION = "0.48";
+our $VERSION = "0.49";
 
 use constant SERIAL_IDS => not not our $SERIAL_IDS;
 

diff --git a/lib/KiokuDB/Set/Deferred.pm b/lib/KiokuDB/Set/Deferred.pm
@@ -11,7 +11,7 @@ use Scalar::Util qw(refaddr);
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Set::Storage) => { excludes => '_apply' };
+with qw(KiokuDB::Set::Storage) => { -excludes => '_apply' };
 
 extends qw(KiokuDB::Set::Base);
 

diff --git a/lib/KiokuDB/Stream/Objects.pm b/lib/KiokuDB/Stream/Objects.pm
@@ -53,7 +53,7 @@ has _no_scope => (
     is  => "rw",
 );
 
-with qw(Data::Stream::Bulk) => { excludes => 'loaded' };
+with qw(Data::Stream::Bulk) => { -excludes => 'loaded' };
 
 sub next {
 	my $self = shift;

diff --git a/lib/KiokuDB/Test/Fixture/Binary.pm b/lib/KiokuDB/Test/Fixture/Binary.pm
@@ -16,7 +16,7 @@ use namespace::clean -except => 'meta';
 
 use constant required_backend_roles => qw(BinarySafe);
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 my $utf8    = "חיים";
 

diff --git a/lib/KiokuDB/Test/Fixture/Clear.pm b/lib/KiokuDB/Test/Fixture/Clear.pm
@@ -12,7 +12,7 @@ use namespace::clean -except => 'meta';
 
 use constant required_backend_roles => qw(Clear);
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/sort required_backend_roles/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/sort required_backend_roles/] };
 
 sub sort { -10 }
 

diff --git a/lib/KiokuDB/Test/Fixture/Concurrency.pm b/lib/KiokuDB/Test/Fixture/Concurrency.pm
@@ -11,7 +11,7 @@ use POSIX qw(_exit :sys_wait_h);
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/run required_backend_roles/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/run required_backend_roles/] };
 
 use constant required_backend_roles => qw(Clear TXN Concurrency::POSIX);
 
@@ -23,7 +23,8 @@ use constant ITER => 10;
 my @ids = qw(foo bar gorch baz);
 
 {
-    package Foo;
+    package # hide from PAUSE
+        Foo;
     use Moose;
 
     has bar => ( is => 'rw' );

diff --git a/lib/KiokuDB/Test/Fixture/MassInsert.pm b/lib/KiokuDB/Test/Fixture/MassInsert.pm
@@ -16,7 +16,7 @@ sub p {
     KiokuDB::Test::Person->new(@args);
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 sub sort { 100 }
 

diff --git a/lib/KiokuDB/Test/Fixture/ObjectGraph.pm b/lib/KiokuDB/Test/Fixture/ObjectGraph.pm
@@ -44,7 +44,7 @@ sub clique {
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 has [qw(homer dubya putin)] => (
     isa => "Str",

diff --git a/lib/KiokuDB/Test/Fixture/Overwrite.pm b/lib/KiokuDB/Test/Fixture/Overwrite.pm
@@ -36,7 +36,7 @@ sub p {
     KiokuDB::Test::Person->new(@args);
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 sub sort { -100 }
 

diff --git a/lib/KiokuDB/Test/Fixture/Refresh.pm b/lib/KiokuDB/Test/Fixture/Refresh.pm
@@ -14,7 +14,7 @@ sub p {
     KiokuDB::Test::Person->new(@args);
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 sub sort { -100 }
 

diff --git a/lib/KiokuDB/Test/Fixture/RootSet.pm b/lib/KiokuDB/Test/Fixture/RootSet.pm
@@ -11,7 +11,7 @@ use KiokuDB::Test::Company;
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'sort' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'sort' };
 
 sub sort { -50 }
 

diff --git a/lib/KiokuDB/Test/Fixture/Scan.pm b/lib/KiokuDB/Test/Fixture/Scan.pm
@@ -10,7 +10,7 @@ use KiokuDB::Test::Person;
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 use constant required_backend_roles => qw(Clear Scan);
 

diff --git a/lib/KiokuDB/Test/Fixture/SimpleSearch.pm b/lib/KiokuDB/Test/Fixture/SimpleSearch.pm
@@ -10,7 +10,7 @@ use KiokuDB::Test::Person;
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 use constant required_backend_roles => qw(Clear Query::Simple);
 

diff --git a/lib/KiokuDB/Test/Fixture/Small.pm b/lib/KiokuDB/Test/Fixture/Small.pm
@@ -22,7 +22,7 @@ sub p {
     KiokuDB::Test::Person->new(@args);
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 sub sort { -100 }
 

diff --git a/lib/KiokuDB/Test/Fixture/TypeMap/Default.pm b/lib/KiokuDB/Test/Fixture/TypeMap/Default.pm
@@ -59,7 +59,7 @@ use constant HAVE_MX_OP             => try { require MooseX::Object::Pluggable }
     has name => ( is => "rw" );
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 sub create {
     tie my %refhash, 'Tie::RefHash';

diff --git a/lib/KiokuDB/Test/Fixture/Unicode.pm b/lib/KiokuDB/Test/Fixture/Unicode.pm
@@ -16,7 +16,7 @@ use namespace::clean -except => 'meta';
 
 use constant required_backend_roles => qw(UnicodeSafe);
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 my $unicode = "משה";
 

diff --git a/lib/KiokuDB/TypeMap/Default/JSON.pm b/lib/KiokuDB/TypeMap/Default/JSON.pm
@@ -8,7 +8,7 @@ use namespace::clean -except => 'meta';
 extends qw(KiokuDB::TypeMap);
 
 with 'KiokuDB::TypeMap::Default::Canonical' => {
-    excludes => [qw(reftype_entries)],
+    -excludes => [qw(reftype_entries)],
 };
 
 has json_boolean_typemap => (

diff --git a/t/gin.t b/t/gin.t
@@ -25,7 +25,7 @@ use ok 'Search::GIN::Extract::Class';
 
     with (
 	    'KiokuDB::GIN',
-	    'Search::GIN::Driver::Hash' => { excludes => 'clear' },
+	    'Search::GIN::Driver::Hash' => { -excludes => 'clear' },
 	    'Search::GIN::Extract::Delegate',
     );