r58619 - in /trunk/libconfig-mvp-perl: ./ debian/ lib/Config/ lib/Config/MVP/ lib/Config/MVP/Assembler/ lib/Config/MVP/Reader/ lib/Config/MVP/Reader/Findable/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sat May 29 09:54:29 UTC 2010
Author: ansgar-guest
Date: Sat May 29 09:54:18 2010
New Revision: 58619
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58619
Log:
* New upstream release.
* Add (build-)dep on libtry-tiny-perl.
Modified:
trunk/libconfig-mvp-perl/Changes
trunk/libconfig-mvp-perl/META.json
trunk/libconfig-mvp-perl/META.yml
trunk/libconfig-mvp-perl/Makefile.PL
trunk/libconfig-mvp-perl/README
trunk/libconfig-mvp-perl/debian/changelog
trunk/libconfig-mvp-perl/debian/control
trunk/libconfig-mvp-perl/lib/Config/MVP.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler/WithBundles.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Reader.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable/ByExtension.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Finder.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Hash.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Section.pm
trunk/libconfig-mvp-perl/lib/Config/MVP/Sequence.pm
Modified: trunk/libconfig-mvp-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/Changes?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/Changes (original)
+++ trunk/libconfig-mvp-perl/Changes Sat May 29 09:54:18 2010
@@ -1,4 +1,7 @@
Revision history for Config-MVP
+
+2.101480 2010-05-28 22:59:18 America/New_York
+ add an if_none callback to Reader::Finder; for now, private
2.101460 2010-05-26 22:29:43 America/New_York
[BREAKS BACKWARD COMPATIBILITY]
Modified: trunk/libconfig-mvp-perl/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/META.json?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/META.json (original)
+++ trunk/libconfig-mvp-perl/META.json Sat May 29 09:54:18 2010
@@ -26,7 +26,8 @@
"Moose::Util::TypeConstraints" : "0",
"Params::Util" : "0",
"Test::More" : "0.88",
- "Tie::IxHash" : "0"
+ "Tie::IxHash" : "0",
+ "Try::Tiny" : "0"
}
},
"test" : {
@@ -40,7 +41,7 @@
"url" : "git://git.codesimply.com/Config-MVP.git"
}
},
- "version" : "2.101460",
+ "version" : "2.101480",
"x_Dist_Zilla" : {
"plugins" : [
{
Modified: trunk/libconfig-mvp-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/META.yml?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/META.yml (original)
+++ trunk/libconfig-mvp-perl/META.yml Sat May 29 09:54:18 2010
@@ -7,7 +7,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.31
dynamic_config: 0
-generated_by: 'Dist::Zilla version 3.101460, CPAN::Meta::Converter version 2.101460'
+generated_by: 'Dist::Zilla version 3.101460, CPAN::Meta::Converter version 2.101461'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -22,9 +22,10 @@
Params::Util: 0
Test::More: 0.88
Tie::IxHash: 0
+ Try::Tiny: 0
resources:
repository: git://git.codesimply.com/Config-MVP.git
-version: 2.101460
+version: 2.101480
x_Dist_Zilla:
plugins:
-
Modified: trunk/libconfig-mvp-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/Makefile.PL?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/Makefile.PL (original)
+++ trunk/libconfig-mvp-perl/Makefile.PL Sat May 29 09:54:18 2010
@@ -29,9 +29,10 @@
'Moose::Util::TypeConstraints' => '0',
'Params::Util' => '0',
'Test::More' => '0.88',
- 'Tie::IxHash' => '0'
+ 'Tie::IxHash' => '0',
+ 'Try::Tiny' => '0'
},
- 'VERSION' => '2.101460',
+ 'VERSION' => '2.101480',
'test' => {
'TESTS' => 't/*.t'
}
Modified: trunk/libconfig-mvp-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/README?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/README (original)
+++ trunk/libconfig-mvp-perl/README Sat May 29 09:54:18 2010
@@ -1,7 +1,7 @@
This archive contains the distribution Config-MVP,
-version 2.101460:
+version 2.101480:
multivalue-property package-oriented configuration
Modified: trunk/libconfig-mvp-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/debian/changelog?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/debian/changelog (original)
+++ trunk/libconfig-mvp-perl/debian/changelog Sat May 29 09:54:18 2010
@@ -1,3 +1,10 @@
+libconfig-mvp-perl (2.101480-1) unstable; urgency=low
+
+ * New upstream release.
+ * Add (build-)dep on libtry-tiny-perl.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Sat, 29 May 2010 18:46:19 +0900
+
libconfig-mvp-perl (2.101460-1) unstable; urgency=low
* New upstream release.
Modified: trunk/libconfig-mvp-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/debian/control?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/debian/control (original)
+++ trunk/libconfig-mvp-perl/debian/control Sat May 29 09:54:18 2010
@@ -4,7 +4,7 @@
Build-Depends: debhelper (>= 7)
Build-Depends-Indep: perl, libtie-ixhash-perl, libmoose-perl,
perl (>= 5.8.9) | libmodule-pluggable-perl, libparams-util-perl,
- perl (>= 5.10.1) | libtest-simple-perl (>= 0.88)
+ libtry-tiny-perl, perl (>= 5.10.1) | libtest-simple-perl (>= 0.88)
Build-Conflicts: libtest-pod-coverage-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: gregor herrmann <gregoa at debian.org>,
@@ -17,7 +17,8 @@
Package: libconfig-mvp-perl
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, libtie-ixhash-perl, libmoose-perl,
- perl (>= 5.8.9) | libmodule-pluggable-perl, libparams-util-perl
+ perl (>= 5.8.9) | libmodule-pluggable-perl, libparams-util-perl,
+ libtry-tiny-perl
Breaks:
libconfig-ini-mvp-perl (<< 1.101451-2~),
libconfig-mvp-reader-ini-perl (<< 2.101460~),
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP;
BEGIN {
- $Config::MVP::VERSION = '2.101460';
+ $Config::MVP::VERSION = '2.101480';
}
# ABSTRACT: multivalue-property package-oriented configuration
use strict;
@@ -18,7 +18,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 SYNOPSIS
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Assembler;
BEGIN {
- $Config::MVP::Assembler::VERSION = '2.101460';
+ $Config::MVP::Assembler::VERSION = '2.101480';
}
use Moose;
# ABSTRACT: multivalue-property config-loading state machine
@@ -123,7 +123,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 DESCRIPTION
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler/WithBundles.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler/WithBundles.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler/WithBundles.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Assembler/WithBundles.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Assembler::WithBundles;
BEGIN {
- $Config::MVP::Assembler::WithBundles::VERSION = '2.101460';
+ $Config::MVP::Assembler::WithBundles::VERSION = '2.101480';
}
use Moose::Role;
# ABSTRACT: a role to make assemblers expand bundles
@@ -96,7 +96,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 DESCRIPTION
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Reader.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Reader.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Reader.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Reader.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Reader;
BEGIN {
- $Config::MVP::Reader::VERSION = '2.101460';
+ $Config::MVP::Reader::VERSION = '2.101480';
}
use Moose;
# ABSTRACT: object to read config from storage into an assembler
@@ -41,7 +41,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 SYNOPSIS
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Reader::Findable;
BEGIN {
- $Config::MVP::Reader::Findable::VERSION = '2.101460';
+ $Config::MVP::Reader::Findable::VERSION = '2.101480';
}
use Moose::Role;
# ABSTRACT: a config class that Config::MVP::Reader::Finder can find
@@ -21,7 +21,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 DESCRIPTION
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable/ByExtension.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable/ByExtension.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable/ByExtension.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Findable/ByExtension.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Reader::Findable::ByExtension;
BEGIN {
- $Config::MVP::Reader::Findable::ByExtension::VERSION = '2.101460';
+ $Config::MVP::Reader::Findable::ByExtension::VERSION = '2.101480';
}
use Moose::Role;
# ABSTRACT: a Findable Reader that looks for files by extension
@@ -33,7 +33,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 METHODS
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Finder.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Finder.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Finder.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Finder.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Reader::Finder;
BEGIN {
- $Config::MVP::Reader::Finder::VERSION = '2.101460';
+ $Config::MVP::Reader::Finder::VERSION = '2.101480';
}
use Moose;
extends 'Config::MVP::Reader';
@@ -8,6 +8,7 @@
use Module::Pluggable::Object;
+use Try::Tiny;
sub default_search_path {
@@ -54,6 +55,11 @@
};
}
+has if_none => (
+ is => 'ro',
+ isa => 'Maybe[Str|CodeRef]',
+);
+
sub read_config {
my ($self, $location, $arg) = @_;
$self = $self->new unless blessed($self);
@@ -61,7 +67,14 @@
local $arg->{assembler} = $arg->{assembler} || $self->build_assembler;
- my $which = $self->_which_reader($location);
+ my $which = try {
+ $self->_which_reader($location);
+ } catch {
+ die $_ unless $_ =~ /^no viable configuration/;
+ die $_ unless defined (my $handler = $self->if_none);
+ return $self->$handler($location, $arg);
+ };
+
my $reader = $which->{package}->new;
return $reader->read_config( $which->{location}, $arg );
@@ -86,7 +99,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 DESCRIPTION
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Hash.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Hash.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Hash.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Reader/Hash.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Reader::Hash;
BEGIN {
- $Config::MVP::Reader::Hash::VERSION = '2.101460';
+ $Config::MVP::Reader::Hash::VERSION = '2.101480';
}
use Moose;
extends 'Config::MVP::Reader';
@@ -43,7 +43,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 SYNOPSIS
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Section.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Section.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Section.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Section.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Section;
BEGIN {
- $Config::MVP::Section::VERSION = '2.101460';
+ $Config::MVP::Section::VERSION = '2.101480';
}
use Moose;
# ABSTRACT: one section of an MVP configuration sequence
@@ -165,7 +165,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 DESCRIPTION
Modified: trunk/libconfig-mvp-perl/lib/Config/MVP/Sequence.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libconfig-mvp-perl/lib/Config/MVP/Sequence.pm?rev=58619&op=diff
==============================================================================
--- trunk/libconfig-mvp-perl/lib/Config/MVP/Sequence.pm (original)
+++ trunk/libconfig-mvp-perl/lib/Config/MVP/Sequence.pm Sat May 29 09:54:18 2010
@@ -1,6 +1,6 @@
package Config::MVP::Sequence;
BEGIN {
- $Config::MVP::Sequence::VERSION = '2.101460';
+ $Config::MVP::Sequence::VERSION = '2.101480';
}
use Moose;
# ABSTRACT: an ordered set of named configuration sections
@@ -129,7 +129,7 @@
=head1 VERSION
-version 2.101460
+version 2.101480
=head1 DESCRIPTION
More information about the Pkg-perl-cvs-commits
mailing list