r27051 - in /branches/upstream/libconfig-any-perl/current: Changes MANIFEST META.yml lib/Config/Any.pm t/10-branches.t t/supported/ t/supported/conf.pl
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Sat Nov 22 06:55:04 UTC 2008
Author: rmayorga-guest
Date: Sat Nov 22 06:54:53 2008
New Revision: 27051
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27051
Log:
[svn-upgrade] Integrating new upstream version, libconfig-any-perl (0.16)
Added:
branches/upstream/libconfig-any-perl/current/t/supported/
branches/upstream/libconfig-any-perl/current/t/supported/conf.pl
Modified:
branches/upstream/libconfig-any-perl/current/Changes
branches/upstream/libconfig-any-perl/current/MANIFEST
branches/upstream/libconfig-any-perl/current/META.yml
branches/upstream/libconfig-any-perl/current/lib/Config/Any.pm
branches/upstream/libconfig-any-perl/current/t/10-branches.t
Modified: branches/upstream/libconfig-any-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-any-perl/current/Changes?rev=27051&op=diff
==============================================================================
--- branches/upstream/libconfig-any-perl/current/Changes (original)
+++ branches/upstream/libconfig-any-perl/current/Changes Sat Nov 22 06:54:53 2008
@@ -1,4 +1,9 @@
Revision history for Config-Any
+
+0.16 Mon 17 Nov 2008
+ - fix up branches test which did not handle the errors thrown by
+ changes from the last release (RT #40948)
+ - fix up error message for "any of" (RT #40972)
0.15 Wed 12 Nov 2008
- when use_ext is true, we will check to see if there are no supported
Modified: branches/upstream/libconfig-any-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-any-perl/current/MANIFEST?rev=27051&op=diff
==============================================================================
--- branches/upstream/libconfig-any-perl/current/MANIFEST (original)
+++ branches/upstream/libconfig-any-perl/current/MANIFEST Sat Nov 22 06:54:53 2008
@@ -55,3 +55,4 @@
t/multi/conf.yml
t/pod-coverage.t
t/pod.t
+t/supported/conf.pl
Modified: branches/upstream/libconfig-any-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-any-perl/current/META.yml?rev=27051&op=diff
==============================================================================
--- branches/upstream/libconfig-any-perl/current/META.yml (original)
+++ branches/upstream/libconfig-any-perl/current/META.yml Sat Nov 22 06:54:53 2008
@@ -20,4 +20,4 @@
perl: 5.6.0
resources:
license: http://dev.perl.org/licenses/
-version: 0.15
+version: 0.16
Modified: branches/upstream/libconfig-any-perl/current/lib/Config/Any.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-any-perl/current/lib/Config/Any.pm?rev=27051&op=diff
==============================================================================
--- branches/upstream/libconfig-any-perl/current/lib/Config/Any.pm (original)
+++ branches/upstream/libconfig-any-perl/current/lib/Config/Any.pm Sat Nov 22 06:54:53 2008
@@ -6,7 +6,7 @@
use Carp;
use Module::Pluggable::Object ();
-our $VERSION = '0.15';
+our $VERSION = '0.16';
=head1 NAME
@@ -178,7 +178,7 @@
if ( $use_ext_lut ) {
$filename =~ m{\.($extension_re)\z};
- if( !$1 ) {
+ if ( !$1 ) {
$filename =~ m{\.([^.]+)\z};
croak "There are no loaders available for .${1} files";
}
@@ -231,7 +231,9 @@
map { ref $_ ? join( ' ', @$_ ) : $_ } $module->requires_all_of );
}
if ( $module->can( 'requires_any_of' ) ) {
- return 'one of ' . join( ' or ', $module->requires_any_of );
+ return 'one of '
+ . join( ' or ',
+ map { ref $_ ? join( ' ', @$_ ) : $_ } $module->requires_any_of );
}
}
@@ -263,6 +265,7 @@
sub plugins {
my $class = shift;
+
# filter out things that don't look like our plugins
return grep { $_->isa( 'Config::Any::Base' ) } $class->finder->plugins;
}
@@ -277,7 +280,8 @@
sub extensions {
my $class = shift;
- my @ext = map { $_->extensions } $class->plugins;
+ my @ext
+ = map { $_->extensions } $class->plugins;
return wantarray ? @ext : \@ext;
}
Modified: branches/upstream/libconfig-any-perl/current/t/10-branches.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-any-perl/current/t/10-branches.t?rev=27051&op=diff
==============================================================================
--- branches/upstream/libconfig-any-perl/current/t/10-branches.t (original)
+++ branches/upstream/libconfig-any-perl/current/t/10-branches.t Sat Nov 22 06:54:53 2008
@@ -1,6 +1,7 @@
use strict;
use warnings;
+# use Test::Without::Module qw(YAML YAML::Syck Config::General XML::Simple JSON JSON::Syck Config::Tiny );
use Test::More tests => 10;
use_ok( 'Config::Any' );
@@ -38,11 +39,11 @@
);
}
-# grep out files we don't understand for these tests
-my @files = grep { !m{\.(foo|unsupported)$} } glob( "t/conf/conf.*" );
-my $filter = sub { return };
+my @files = glob( "t/supported/conf.*" );
ok( Config::Any->load_files( { files => \@files, use_ext => 0 } ),
"use_ext 0 works" );
+
+my $filter = sub { return };
ok( Config::Any->load_files( { files => \@files, use_ext => 1 } ),
"use_ext 1 works" );
@@ -61,6 +62,6 @@
};
ok( $@, "filter breaks" );
-my @stems = qw(t/conf/conf);
+my @stems = qw(t/supported/conf);
ok( Config::Any->load_stems( { stems => \@stems, use_ext => 1 } ),
"load_stems with stems works" );
Added: branches/upstream/libconfig-any-perl/current/t/supported/conf.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libconfig-any-perl/current/t/supported/conf.pl?rev=27051&op=file
==============================================================================
--- branches/upstream/libconfig-any-perl/current/t/supported/conf.pl (added)
+++ branches/upstream/libconfig-any-perl/current/t/supported/conf.pl Sat Nov 22 06:54:53 2008
@@ -1,0 +1,4 @@
+{ name => 'TestApp',
+ Component => { 'Controller::Foo' => { foo => 'bar' } },
+ Model => { 'Model::Baz' => { qux => 'xyzzy' } }
+}
More information about the Pkg-perl-cvs-commits
mailing list