r27054 - in /trunk/libconfig-any-perl: Changes MANIFEST META.yml debian/changelog lib/Config/Any.pm t/10-branches.t t/supported/

Sat Nov 22 07:15:51 UTC 2008

Author: rmayorga-guest
Date: Sat Nov 22 07:15:48 2008
New Revision: 27054

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27054
Log:
New upstream release

Added:
    trunk/libconfig-any-perl/t/supported/
      - copied from r27052, branches/upstream/libconfig-any-perl/current/t/supported/
Modified:
    trunk/libconfig-any-perl/Changes
    trunk/libconfig-any-perl/MANIFEST
    trunk/libconfig-any-perl/META.yml
    trunk/libconfig-any-perl/debian/changelog
    trunk/libconfig-any-perl/lib/Config/Any.pm
    trunk/libconfig-any-perl/t/10-branches.t

Modified: trunk/libconfig-any-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-any-perl/Changes?rev=27054&op=diff
==============================================================================

--- trunk/libconfig-any-perl/Changes (original)
+++ trunk/libconfig-any-perl/Changes Sat Nov 22 07:15:48 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: trunk/libconfig-any-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-any-perl/MANIFEST?rev=27054&op=diff
==============================================================================
--- trunk/libconfig-any-perl/MANIFEST (original)
+++ trunk/libconfig-any-perl/MANIFEST Sat Nov 22 07:15:48 2008
@@ -55,3 +55,4 @@
 t/multi/conf.yml
 t/pod-coverage.t
 t/pod.t
+t/supported/conf.pl

Modified: trunk/libconfig-any-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-any-perl/META.yml?rev=27054&op=diff
==============================================================================
--- trunk/libconfig-any-perl/META.yml (original)
+++ trunk/libconfig-any-perl/META.yml Sat Nov 22 07:15:48 2008
@@ -20,4 +20,4 @@
   perl: 5.6.0
 resources:
   license: http://dev.perl.org/licenses/
-version: 0.15
+version: 0.16

Modified: trunk/libconfig-any-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-any-perl/debian/changelog?rev=27054&op=diff
==============================================================================
--- trunk/libconfig-any-perl/debian/changelog (original)
+++ trunk/libconfig-any-perl/debian/changelog Sat Nov 22 07:15:48 2008
@@ -1,9 +1,13 @@
-libconfig-any-perl (0.15-2) UNRELEASED; urgency=low
+libconfig-any-perl (0.16-1) unstable; urgency=low
 
-  * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
+  [ gregor herrmann ]
+   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
-
- -- gregor herrmann <gregoa at debian.org>  Sun, 16 Nov 2008 20:40:49 +0100
+ 
+  [ Rene Mayorga ]  
+  * New upstream release
+ 
+ -- Rene Mayorga <rmayorga at debian.org.sv>  Sat, 22 Nov 2008 00:59:16 -0600
 
 libconfig-any-perl (0.15-1) unstable; urgency=low
 

Modified: trunk/libconfig-any-perl/lib/Config/Any.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-any-perl/lib/Config/Any.pm?rev=27054&op=diff
==============================================================================
--- trunk/libconfig-any-perl/lib/Config/Any.pm (original)
+++ trunk/libconfig-any-perl/lib/Config/Any.pm Sat Nov 22 07:15:48 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: trunk/libconfig-any-perl/t/10-branches.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-any-perl/t/10-branches.t?rev=27054&op=diff
==============================================================================
--- trunk/libconfig-any-perl/t/10-branches.t (original)
+++ trunk/libconfig-any-perl/t/10-branches.t Sat Nov 22 07:15:48 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" );


