Hello community, here is the log from the commit of package perl-Config-General for openSUSE:Factory checked in at 2014-09-17 17:26:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Config-General (Old) and /work/SRC/openSUSE:Factory/.perl-Config-General.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Config-General" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Config-General/perl-Config-General.changes 2014-06-30 21:50:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Config-General.new/perl-Config-General.changes 2014-09-17 17:26:41.000000000 +0200 @@ -1,0 +2,18 @@ +Tue Sep 16 08:07:57 UTC 2014 - coolo@suse.com + +- updated to 2.56 + 2.54 - fixed rt.cpan.org#39814. changed the order of pre-processing + in _read(): 1) remove comments, 2) check for continuation, + 3) remove empty lines. + + 2.53 - applied patch rt.cpan.org#68153, which adds a find() method to + Config::General::Extended. + + - fixed rt.cpan.org#79869 (in fact it has been fixed in 2.52 + but I forgot to mention it here). + + - applied spelling fixes rt.cpan.org 87072+87080. + + - fixed rt.cpan.org#89379 + +------------------------------------------------------------------- Old: ---- Config-General-2.52.tar.gz New: ---- Config-General-2.56.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Config-General.spec ++++++ --- /var/tmp/diff_new_pack.tDlTqX/_old 2014-09-17 17:26:42.000000000 +0200 +++ /var/tmp/diff_new_pack.tDlTqX/_new 2014-09-17 17:26:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Config-General -Version: 2.52 +Version: 2.56 Release: 0 %define cpan_name Config-General Summary: Generic Config Module @@ -28,10 +28,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -#BuildRequires: perl(Config::General) >= 1.18 -#BuildRequires: perl(Config::General::Extended) -#BuildRequires: perl(Config::General::Interpolated) -#BuildRequires: perl(Tie::IxHash) %{perl_requires} %description ++++++ Config-General-2.52.tar.gz -> Config-General-2.56.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/Changelog new/Config-General-2.56/Changelog --- old/Config-General-2.52/Changelog 2013-07-03 10:01:45.000000000 +0200 +++ new/Config-General-2.56/Changelog 2014-05-01 13:17:18.000000000 +0200 @@ -1,4 +1,18 @@ - 2.52 - applied pod patch rt.cpan.org#79603 +2.54 - fixed rt.cpan.org#39814. changed the order of pre-processing + in _read(): 1) remove comments, 2) check for continuation, + 3) remove empty lines. + +2.53 - applied patch rt.cpan.org#68153, which adds a find() method to + Config::General::Extended. + + - fixed rt.cpan.org#79869 (in fact it has been fixed in 2.52 + but I forgot to mention it here). + + - applied spelling fixes rt.cpan.org 87072+87080. + + - fixed rt.cpan.org#89379 + +2.52 - applied pod patch rt.cpan.org#79603 - fixed rt.cpan.org#80006, it tolerates now whitespaces after the block closing > @@ -32,7 +46,7 @@ parameters: -NormalizeOption, -NormalizeBlock and -NormalizeValue, which take a subroutine reference and change the block, option or value accordingly. - + - fixed rt.cpan.org#65860+76953 undefined value error. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/General/Extended.pm new/Config-General-2.56/General/Extended.pm --- old/Config-General-2.52/General/Extended.pm 2013-07-03 10:28:18.000000000 +0200 +++ new/Config-General-2.56/General/Extended.pm 2014-04-30 14:16:54.000000000 +0200 @@ -1,7 +1,7 @@ # # Config::General::Extended - special Class based on Config::General # -# Copyright (c) 2000-2013 Thomas Linden <tlinden |AT| cpan.org>. +# Copyright (c) 2000-2014 Thomas Linden <tlinden |AT| cpan.org>. # All Rights Reserved. Std. disclaimer applies. # Artistic License, same as perl itself. Have fun. # @@ -23,7 +23,7 @@ use strict; -$Config::General::Extended::VERSION = "2.06"; +$Config::General::Extended::VERSION = "2.07"; sub new { @@ -314,7 +314,17 @@ return $this->{configfile}; } - +sub find { + my $this = shift; + my $key = shift; + return undef unless $this->exists($key); + if (@_) { + return $this->obj($key)->find(@_); + } + else { + return $this->obj($key); + } +} sub AUTOLOAD { # @@ -557,12 +567,36 @@ You can use this method in B<foreach> loops as seen in an example above(obj() ). -=item delete ('key') +=item delete('key') This method removes the given key and all associated data from the internal hash structure. If 'key' contained data, then this data will be returned, otherwise undef will be returned. +=item find(@list) + +Given a list of nodes, ->find will search for a tree that branches in +just this way, returning the Config::General::Extended object it finds +at the bottom if it exists. You can also search partway down the tree +and ->find should return where you left off. + +For example, given the values B<find (qw (A B C))> and the following +tree (</end> tags ommitted for brevity): + + <A> + <FOO> + ... + <B> + <BAZ> + ... + <C> + BAR = shoo + +B<find()> will find the object at I<C> with the value BAR = shoo and +return it. + + + =back @@ -606,7 +640,7 @@ =head1 COPYRIGHT -Copyright (c) 2000-2013 Thomas Linden +Copyright (c) 2000-2014 Thomas Linden This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. @@ -623,7 +657,7 @@ =head1 VERSION -2.06 +2.07 =cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/General/Interpolated.pm new/Config-General-2.56/General/Interpolated.pm --- old/Config-General-2.52/General/Interpolated.pm 2013-07-03 10:27:59.000000000 +0200 +++ new/Config-General-2.56/General/Interpolated.pm 2014-04-30 14:16:54.000000000 +0200 @@ -2,7 +2,7 @@ # Config::General::Interpolated - special Class based on Config::General # # Copyright (c) 2001 by Wei-Hon Chen <plasmaball@pchome.com.tw>. -# Copyright (c) 2000-2013 by Thomas Linden <tlinden |AT| cpan.org>. +# Copyright (c) 2000-2014 by Thomas Linden <tlinden |AT| cpan.org>. # All Rights Reserved. Std. disclaimer applies. # Artistic License, same as perl itself. Have fun. # @@ -340,7 +340,7 @@ =head1 COPYRIGHT Copyright 2001 by Wei-Hon Chen E<lt>plasmaball@pchome.com.twE<gt>. -Copyright 2002-2013 by Thomas Linden <tlinden |AT| cpan.org>. +Copyright 2002-2014 by Thomas Linden <tlinden |AT| cpan.org>. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/General.pm new/Config-General-2.56/General.pm --- old/Config-General-2.52/General.pm 2013-07-03 10:27:43.000000000 +0200 +++ new/Config-General-2.56/General.pm 2014-05-04 15:25:59.000000000 +0200 @@ -5,7 +5,7 @@ # config values from a given file and # return it as hash structure # -# Copyright (c) 2000-2013 Thomas Linden <tlinden |AT| cpan.org>. +# Copyright (c) 2000-2014 Thomas Linden <tlinden |AT| cpan.org>. # All Rights Reserved. Std. disclaimer applies. # Artistic License, same as perl itself. Have fun. # @@ -32,7 +32,7 @@ use Carp; use Exporter; -$Config::General::VERSION = "2.52"; +$Config::General::VERSION = "2.56"; use vars qw(@ISA @EXPORT_OK); use base qw(Exporter); @@ -632,12 +632,12 @@ # Remove comments and empty lines s/(?<!\\)#.*$//; # .+ => .* bugfix rt.cpan.org#44600 next if /^\s*#/; - next if /^\s*$/; + #next if /^\s*$/; # look for multiline option, indicated by a trailing backslash if (/(?<!\\)\\$/) { - chop; + chop; # remove trailing backslash s/^\s*//; $longline .= $_; next; @@ -706,6 +706,9 @@ next; } else { + # ignore empty lines + next if /^\s*$/; + # look for include statement(s) my $incl_file; my $path = ''; @@ -727,7 +730,10 @@ } } else { - if (/^\s*<<include\s+(.+?)>>\s*$/i) { + if (/^\s*<<include\s+(["'])(.+?)>>\\s*$/i) { + $incl_file = $2; + } + elsif (/^\s*<<include\s+(.+?)>>\s*$/i) { $incl_file = $1; } } @@ -1814,7 +1820,7 @@ =item B<-ExtendedAccess> If set to a true value, you can use object oriented (extended) methods to -access the parsed config. See L<Config::General::Extended> for more informations. +access the parsed config. See L<Config::General::Extended> for more information. =item B<-StrictObjects> @@ -2709,11 +2715,11 @@ perllol Perl data structures: arrays of arrays Config::General::Extended Object oriented interface to parsed configs - Config::General::Interpolated Allows to use variables inside config files + Config::General::Interpolated Allows one to use variables inside config files =head1 LICENSE AND COPYRIGHT -Copyright (c) 2000-2013 Thomas Linden +Copyright (c) 2000-2014 Thomas Linden This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. @@ -2742,7 +2748,7 @@ =head1 VERSION -2.52 +2.56 =cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/MANIFEST new/Config-General-2.56/MANIFEST --- old/Config-General-2.52/MANIFEST 2011-02-16 13:01:55.000000000 +0100 +++ new/Config-General-2.56/MANIFEST 2014-05-04 15:25:04.000000000 +0200 @@ -30,6 +30,7 @@ t/cfg.6 t/cfg.7 t/cfg.8 +t/cfg.55 t/complex/n1.cfg t/complex/n2.cfg t/complex.cfg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/META.yml new/Config-General-2.56/META.yml --- old/Config-General-2.52/META.yml 2013-07-03 10:28:33.000000000 +0200 +++ new/Config-General-2.56/META.yml 2014-05-04 15:27:09.000000000 +0200 @@ -1,6 +1,6 @@ --- #YAML:1.0 name: Config-General -version: 2.52 +version: 2.56 abstract: ~ author: [] license: perl @@ -14,11 +14,13 @@ File::Spec::Functions: 0 FileHandle: 0 IO::File: 0 +resources: + repository: http://dev.catalyst.perl.org/repos/Config-General/trunk/ no_index: directory: - t - inc -generated_by: ExtUtils::MakeMaker version 6.57_05 +generated_by: ExtUtils::MakeMaker version 6.56 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/Makefile.PL new/Config-General-2.56/Makefile.PL --- old/Config-General-2.52/Makefile.PL 2013-07-03 10:27:20.000000000 +0200 +++ new/Config-General-2.56/Makefile.PL 2014-04-30 14:16:54.000000000 +0200 @@ -1,7 +1,7 @@ # # Makefile.PL - build file for Config::General # -# Copyright (c) 2000-2013 Thomas Linden <tom@daemon.de>. +# Copyright (c) 2000-2014 Thomas Linden <tom@daemon.de>. # All Rights Reserved. Std. disclaimer applies. # Artistic License, same as perl itself. Have fun. # @@ -20,6 +20,11 @@ 'File::Spec::Functions' => 0, 'File::Glob' => 0 }, + 'META_MERGE' => { + resources => { + repository => 'http://dev.catalyst.perl.org/repos/Config-General/trunk/', + }, + }, ($ExtUtils::MakeMaker::VERSION ge '6.31'? ('LICENSE' => 'perl', ) : ()), ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/README new/Config-General-2.56/README --- old/Config-General-2.52/README 2011-02-16 13:01:55.000000000 +0100 +++ new/Config-General-2.56/README 2014-05-04 15:26:10.000000000 +0200 @@ -80,11 +80,11 @@ COPYRIGHT Config::General Config::General::Extended - Copyright (c) 2000-2007 by Thomas Linden <tom@daemon.de> + Copyright (c) 2000-2014 by Thomas Linden <tom@daemon.de> Config::General::Interpolated Copyright (c) 2001 by Wei-Hon Chen <plasmaball@pchome.com.tw> - Copyright (c) 2002-2007 by Thomas Linden <tom@daemon.de>. + Copyright (c) 2002-2014 by Thomas Linden <tom@daemon.de>. This library is free software; you can redistribute it and/or modify it under the same terms as Perl itself. @@ -104,4 +104,4 @@ VERSION - 2.50 + 2.56 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/t/cfg.55 new/Config-General-2.56/t/cfg.55 --- old/Config-General-2.52/t/cfg.55 1970-01-01 01:00:00.000000000 +0100 +++ new/Config-General-2.56/t/cfg.55 2014-05-01 13:15:40.000000000 +0200 @@ -0,0 +1,5 @@ +a = 1 + +b = nochop\ + +c = should stay alone diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Config-General-2.52/t/run.t new/Config-General-2.56/t/run.t --- old/Config-General-2.52/t/run.t 2013-07-03 09:04:29.000000000 +0200 +++ new/Config-General-2.56/t/run.t 2014-05-01 13:15:57.000000000 +0200 @@ -8,7 +8,7 @@ use Data::Dumper; -use Test::More tests => 70; +use Test::More tests => 71; #use Test::More qw(no_plan); # ahem, we deliver the test code with a local copy of @@ -737,3 +737,8 @@ my $cfg54 = new Config::General(-NoEscape => 1, -String => qq(val = \\\$notavar:\\blah\n)); my %hash54 = $cfg54->getall(); is($hash54{val}, qq(\\\$notavar:\\blah), "check -NoEscape"); + +# check for line continuation followed by empty line (rt.cpan.org#39814) +my $cfg55 = new Config::General( -ConfigFile => "t/cfg.55" ); +my %hash55 = $cfg55->getall(); +is($hash55{b}, "nochop", "check continuation followed by empty line"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org