X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2FConfig-Any.git;a=blobdiff_plain;f=lib%2FConfig%2FAny%2FGeneral.pm;h=db32022b709b1f7a982654f99a9ea30158793f20;hp=6aceb985bf4d236b5f7a0c8f8d6ce5df5019262d;hb=257737f9fe6767883962406974f9c53a1d2dbb1c;hpb=72628dc786ef43d546023d6f17a86c3f5edeb21a diff --git a/lib/Config/Any/General.pm b/lib/Config/Any/General.pm index 6aceb98..db32022 100644 --- a/lib/Config/Any/General.pm +++ b/lib/Config/Any/General.pm @@ -3,6 +3,8 @@ package Config::Any::General; use strict; use warnings; +use base 'Config::Any::Base'; + =head1 NAME Config::Any::General - Load Config::General files @@ -14,6 +16,7 @@ Loads Config::General files. Example: name = TestApp foo bar + bar [ arrayref-value ] qux xyzzy @@ -42,42 +45,26 @@ sub load { my $file = shift; my $args = shift || {}; - # work around bug (?) in Config::General - # return if $class->_test_perl($file); - $args->{ -ConfigFile } = $file; require Config::General; + Config::General->VERSION( '2.47' ); + + $args->{ -ForceArray } = 1 unless exists $args->{ -ForceArray }; + my $configfile = Config::General->new( %$args ); my $config = { $configfile->getall }; return $config; } -# this is a bit of a hack but necessary, because Config::General is *far* too lax -# about what it will load -- specifically, it seems to be quite happy to load a Perl -# config file (ie, a file which is valid Perl and creates a hashref) as if it were -# an Apache-style configuration file, presumably due to laziness on the part of the -# developer. - -sub _test_perl { - my ( $class, $file ) = @_; - my $is_perl_src; - eval { $is_perl_src = do "$file"; }; - delete $INC{ $file }; # so we don't screw stuff later on - return defined $is_perl_src; -} - -=head2 is_supported( ) +=head2 requires_all_of( ) -Returns true if L is available. +Specifies that this module requires L in order to work. =cut -sub is_supported { - eval { require Config::General; }; - return $@ ? 0 : 1; -} +sub requires_all_of { [ 'Config::General' => '2.47' ] } =head1 AUTHOR @@ -85,11 +72,11 @@ Brian Cassidy Ebricas@cpan.orgE =head1 CONTRIBUTORS -Joel Bernstein C<< >> +Joel Bernstein Erataxis@cpan.orgE =head1 COPYRIGHT AND LICENSE -Copyright 2007 by Brian Cassidy +Copyright 2006-2016 by Brian Cassidy Portions Copyright 2006 Portugal Telecom @@ -111,4 +98,3 @@ it under the same terms as Perl itself. =cut 1; -