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=936bb4498a8fdc8661bc968822112dd3b36bee8b;hp=76b04a9a5ad93a5c81157f862a17b85c9a92360b;hb=7adf5673d07031b77f7edd3403491512b9a48cb3;hpb=f0e3c2214342d0d8a8839009b8b9c7e6bfbc7ab2 diff --git a/lib/Config/Any/General.pm b/lib/Config/Any/General.pm index 76b04a9..936bb44 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 @@ -40,14 +43,19 @@ Attempts to load C<$file> via Config::General. sub load { my $class = shift; my $file = shift; + my $args = shift || {}; # work around bug (?) in Config::General -# return if $class->_test_perl($file); + # return if $class->_test_perl($file); + + $args->{ -ConfigFile } = $file; + + $args->{ -ForceArray } = 1 unless exists $args->{ -ForceArray }; require Config::General; - my $configfile = Config::General->new( $file ); + my $configfile = Config::General->new( %$args ); my $config = { $configfile->getall }; - + return $config; } @@ -58,32 +66,32 @@ sub load { # developer. sub _test_perl { - my ($class, $file) = @_; + my ( $class, $file ) = @_; my $is_perl_src; eval { $is_perl_src = do "$file"; }; - delete $INC{$file}; # so we don't screw stuff later on + delete $INC{ $file }; # so we don't screw stuff later on return defined $is_perl_src; } -=head1 AUTHOR +=head2 requires_all_of( ) -=over 4 +Specifies that this module requires L in order to work. -=item * Brian Cassidy Ebricas@cpan.orgE +=cut -=back +sub requires_all_of { 'Config::General' } -=head1 CONTRIBUTORS +=head1 AUTHOR -=over 4 +Brian Cassidy Ebricas@cpan.orgE -=item * Joel Bernstein C<< >> +=head1 CONTRIBUTORS -=back +Joel Bernstein C<< >> =head1 COPYRIGHT AND LICENSE -Copyright 2006 by Brian Cassidy +Copyright 2006-2010 by Brian Cassidy Portions Copyright 2006 Portugal Telecom