July 2013 - openSUSE Commits - openSUSE Mailing Lists

commit python-six for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package python-six for openSUSE:Factory checked in at 2013-07-31 17:24:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-six (Old) and /work/SRC/openSUSE:Factory/.python-six.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-six" Changes: -------- --- /work/SRC/openSUSE:Factory/python-six/python-six.changes 2013-05-02 11:44:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-six.new/python-six.changes 2013-07-31 17:24:52.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 30 07:41:52 UTC 2013 - speilicke(a)suse.com + +- Run testsuite +- Build and package HTML documentation + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-six.spec ++++++ --- /var/tmp/diff_new_pack.kZosRm/_old 2013-07-31 17:24:52.000000000 +0200 +++ /var/tmp/diff_new_pack.kZosRm/_new 2013-07-31 17:24:52.000000000 +0200 @@ -17,16 +17,21 @@ %define modname six -Name: python-%{modname} +Name: python-six Version: 1.3.0 Release: 0 Url: http://pypi.python.org/pypi/six/ Summary: Python 2 and 3 compatibility utilities License: MIT Group: Development/Libraries/Python -Source: http://pypi.python.org/packages/source/s/%{modname}/%{modname}-%{version}.t… +Source: http://pypi.python.org/packages/source/s/six/six-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel +# Documentation requirements: +BuildRequires: python-Sphinx +# Test requirements: +BuildRequires: python-py +BuildRequires: python-pytest %if 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %else @@ -42,18 +47,22 @@ what is provided. %prep -%setup -q -n %{modname}-%{version} +%setup -q -n six-%{version} %build python setup.py build +cd documentation && make html && rm _build/html/.buildinfo %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} +%check +python test_six.py + %files %defattr(-,root,root) -%doc LICENSE README -%{python_sitelib}/%{modname}.py* -%{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info +%doc LICENSE README documentation/_build/html +%{python_sitelib}/six.py* +%{python_sitelib}/six-%{version}-py%{py_ver}.egg-info %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-detox for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package python-detox for openSUSE:Factory checked in at 2013-07-31 17:24:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-detox (Old) and /work/SRC/openSUSE:Factory/.python-detox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-detox" Changes: -------- New Changes file: --- /dev/null 2013-07-23 23:44:04.804033756 +0200 +++ /work/SRC/openSUSE:Factory/.python-detox.new/python-detox.changes 2013-07-31 17:24:49.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Tue Jul 30 11:52:44 UTC 2013 - speilicke(a)suse.com + +- Initial version + New: ---- detox-0.9.2.tar.gz python-detox.changes python-detox.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-detox.spec ++++++ # # spec file for package python-detox # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ Name: python-detox Version: 0.9.2 Release: 0 License: AGPL-3.0 Summary: Distributing activities of the tox tool Url: http://bitbucket.org/hpk42/detox Group: Development/Languages/Python Source: https://pypi.python.org/packages/source/d/detox/detox-%{version}.tar.gz BuildRequires: python-devel BuildRequires: python-setuptools # Test requirements: BuildRequires: python-eventlet >= 0.9.16 BuildRequires: python-nose BuildRequires: python-py >= 1.4.13 BuildRequires: python-pytest BuildRequires: python-tox >= 1.4.3 Requires: python-eventlet >= 0.9.16 Requires: python-py >= 1.4.13 Requires: python-tox >= 1.4.3 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description detox is the distributed version of "tox". It makes efficient use of multiple CPUs by running all possible activities in parallel. It has the same options and configuration that tox has so after installation can just run: detox in the same way and with the same options with which you would run tox, see the tox home page for more info. %prep %setup -q -n detox-%{version} %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} #%%check #nosetests %files %defattr(-,root,root,-) %doc LICENSE CHANGELOG %{_bindir}/detox %{python_sitelib}/* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Time-Period for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package perl-Time-Period for openSUSE:Factory checked in at 2013-07-31 17:24:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Time-Period (Old) and /work/SRC/openSUSE:Factory/.perl-Time-Period.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Time-Period" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Time-Period/perl-Time-Period.changes 2011-11-21 12:49:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Time-Period.new/perl-Time-Period.changes 2013-07-31 17:24:46.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 27 11:58:36 UTC 2013 - coolo(a)suse.com + +- updated to 1.24 + - Minor doc update. + +------------------------------------------------------------------- Old: ---- Time-Period-1.23.tar.gz New: ---- Time-Period-1.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Time-Period.spec ++++++ --- /var/tmp/diff_new_pack.mN10Lw/_old 2013-07-31 17:24:47.000000000 +0200 +++ /var/tmp/diff_new_pack.mN10Lw/_new 2013-07-31 17:24:47.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Time-Period # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,35 +16,30 @@ # - Name: perl-Time-Period -Version: 1.23 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 1.24 +Release: 0 %define cpan_name Time-Period Summary: A Perl module to deal with time periods. +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Time-Period/ -#Source: http://www.cpan.org/authors/id/P/PB/PBOYD/%{cpan_name}-%{version}.tar.gz -Source: %{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/P/PB/PBOYD/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(ExtUtils::MakeMaker) >= 6.31 -BuildRequires: perl(Test::More) +#BuildRequires: perl(Time::Period) %{perl_requires} %description -Time-Period.pm is a Perl module that contains code for dealing with time -periods. Currently, there is only one function in this module. That -function is called inPeriod(). +The *inPeriod* function determines if a given time falls within a given +period. *inPeriod* returns *1* if the time does fall within the given +period, *0* if not, and *-1* if *inPeriod* detects a malformed time or +period. %prep %setup -q -n %{cpan_name}-%{version} -%if 0%{?sles_version} == 10 -%{__perl} -p -i -e 's|6.31|6.30|' Makefile.PL -%endif %build %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -58,9 +53,6 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) %doc LICENSE README ++++++ Time-Period-1.23.tar.gz -> Time-Period-1.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Time-Period-1.23/LICENSE new/Time-Period-1.24/LICENSE --- old/Time-Period-1.23/LICENSE 2011-02-27 11:53:20.000000000 +0100 +++ new/Time-Period-1.24/LICENSE 2013-07-04 17:04:09.000000000 +0200 @@ -1,4 +1,4 @@ -This software is copyright (c) 2011 by Paul Boyd. +This software is copyright (c) 1997 by Patrick Ryan. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,21 +12,22 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2011 by Paul Boyd. +This software is Copyright (c) 1997 by Patrick Ryan. This is free software, licensed under: The GNU General Public License, Version 1, February 1989 - GNU GENERAL PUBLIC LICENSE - Version 1, February 1989 + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The license agreements of most software companies try to keep users at the mercy of those companies. By contrast, our General Public @@ -67,7 +68,7 @@ The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any program or other work which @@ -185,7 +186,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -207,9 +208,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to humanity, the best way to achieve this is to make it @@ -235,8 +236,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + Also add information on how to contact you by electronic and paper mail. @@ -270,7 +272,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2011 by Paul Boyd. +This software is Copyright (c) 1997 by Patrick Ryan. This is free software, licensed under: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Time-Period-1.23/META.yml new/Time-Period-1.24/META.yml --- old/Time-Period-1.23/META.yml 2011-02-27 11:53:20.000000000 +0100 +++ new/Time-Period-1.24/META.yml 2013-07-04 17:04:09.000000000 +0200 @@ -5,10 +5,12 @@ build_requires: POSIX: 0 Test::More: 0 + strict: 0 + warnings: 0 configure_requires: - ExtUtils::MakeMaker: 6.31 + ExtUtils::MakeMaker: 6.30 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.200000, CPAN::Meta::Converter version 2.102400' +generated_by: 'Dist::Zilla version 4.300028, CPAN::Meta::Converter version 2.120921' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -17,4 +19,4 @@ requires: Exporter: 0 perl: 5.001 -version: 1.23 +version: 1.24 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Time-Period-1.23/Makefile.PL new/Time-Period-1.24/Makefile.PL --- old/Time-Period-1.23/Makefile.PL 2011-02-27 11:53:20.000000000 +0100 +++ new/Time-Period-1.24/Makefile.PL 2013-07-04 17:04:09.000000000 +0200 @@ -2,32 +2,34 @@ use strict; use warnings; -BEGIN { require 5.001; } +use 5.001; -use ExtUtils::MakeMaker 6.31; +use ExtUtils::MakeMaker 6.30; my %WriteMakefileArgs = ( - 'ABSTRACT' => 'A Perl module to deal with time periods.', - 'AUTHOR' => 'Patrick Ryan, Paul Boyd <pboyd(a)dev3l.net>', - 'BUILD_REQUIRES' => { - 'POSIX' => '0', - 'Test::More' => '0' + "ABSTRACT" => "A Perl module to deal with time periods.", + "AUTHOR" => "Patrick Ryan, Paul Boyd <pboyd\(a)dev3l.net>", + "BUILD_REQUIRES" => { + "POSIX" => 0, + "Test::More" => 0, + "strict" => 0, + "warnings" => 0 }, - 'CONFIGURE_REQUIRES' => { - 'ExtUtils::MakeMaker' => '6.31' + "CONFIGURE_REQUIRES" => { + "ExtUtils::MakeMaker" => "6.30" }, - 'DISTNAME' => 'Time-Period', - 'EXE_FILES' => [], - 'LICENSE' => 'perl', - 'NAME' => 'Time::Period', - 'PREREQ_PM' => { - 'Exporter' => '0' + "DISTNAME" => "Time-Period", + "EXE_FILES" => [], + "LICENSE" => "perl", + "NAME" => "Time::Period", + "PREREQ_PM" => { + "Exporter" => 0 }, - 'VERSION' => '1.23', - 'test' => { - 'TESTS' => 't/*.t' + "VERSION" => "1.24", + "test" => { + "TESTS" => "t/*.t" } ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Time-Period-1.23/dist.ini new/Time-Period-1.24/dist.ini --- old/Time-Period-1.23/dist.ini 2011-02-27 11:53:19.000000000 +0100 +++ new/Time-Period-1.24/dist.ini 2013-07-04 17:04:09.000000000 +0200 @@ -2,7 +2,10 @@ author = Patrick Ryan, Paul Boyd <pboyd(a)dev3l.net> license = Perl_5 -version = 1.23 +copyright_holder = Patrick Ryan +copyright_year = 1997 + +version = 1.24 [GatherDir] [PruneCruft] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Time-Period-1.23/lib/Time/Period.pm new/Time-Period-1.24/lib/Time/Period.pm --- old/Time-Period-1.23/lib/Time/Period.pm 2011-02-27 11:53:20.000000000 +0100 +++ new/Time-Period-1.24/lib/Time/Period.pm 2013-07-04 17:04:09.000000000 +0200 @@ -61,9 +61,9 @@ v-v -For the range specification v-v, if the second value is larger than -the first value, the range wraps around unless the scale specification -is year. +For the range specification v-v, if the first value is larger than the second +value (e.g. "min {20-10}"), the range wraps around unless the scale +specification is year. Year does not wrap because the year is never really reset, it just increments. Ignoring that fact has lead to the dreaded year 2000 @@ -160,10 +160,14 @@ =head1 VERSION -1.23 +1.24 =head1 HISTORY + Version 1.24 + ------------ + - Minor doc update. + Version 1.23 ------------ - Bug fixes: @@ -222,7 +226,7 @@ @ISA = qw(Exporter); @EXPORT = qw(inPeriod); -$VERSION = "1.23"; +$VERSION = "1.24"; sub inPeriod { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Text-CSV for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package perl-Text-CSV for openSUSE:Factory checked in at 2013-07-31 17:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Text-CSV (Old) and /work/SRC/openSUSE:Factory/.perl-Text-CSV.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Text-CSV" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Text-CSV/perl-Text-CSV.changes 2012-02-14 13:09:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Text-CSV.new/perl-Text-CSV.changes 2013-07-31 17:24:41.000000000 +0200 @@ -1,0 +2,13 @@ +Sat Jul 27 11:58:55 UTC 2013 - coolo(a)suse.com + +- updated to 1.32 + - fix t/rt71_pp.t + - fix handling UTF8 in parse method. + - fix getline with allow_loose_quotes (rt#83705) + - add allow_unquoted_escape + - fix parsing escapted sep char (found in Text::CSV_XS rt#81295) + * TODO: Updating documents and adding diag_verbose in the next version + - catch up Text::CSV_XS 0.99 + (except for diag_verbose and allow_unquoted_escape) + +------------------------------------------------------------------- Old: ---- Text-CSV-1.21.tar.gz New: ---- Text-CSV-1.32.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Text-CSV.spec ++++++ --- /var/tmp/diff_new_pack.itrNop/_old 2013-07-31 17:24:42.000000000 +0200 +++ /var/tmp/diff_new_pack.itrNop/_new 2013-07-31 17:24:42.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Text-CSV # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,20 +17,19 @@ Name: perl-Text-CSV -Version: 1.21 +Version: 1.32 Release: 0 %define cpan_name Text-CSV -Summary: Comma-separated values manipulator (using XS or PurePerl) -License: GPL-1.0+ or Artistic-1.0 +Summary: comma-separated values manipulator (using XS or PurePerl) +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Text-CSV/ -Source: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/Text-CSV-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/M/MA/MAKAMAKA/%{cpan_name}-%{version}.tar.gz +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(IO::Handle) -Requires: perl(IO::Handle) -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +#BuildRequires: perl(Text::CSV) %{perl_requires} %description @@ -60,11 +59,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files -%defattr(644,root,root,755) +%defattr(-,root,root,755) %doc Changes README %changelog ++++++ Text-CSV-1.21.tar.gz -> Text-CSV-1.32.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/Changes new/Text-CSV-1.32/Changes --- old/Text-CSV-1.21/Changes 2010-12-27 04:55:59.000000000 +0100 +++ new/Text-CSV-1.32/Changes 2013-06-13 08:36:38.000000000 +0200 @@ -1,5 +1,20 @@ Revision history for Perl extension Text::CSV. +1.32 + - fix t/rt71_pp.t + +1.31 Thu Jun 13 14:06:49 2013 + - fix handling UTF8 in parse method. + - fix getline with allow_loose_quotes (rt#83705) + - add allow_unquoted_escape + - fix parsing escapted sep char (found in Text::CSV_XS rt#81295) + + * TODO: Updating documents and adding diag_verbose in the next version + +1.30 Tue Jun 11 00:06:02 2013 + - catch up Text::CSV_XS 0.99 + (except for diag_verbose and allow_unquoted_escape) + 1.21 Mon Dec 27 12:35:35 2010 - updated the compatibility for Text::CSV_XS version 0.80 * added getline_all() and getaline_hr_all() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/MANIFEST new/Text-CSV-1.32/MANIFEST --- old/Text-CSV-1.21/MANIFEST 2010-12-27 04:45:58.000000000 +0100 +++ new/Text-CSV-1.32/MANIFEST 2013-06-13 08:47:00.000000000 +0200 @@ -37,3 +37,4 @@ t/util.pl Extra test utilities META.yml Module meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/META.json new/Text-CSV-1.32/META.json --- old/Text-CSV-1.21/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Text-CSV-1.32/META.json 2013-06-13 08:47:00.000000000 +0200 @@ -0,0 +1,48 @@ +{ + "abstract" : "comma-separated values manipulator (using XS or PurePerl)", + "author" : [ + "Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.130880", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Text-CSV", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : "0" + } + }, + "runtime" : { + "requires" : { + "IO::Handle" : "0", + "Test::Harness" : "0", + "Test::More" : "0" + } + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "url" : "http://github.com/makamaka/Text-CSV" + } + }, + "version" : "1.32" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/META.yml new/Text-CSV-1.32/META.yml --- old/Text-CSV-1.21/META.yml 2010-12-27 04:59:11.000000000 +0100 +++ new/Text-CSV-1.32/META.yml 2013-06-13 08:47:00.000000000 +0200 @@ -1,26 +1,26 @@ ---- #YAML:1.0 -name: Text-CSV -version: 1.21 -abstract: comma-separated values manipulator (using XS or PurePerl) +--- +abstract: 'comma-separated values manipulator (using XS or PurePerl)' author: - - Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt> -license: perl -distribution_type: module -configure_requires: - ExtUtils::MakeMaker: 0 + - 'Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>' build_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: 0 +configure_requires: + ExtUtils::MakeMaker: 0 +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.130880' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Text-CSV +no_index: + directory: + - t + - inc requires: - IO::Handle: 0 - Test::Harness: 0 - Test::More: 0 + IO::Handle: 0 + Test::Harness: 0 + Test::More: 0 resources: - repository: http://github.com/makamaka/Text-CSV -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.56 -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + repository: http://github.com/makamaka/Text-CSV +version: 1.32 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/README new/Text-CSV-1.32/README --- old/Text-CSV-1.21/README 2010-12-27 04:41:17.000000000 +0100 +++ new/Text-CSV-1.32/README 2013-06-10 17:12:22.000000000 +0200 @@ -1,4 +1,4 @@ -Text::CSV version 1.21 +Text::CSV version 1.30 ======================== comma-separated values manipulator @@ -31,7 +31,7 @@ COPYRIGHT AND LICENSE Copyright (C) 1997 Alan Citterman. All rights reserved. - Copyright (C) 2007-2010 Makamaka Hannyaharamitu. All rights reserved. + Copyright (C) 2007-2013 Makamaka Hannyaharamitu. All rights reserved. This library 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/Text-CSV-1.21/lib/Text/CSV.pm new/Text-CSV-1.32/lib/Text/CSV.pm --- old/Text-CSV-1.21/lib/Text/CSV.pm 2010-12-27 04:40:39.000000000 +0100 +++ new/Text-CSV-1.32/lib/Text/CSV.pm 2013-06-13 08:37:27.000000000 +0200 @@ -6,14 +6,14 @@ use vars qw( $VERSION $DEBUG ); BEGIN { - $VERSION = '1.21'; + $VERSION = '1.32'; $DEBUG = 0; } # if use CSV_XS, requires version my $Module_XS = 'Text::CSV_XS'; my $Module_PP = 'Text::CSV_PP'; -my $XS_Version = '0.80'; +my $XS_Version = '0.99'; my $Is_Dynamic = 0; @@ -27,6 +27,7 @@ keep_meta_info allow_loose_quotes allow_loose_escapes verbatim meta_info is_quoted is_binary eof getline print parse combine fields string error_diag error_input status blank_is_undef empty_is_undef getline_hr column_names bind_columns auto_diag quote_space quote_null getline_all getline_hr_all + is_missing quote_binary record_number print_hr PV IV NV /; # @@ -287,9 +288,10 @@ =head1 VERSION - 1.21 + 1.32 -This module is compatible with Text::CSV_XS B<0.80> and later. +This module is compatible with Text::CSV_XS B<0.99> and later. +(except for diag_verbose and allow_unquoted_escape) =head2 Embedded newlines @@ -569,6 +571,12 @@ binary mode (the C<{ binary =E<gt> 1 }> is set). The default is true. You can prevent NULL escapes by setting this attribute to 0. +=item quote_binary + +By default, all "unsafe" bytes inside a string cause the combined field to +be quoted. By setting this attribute to 0, you can disable that trigger for +bytes >= 0x7f. + =item keep_meta_info By default, the parsing of input lines is as simple and fast as @@ -928,6 +936,24 @@ This returns a true value if the data in the indicated column contained any byte in the range [\x00-\x08,\x10-\x1F,\x7F-\xFF] +=head2 is_missing + + my $missing = $csv->is_missing ($column_idx); + +Where C<$column_idx> is the (zero-based) index of the column in the last +result of L</getline_hr>. + + while (my $hr = $csv->getline_hr ($fh)) { + $csv->is_missing (0) and next; # This was an empty line + } + +When using L</getline_hr> for parsing, it is impossible to tell if the +fields are C<undef> because they where not filled in the CSV stream or +because they were not read at all, as B<all> the fields defined by +L</column_names> are set in the hash-ref. If you still need to know if all +fields in each row are provided, you should enable C<keep_meta_info> so you +can check the flags. + =head2 status $status = $csv->status (); @@ -978,6 +1004,14 @@ When called as a class method or a direct function call, the error diag is that of the last C<new ()> call. +=head2 record_number + + $recno = $csv->record_number (); + +Returns the records parsed by this csv instance. This value should be more +accurate than C<$.> when embedded newlines come in play. Records written by +this instance are not counted. + =head2 SetDiag $csv->SetDiag (0); @@ -1133,12 +1167,12 @@ Text::CSV_PP: -Copyright (C) 2005-2010 Makamaka Hannyaharamitu. +Copyright (C) 2005-2013 Makamaka Hannyaharamitu. Text:CSV_XS: -Copyright (C) 2007-2010 H.Merijn Brand for PROCURA B.V. +Copyright (C) 2007-2013 H.Merijn Brand for PROCURA B.V. Copyright (C) 1998-2001 Jochen Wiedmann. All rights reserved. Portions Copyright (C) 1997 Alan Citterman. All rights reserved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/lib/Text/CSV_PP.pm new/Text-CSV-1.32/lib/Text/CSV_PP.pm --- old/Text-CSV-1.21/lib/Text/CSV_PP.pm 2010-12-27 04:40:58.000000000 +0100 +++ new/Text-CSV-1.32/lib/Text/CSV_PP.pm 2013-06-13 07:06:01.000000000 +0200 @@ -11,7 +11,7 @@ use vars qw($VERSION); use Carp (); -$VERSION = '1.29'; +$VERSION = '1.31'; sub PV { 0 } sub IV { 1 } @@ -19,6 +19,7 @@ sub IS_QUOTED () { 0x0001; } sub IS_BINARY () { 0x0002; } +sub IS_MISSING () { 0x0010; } my $ERRORS = { @@ -60,6 +61,8 @@ 3006 => "EHR - bind_columns () did not pass enough refs for parsed fields", 3007 => "EHR - bind_columns needs refs to writable scalars", 3008 => "EHR - unexpected error in bound fields", + 3009 => "EHR - print_hr () called before column_names ()", + 3010 => "EHR - print_hr () called with invalid arguments", 0 => "", }; @@ -78,6 +81,7 @@ keep_meta_info => 0, allow_loose_quotes => 0, allow_loose_escapes => 0, + allow_unquoted_escape => 0, allow_whitespace => 0, chomp_verbatim => 0, types => undef, @@ -87,8 +91,11 @@ auto_diag => 0, quote_space => 1, quote_null => 1, + quote_binary => 1, + diag_verbose => 0, _EOF => 0, + _RECNO => 0, _STATUS => undef, _FIELDS => undef, _FFLAGS => undef, @@ -106,10 +113,12 @@ $INC{'bytes.pm'} = 1 unless $INC{'bytes.pm'}; # dummy no strict 'refs'; *{"utf8::is_utf8"} = sub { 0; }; + *{"utf8::decode"} = sub { }; } elsif ( $] < 5.008 ) { no strict 'refs'; *{"utf8::is_utf8"} = sub { 0; }; + *{"utf8::decode"} = sub { }; } elsif ( !defined &utf8::is_utf8 ) { require Encode; @@ -244,6 +253,11 @@ return $context ? @diag : $diagobj; } + +sub record_number { + return shift->{_RECNO}; +} + ################################################################################ # string ################################################################################ @@ -273,8 +287,8 @@ $self->{_STRING} = ''; $self->{_STATUS} = 0; - my ($always_quote, $binary, $quot, $sep, $esc, $empty_is_undef, $quote_space, $quote_null) - = @{$self}{qw/always_quote binary quote_char sep_char escape_char empty_is_undef quote_space quote_null/}; + my ($always_quote, $binary, $quot, $sep, $esc, $empty_is_undef, $quote_space, $quote_null, $quote_binary ) + = @{$self}{qw/always_quote binary quote_char sep_char escape_char empty_is_undef quote_space quote_null quote_binary/}; if(!defined $quot){ $quot = ''; } @@ -312,7 +326,7 @@ if( $binary and $quote_null ){ use bytes; - $must_be_quoted++ if ( $column =~ s/\0/${esc}0/g || $column =~ /[\x00-\x1f\x7f-\xa0]/ ); + $must_be_quoted++ if ( $column =~ s/\0/${esc}0/g || ($quote_binary && $column =~ /[\x00-\x1f\x7f-\xa0]/) ); } if($always_quote or $must_be_quoted){ @@ -340,9 +354,9 @@ return 0 if(!defined $line); - my ($binary, $quot, $sep, $esc, $types, $keep_meta_info, $allow_whitespace, $eol, $blank_is_undef, $empty_is_undef) + my ($binary, $quot, $sep, $esc, $types, $keep_meta_info, $allow_whitespace, $eol, $blank_is_undef, $empty_is_undef, $unquot_esc) = @{$self}{ - qw/binary quote_char sep_char escape_char types keep_meta_info allow_whitespace eol blank_is_undef empty_is_undef/ + qw/binary quote_char sep_char escape_char types keep_meta_info allow_whitespace eol blank_is_undef empty_is_undef allow_unquoted_escape/ }; $sep = ',' unless (defined $sep); @@ -357,15 +371,19 @@ my $re_split = $self->{_re_split}->{$quot}->{$esc}->{$sep} ||= _make_regexp_split_column($esc, $quot, $sep); my $re_quoted = $self->{_re_quoted}->{$quot} ||= qr/^\Q$quot\E(.*)\Q$quot\E$/s; my $re_in_quot_esp1 = $self->{_re_in_quot_esp1}->{$esc} ||= qr/\Q$esc\E(.)/; - my $re_in_quot_esp2 = $self->{_re_in_quot_esp2}->{$quot}->{$esc} ||= qr/[\Q$quot$esc\E0]/; + my $re_in_quot_esp2 = $self->{_re_in_quot_esp2}->{$quot}->{$esc} ||= qr/[\Q$quot$esc$sep\E0]/; my $re_quot_char = $self->{_re_quot_char}->{$quot} ||= qr/\Q$quot\E/; - my $re_esc = $self->{_re_esc}->{$quot}->{$esc} ||= qr/\Q$esc\E(\Q$quot\E|\Q$esc\E|0)/; + my $re_esc = $self->{_re_esc}->{$quot}->{$esc} ||= qr/\Q$esc\E(\Q$quot\E|\Q$esc\E|\Q$sep\E|0)/; my $re_invalid_quot = $self->{_re_invalid_quot}->{$quot}->{$esc} ||= qr/^$re_quot_char|[^\Q$re_esc\E]$re_quot_char/; if ($allow_whitespace) { $re_split = $self->{_re_split_allow_sp}->{$quot}->{$esc}->{$sep} ||= _make_regexp_split_column_allow_sp($esc, $quot, $sep); } + if ($unquot_esc) { + $re_split = $self->{_re_split_allow_unqout_esc}->{$quot}->{$esc}->{$sep} + ||= _make_regexp_split_column_allow_unqout_esc($esc, $quot, $sep); + } my $palatable = 1; my @part = (); @@ -445,7 +463,8 @@ $palatable = 0; last; } - else { + + unless ($self->{allow_loose_quotes}) { $col =~ s/\Q$esc\E(.)/$1/g; } } @@ -522,10 +541,20 @@ $col = undef; } + if ( $unquot_esc ) { + $col =~ s/\Q$esc\E(.)/$1/g; + } + + } + + utf8::encode($col) if $utf8; + if ( defined $col && _is_valid_utf8($col) ) { + utf8::decode($col); } push @part,$col; push @{$meta_flag}, $flag if ($keep_meta_info); + $self->{ _RECNO }++; $i++; } @@ -552,11 +581,36 @@ return qr/([^\Q$sep\E]*)\Q$sep\E/s; } - qr/( + return qr/( \Q$quot\E [^\Q$quot$esc\E]*(?:\Q$esc\E[\Q$quot$esc\E0][^\Q$quot$esc\E]*)* \Q$quot\E | # or + \Q$quot\E + (?:\Q$esc\E[\Q$quot$esc$sep\E0]|[^\Q$quot$esc$sep\E])* + \Q$quot\E + | # or + [^\Q$sep\E]* + ) + \Q$sep\E + /xs; +} + + +sub _make_regexp_split_column_allow_unqout_esc { + my ($esc, $quot, $sep) = @_; + + return qr/( + \Q$quot\E + [^\Q$quot$esc\E]*(?:\Q$esc\E[\Q$quot$esc\E0][^\Q$quot$esc\E]*)* + \Q$quot\E + | # or + \Q$quot\E + (?:\Q$esc\E[\Q$quot$esc$sep\E0]|[^\Q$quot$esc$sep\E])* + \Q$quot\E + | # or + (?:\Q$esc\E[\Q$quot$esc$sep\E0]|[^\Q$quot$esc$sep\E])* + | # or [^\Q$sep\E]* ) \Q$sep\E @@ -581,7 +635,7 @@ qr/$ws* ( \Q$quot\E - [^\Q$quot$esc\E]*(?:\Q$esc\E[\Q$quot$esc\E0][^\Q$quot$esc\E]*)* + [^\Q$quot$esc\E]*(?:\Q$esc\E[\Q$quot$esc$sep\E0][^\Q$quot$esc\E]*)* \Q$quot\E | # or [^\Q$sep\E]*? @@ -607,6 +661,13 @@ $io->print( $self->_string ) or $self->_set_error_diag(2200); } + +sub print_hr { + my ($self, $io, $hr) = @_; + $self->{_COLUMN_NAMES} or $self->_set_error_diag(3009); + ref $hr eq "HASH" or $self->_set_error_diag(3010); + $self->print ($io, [ map { $hr->{$_} } $self->column_names ]); +} ################################################################################ # getline ################################################################################ @@ -639,7 +700,10 @@ LOOP: { my $is_continued = scalar(my @list = $line =~ /$re/g) % 2; # if line is valid, quot is even - if ( $line =~ /${re}0/ ) { # null suspicion case + if ( $self->{allow_loose_quotes } ) { + $is_continued = 0; + } + elsif ( $line =~ /${re}0/ ) { # null suspicion case $is_continued = $line =~ qr/ ^ ( @@ -704,7 +768,6 @@ return []; } - ################################################################################ # getline_all ################################################################################ @@ -750,6 +813,10 @@ my $fr = $self->getline( $io ) or return undef; + if ( ref $self->{_FFLAGS} ) { + $self->{_FFLAGS}[$_] = IS_MISSING for ($#{$fr} + 1) .. $#{$self->{_COLUMN_NAMES}}; + } + @hr{ @{ $self->{_COLUMN_NAMES} } } = @$fr; \%hr; @@ -857,6 +924,13 @@ return if( $_[1] =~ /\D/ or $_[1] < 0 or $_[1] > $#{ $_[0]->{_FFLAGS} } ); $_[0]->{_FFLAGS}->[$_[1]] & IS_BINARY ? 1 : 0; } + +sub is_missing { + my ($self, $idx, $val) = @_; + ref $self->{_FFLAGS} && + $idx >= 0 && $idx < @{$self->{_FFLAGS}} or return; + $self->{_FFLAGS}[$idx] & IS_MISSING ? 1 : 0; +} ################################################################################ # _check_type # take an arg as scalar referrence. @@ -895,7 +969,8 @@ BEGIN { for my $method ( qw/always_quote binary keep_meta_info allow_loose_quotes allow_loose_escapes - verbatim blank_is_undef empty_is_undef auto_diag quote_space quote_null/ ) { + verbatim blank_is_undef empty_is_undef quote_space quote_null + quote_binary allow_unquoted_escape/ ) { eval qq| sub $method { \$_[0]->{$method} = defined \$_[1] ? \$_[1] : 0 if (\@_ > 1); @@ -971,6 +1046,41 @@ Carp::croak( $_[0]->error_diag . '' ); } +sub auto_diag { + my $self = shift; + if (@_) { + my $v = shift; + !defined $v || $v eq "" and $v = 0; + $v =~ m/^[0-9]/ or $v = $v ? 1 : 0; # default for true/false + $self->{auto_diag} = $v; + } + $self->{auto_diag}; +} + +sub diag_verbose { + my $self = shift; + if (@_) { + my $v = shift; + !defined $v || $v eq "" and $v = 0; + $v =~ m/^[0-9]/ or $v = $v ? 1 : 0; # default for true/false + $self->{diag_verbose} = $v; + } + $self->{diag_verbose}; +} + +sub _is_valid_utf8 { + return ( $_[0] =~ /^(?: + [\x00-\x7F] + |[\xC2-\xDF][\x80-\xBF] + |[\xE0][\xA0-\xBF][\x80-\xBF] + |[\xE1-\xEC][\x80-\xBF][\x80-\xBF] + |[\xED][\x80-\x9F][\x80-\xBF] + |[\xEE-\xEF][\x80-\xBF][\x80-\xBF] + |[\xF0][\x90-\xBF][\x80-\xBF][\x80-\xBF] + |[\xF1-\xF3][\x80-\xBF][\x80-\xBF][\x80-\xBF] + |[\xF4][\x80-\x8F][\x80-\xBF][\x80-\xBF] + )+$/x ) ? 1 : 0; +} ################################################################################ package Text::CSV::ErrorDiag; @@ -1042,9 +1152,10 @@ =head1 VERSION - 1.29 + 1.31 -This module is compatible with Text::CSV_XS B<0.80> and later. +This module is compatible with Text::CSV_XS B<0.99>. +(except for diag_verbose and allow_unquoted_escape) =head2 Unicode (UTF8) @@ -1764,7 +1875,7 @@ =head1 COPYRIGHT AND LICENSE -Copyright 2005-2010 by Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt> +Copyright 2005-2013 by Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt> This library 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/Text-CSV-1.21/t/10_base.t new/Text-CSV-1.32/t/10_base.t --- old/Text-CSV-1.21/t/10_base.t 2008-04-12 12:52:19.000000000 +0200 +++ new/Text-CSV-1.32/t/10_base.t 2013-06-10 17:12:22.000000000 +0200 @@ -3,7 +3,7 @@ use strict; $^W = 1; # use warnings core since 5.6 -use Test::More tests => 61; +use Test::More tests => 64; BEGIN { $ENV{PERL_TEXT_CSV} = 0; @@ -80,6 +80,10 @@ is (($csv->fields ())[2], "", "Hi! - fields () - field 3"); ok ( $csv->status (), "status ()"); +ok ( $csv->parse (""), "Empty line"); +is ( scalar $csv->fields (), 1, "Empty - count"); +is (($csv->fields ())[0], "", "One empty field"); + # Are Integers and Reals quoted? # # Important: Do not modify these tests unless you have a good diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/t/12_acc.t new/Text-CSV-1.32/t/12_acc.t --- old/Text-CSV-1.21/t/12_acc.t 2010-03-16 09:10:18.000000000 +0100 +++ new/Text-CSV-1.32/t/12_acc.t 2013-06-13 07:02:23.000000000 +0200 @@ -3,7 +3,7 @@ use strict; $^W = 1; # use warnings core since 5.6 -use Test::More tests => 113; +use Test::More tests => 133; BEGIN { $ENV{PERL_TEXT_CSV} = 0; @@ -23,13 +23,17 @@ is ($csv->keep_meta_info, 0, "keep_meta_info"); is ($csv->allow_loose_quotes, 0, "allow_loose_quotes"); is ($csv->allow_loose_escapes, 0, "allow_loose_escapes"); +is ($csv->allow_unquoted_escape, 0, "allow_unquoted_escape"); is ($csv->allow_whitespace, 0, "allow_whitespace"); is ($csv->blank_is_undef, 0, "blank_is_undef"); is ($csv->empty_is_undef, 0, "empty_is_undef"); is ($csv->auto_diag, 0, "auto_diag"); +is ($csv->diag_verbose, 0, "diag_verbose"); is ($csv->verbatim, 0, "verbatim"); is ($csv->quote_space, 1, "quote_space"); is ($csv->quote_null, 1, "quote_null"); +is ($csv->quote_binary, 1, "quote_binary"); +is ($csv->record_number, 0, "record_number"); is ($csv->binary (1), 1, "binary (1)"); my @fld = ( 'txt =, "Hi!"', "Yes", "", 2, undef, "1.09", "\r", undef ); @@ -47,20 +51,34 @@ is ($csv->always_quote (1), 1, "always_quote (1)"); is ($csv->allow_loose_quotes (1), 1, "allow_loose_quotes (1)"); is ($csv->allow_loose_escapes (1), 1, "allow_loose_escapes (1)"); +is ($csv->allow_unquoted_escape (1), 1, "allow_unquoted_escape (1)"); is ($csv->allow_whitespace (1), 1, "allow_whitespace (1)"); is ($csv->blank_is_undef (1), 1, "blank_is_undef (1)"); is ($csv->empty_is_undef (1), 1, "empty_is_undef (1)"); is ($csv->auto_diag (1), 1, "auto_diag (1)"); +is ($csv->auto_diag (2), 2, "auto_diag (2)"); +is ($csv->auto_diag (9), 9, "auto_diag (9)"); +is ($csv->auto_diag ("true"), 1, "auto_diag (\"true\")"); +is ($csv->auto_diag (undef), 0, "auto_diag (undef)"); +is ($csv->auto_diag (""), 0, "auto_diag (\"\")"); +is ($csv->diag_verbose (1), 1, "diag_verbose (1)"); +is ($csv->diag_verbose (2), 2, "diag_verbose (2)"); +is ($csv->diag_verbose (9), 9, "diag_verbose (9)"); +is ($csv->diag_verbose ("true"), 1, "diag_verbose (\"true\")"); +is ($csv->diag_verbose (undef), 0, "diag_verbose (undef)"); +is ($csv->diag_verbose (""), 0, "diag_verbose (\"\")"); is ($csv->verbatim (1), 1, "verbatim (1)"); is ($csv->quote_space (1), 1, "quote_space (1)"); is ($csv->quote_null (1), 1, "quote_null (1)"); +is ($csv->quote_binary (1), 1, "quote_binary (1)"); is ($csv->escape_char ("\\"), "\\", "escape_char (\\)"); ok ($csv->combine (@fld), "combine"); is ($csv->string, qq{=txt \\=, "Hi!"=;=Yes=;==;=2=;;=1.09=;=\r=;\r}, "string"); -is ($csv->quote_space (0), 0, "quote_space (1)"); -is ($csv->quote_null (0), 0, "quote_null (1)"); +is ($csv->quote_space (0), 0, "quote_space (0)"); +is ($csv->quote_null (0), 0, "quote_null (0)"); +is ($csv->quote_binary (0), 0, "quote_binary (0)"); # Funny settings, all three translate to \0 internally ok ($csv = Text::CSV->new ({ @@ -73,7 +91,9 @@ is ($csv->escape_char, undef, "escape_char undef"); ok ($csv->parse ("foo"), "parse (foo)"); $csv->sep_char (","); +is ($csv->record_number, 1, "record_number"); ok ($csv->parse ("foo"), "parse (foo)"); +is ($csv->record_number, 2, "record_number"); ok (!$csv->parse ("foo,foo\0bar"), "parse (foo)"); $csv->escape_char ("\\"); ok (!$csv->parse ("foo,foo\0bar"), "parse (foo)"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/t/46_eol_si.t new/Text-CSV-1.32/t/46_eol_si.t --- old/Text-CSV-1.21/t/46_eol_si.t 2010-09-25 10:33:01.000000000 +0200 +++ new/Text-CSV-1.32/t/46_eol_si.t 2013-06-10 17:15:33.000000000 +0200 @@ -211,3 +211,4 @@ $/ = $def_rs; 1; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/t/50_utf8.t new/Text-CSV-1.32/t/50_utf8.t --- old/Text-CSV-1.21/t/50_utf8.t 2008-10-18 04:40:01.000000000 +0200 +++ new/Text-CSV-1.32/t/50_utf8.t 2013-06-13 06:32:33.000000000 +0200 @@ -6,11 +6,11 @@ use Test::More; BEGIN { - if ($] < 5.008) { + if ($] < 5.008001) { plan skip_all => "UTF8 tests useless in this ancient perl version"; } else { - plan tests => 67; + plan tests => 91; } } @@ -32,7 +32,7 @@ # 0D = \r 3B = ; foreach my $test ( # Space-like characters - [ "\x{0000A0}", "U+0000A0 NO-BRAK SPACE" ], + [ "\x{0000A0}", "U+0000A0 NO-BREAK SPACE" ], [ "\x{00200B}", "U+00200B ZERO WIDTH SPACE" ], # Some characters with possible problems in the code point [ "\x{000122}", "U+000122 LATIN CAPITAL LETTER G WITH CEDILLA" ], @@ -58,9 +58,7 @@ my @out = $csv->fields; # Cannot use is_deeply (), because of the binary content is (scalar @in, scalar @out, "fields $msg"); - for (0 .. $#in) { - is_binary ($in[$_], $out[$_], "field $_ $msg"); - } + is_binary ($in[$_], $out[$_], "field $_ $msg") for 0 .. $#in; } # Test if the UTF8 part is accepted, but the \n is not @@ -68,7 +66,6 @@ is ($csv->binary, 0, "bin flag still unset"); is ($csv->error_diag + 0, 2021, "Error 2021"); -# As all utf tests are skipped for older pers, It's safe to use 3-arg open this way my $file = "files/utf8.csv"; SKIP: { open my $fh, "<:encoding(utf8)", $file or @@ -87,3 +84,50 @@ $csv->combine (@$row); ok (utf8::valid ($csv->string), "Combined string is valid utf8"); } + +# Test quote_binary +$csv->always_quote (0); +$csv->quote_space (0); +$csv->quote_binary (0); +ok ($csv->combine (" ", 1, "\x{20ac} "), "Combine"); +is ($csv->string, qq{ ,1,\x{20ac} }, "String 0-0"); +$csv->quote_binary (1); +ok ($csv->combine (" ", 1, "\x{20ac} "), "Combine"); +is ($csv->string, qq{ ,1,"\x{20ac} "}, "String 0-1"); + +$csv->quote_space (1); +$csv->quote_binary (0); +ok ($csv->combine (" ", 1, "\x{20ac} "), "Combine"); +is ($csv->string, qq{" ",1,"\x{20ac} "}, "String 1-0"); +ok ($csv->quote_binary (1), "quote binary on"); +ok ($csv->combine (" ", 1, "\x{20ac} "), "Combine"); +is ($csv->string, qq{" ",1,"\x{20ac} "}, "String 1-1"); + +open my $fh, ">:encoding(utf-8)", "_50test.csv"; +print $fh "euro\n\x{20ac}\neuro\n"; +close $fh; +open $fh, "<:encoding(utf-8)", "_50test.csv"; + +SKIP: { + my $out = ""; + my $isutf8 = $] < 5.008001 ? + sub { !$_[0]; } : # utf8::is_utf8 () not available in 5.8.0 + sub { utf8::is_utf8 ($out); }; + ok ($csv->auto_diag (1), "auto diag"); + ok ($csv->binary (1), "set binary"); + ok ($csv->bind_columns (\$out), "bind"); + ok ($csv->getline ($fh), "parse"); + is ($csv->is_binary (0), 0, "not binary"); + is ($out, "euro", "euro"); + ok (!$isutf8->(1), "not utf8"); + ok ($csv->getline ($fh), "parse"); + is ($csv->is_binary (0), 1, "is binary"); + is ($out, "\x{20ac}", "euro"); + ok ($isutf8->(0), "is utf8"); + ok ($csv->getline ($fh), "parse"); + is ($csv->is_binary (0), 0, "not binary"); + is ($out, "euro", "euro"); + ok (!$isutf8->(1), "not utf8"); + close $fh; + unlink "_50test.csv"; + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/t/51_utf8.t new/Text-CSV-1.32/t/51_utf8.t --- old/Text-CSV-1.21/t/51_utf8.t 2010-12-27 04:52:07.000000000 +0100 +++ new/Text-CSV-1.32/t/51_utf8.t 2013-06-10 17:12:22.000000000 +0200 @@ -6,8 +6,7 @@ use Test::More; BEGIN { - $ENV{PERL_TEXT_CSV} = 0; - $] < 5.008 and + $] < 5.008001 and plan skip_all => "UTF8 tests useless in this ancient perl version"; } @@ -44,10 +43,11 @@ [ "bytes up :encoding(UTF-8)", ":encoding(UTF-8)", $bytes_up, "utf8", "no warn", ], ); - plan tests => 1 + 6 * @tests; + plan tests => 7 + 6 * @tests; } BEGIN { + $ENV{PERL_TEXT_CSV} = 0; require_ok "Text::CSV"; plan skip_all => "Cannot load Text::CSV" if $@; require "t/util.pl"; @@ -94,3 +94,28 @@ is (warned ($c_warn), warned ($p_warn), "$test against Perl warning"); is (warned ($c_warn), $expect_w, "$test against expected warning"); } + +# Test automatic upgrades for valid UTF-8 +{ my $data = join "\n" => ( + "1,aap,3", # No diac + "1,a\x{e1}p,3", # a_ACUTE in ISO-8859-1 + "1,a\x{c4}\x{83}p,3", # a_BREVE in UTF-8 + ) x 2; + my @expect = ("aap", "a\341p", "a\x{0103}p") x 2; + + my $csv = Text::CSV->new ({ binary => 1, auto_diag => 1 }); + + foreach my $bc (undef, 3) { + my @data; + open my $fh, "<", \$data; + $bc and $csv->bind_columns (\my ($f1, $f2, $f3)); + is (scalar $csv->bind_columns, $bc, "Columns_bound?"); + while (my $row = $csv->getline ($fh)) { + push @data, $bc ? $f2 : $row->[1]; + } + close $fh; + is_deeply (\@data, \@expect, "Set and reset UTF-8 ".($bc?"no bind":"bind_columns")); + is_deeply ([ map { utf8::is_utf8 ($_) } @data ], + [ "", "", 1, "", "", 1 ], "UTF8 flags"); + } + } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/t/70_rt.t new/Text-CSV-1.32/t/70_rt.t --- old/Text-CSV-1.21/t/70_rt.t 2010-12-27 04:34:59.000000000 +0100 +++ new/Text-CSV-1.32/t/70_rt.t 2013-06-13 06:43:01.000000000 +0200 @@ -4,7 +4,7 @@ $^W = 1; #use Test::More "no_plan"; - use Test::More tests => 438; + use Test::More tests => 453; BEGIN { $ENV{PERL_TEXT_CSV} = 0; @@ -368,6 +368,110 @@ } } +{ # http://rt.cpan.org/Ticket/Display.html?id=74216 + $rt = "74216"; # setting 'eol' affects global input record separator + + open FH, ">$csv_file"; + print FH @{$input{$rt}}; + close FH; + + my $slurp_check = sub { + open FH, "<$csv_file"; + is (scalar @{[<FH>]}, 4); + close FH; + }; + + $slurp_check->(); + + my $crlf = "\015\012"; + open FH, ">_$csv_file"; + print FH "a,b,c" . $crlf . "1,2,3" . $crlf; + close FH; + open FH, "<_$csv_file"; + my $csv = Text::CSV->new ({ eol => $crlf }); + is_deeply ($csv->getline (*FH), [qw( a b c )]); + close FH; + unlink "_$csv_file"; + + $slurp_check->(); + + { local $/ = "\n"; + $slurp_check->(); + } + } + +SKIP: { # http://rt.cpan.org/Ticket/Display.html?id=74220 + $] < 5.008002 and skip "UTF8 unreliable in perl $]", 7; + + $rt = "74220"; # Text::CSV can be made to produce bad strings + my $csv = Text::CSV->new ({ binary => 1 }); + + my $ax = chr (0xfa); + my $bx = "foo"; + + # We set the UTF-8 flag on a string with no funny characters + utf8::upgrade ($bx); + is ($bx, "foo", "no funny characters in the string"); + + ok (utf8::valid ($ax), "first string correct in Perl"); + ok (utf8::valid ($bx), "second string correct in Perl"); + + ok ($csv->combine ($ax, $bx), "combine ()"); + ok (my $foo = $csv->string (), "string ()"); + + ok (utf8::valid ($foo), "is combined string correct inside Perl?"); + is ($foo, qq{\xfa,foo}, "expected result"); + } + +=pod + +SKIP: { # http://rt.cpan.org/Ticket/Display.html?id=80680 + skip "skip tests for XS, this tests too long to PP", 20000; + + (eval { require Encode; $Encode::VERSION } || "0.00") =~ m{^([0-9.]+)}; + $1 < 2.47 and skip "Encode is too old for these tests", 20000; + $] < 5.008008 and skip "UTF8+Encode unreliable in perl $]", 20000; + + $rt = "80680"; # Text::CSV produces garbage on some data + + my $csv = Text::CSV->new ({ binary => 1 }); + my $txt = "\x{415}\x{43a}\x{438}\x{43d}\x{431}\x{443}\x{440}\x{433}\x{2116}"; + BIG_LOOP: foreach my $n (1 .. 5000) { + foreach my $e (0 .. 3) { + + my $data = ("a" x $e) . ($txt x $n); + my $enc = Encode::encode ("UTF-8", $data); + my $exp = qq{1,"$enc"}; + my $out = ""; + open my $fh, ">:encoding(utf-8)", \$out; + $csv->print ($fh, [ 1, $data ]); + close $fh; + + my $l = length ($out); + if ($out eq $exp) { + ok (1, "Buffer boundary check $n/$e ($l)"); + next; + } + + is ($out, $exp, "Data $n/$e ($l)"); + last BIG_LOOP; + } + } + } + +=cut + +{ # http://rt.cpan.org/Ticket/Display.html?id=81295 + $rt = 81295; # escaped sep_char discarded when only item in unquoted field + my $csv = Text::CSV->new ({ escape_char => "\\", auto_diag => 1 }); + ok ($csv->parse ($input{$rt}[0]), "parse without allow_unquoted_escape"); + is_deeply ([ $csv->fields ], [ 1, ",", 3 ], "escaped sep in quoted field"); + $csv->allow_unquoted_escape (1); + ok ($csv->parse ($input{$rt}[1]), "parse with allow_unquoted_escape"); + is_deeply ([ $csv->fields ], [ 1, ",", 3 ], "escaped sep in unquoted field"); + } + + __END__ �24386� - \t doesn't work in _XS, works in _PP VIN StockNumber Year Make Model MD Engine EngineSize Transmission DriveTrain Trim BodyStyle CityFuel HWYFuel Mileage Color InteriorColor InternetPrice RetailPrice Notes ShortReview Certified NewUsed Image_URLs Equipment @@ -412,6 +516,16 @@ --------------090302050909040309030109-- �58356� - Incorrect CSV generated if "quote_space => 0" �61525� - eol not working for values other than "\n"? +�74216� - setting 'eol' affects global input record separator +1,2 +3,4 +5,6 +7,8 +�74330� - Text::CSV can be made to produce bad strings +�80680� - Text::CSV produces garbage on some data +�81295� - escaped sep_char discarded when only item in unquoted field +1,"\,",3 +1,\,,3 �x1001� - Lines starting with "0" (Ruslan Dautkhanov) "0","A" "0","A" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/t/71_pp.t new/Text-CSV-1.32/t/71_pp.t --- old/Text-CSV-1.21/t/71_pp.t 2010-10-20 06:39:08.000000000 +0200 +++ new/Text-CSV-1.32/t/71_pp.t 2013-06-13 08:29:31.000000000 +0200 @@ -5,7 +5,7 @@ use strict; $^W = 1; -use Test::More tests => 88; +use Test::More tests => 99; BEGIN { $ENV{PERL_TEXT_CSV} = $ARGV[0] || 0; } @@ -302,3 +302,52 @@ unlink( '__test.csv' ); } + +{ # https://rt.cpan.org/Ticket/Display.html?id=83705 + +my $csv = Text::CSV->new( + { + binary => 1, + allow_loose_escapes => 1, + allow_loose_quotes => 1, + sep_char => q{;}, + escape_char => q{"}, + quote_char => q{"} + } +); + +$csv->parse(q{"6RE";"EINKAUF";"5";"";"2,5" HD"}); +is_deeply([$csv->fields], ["6RE","EINKAUF","5","",'2,5" HD']); + +my $csv_dump = q{"6RE";"EINKAUF";"5";"";"2,5" HD" +"LIDL";"-2"}; + +open( FH, '>__test.csv' ) or die $!; +print FH $csv_dump; +close FH; + +open FH, '<__test.csv'; + +is_deeply( $csv->getline(*FH), ["6RE","EINKAUF","5","",'2,5" HD'] ); +is_deeply( $csv->getline(*FH), ['LIDL','-2'] ); + +close FH; + +unlink( '__test.csv' ); + +} + +{ # imported from t/70_rt.t +my $csv = Text::CSV->new ({ escape_char => "\\", auto_diag => 1 }); + +ok( $csv->parse(q{1,"\,",3}) ); +is_deeply ([ $csv->fields ], [ 1, ",", 3 ], "escaped sep in quoted field"); +ok( $csv->parse(q{1,"2\,4",3}) ); +is_deeply ([ $csv->fields ], [ 1, "2,4", 3 ], "escaped sep in quoted field"); + +$csv->allow_unquoted_escape(1); +ok( $csv->parse(q{1,\,,3}) ); +is_deeply ([ $csv->fields ], [ 1, ",", 3 ], "escaped sep in quoted field"); +ok( $csv->parse(q{1,2\,4,3}) ); +is_deeply ([ $csv->fields ], [ 1, "2,4", 3 ], "escaped sep in quoted field"); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-CSV-1.21/t/75_hashref.t new/Text-CSV-1.32/t/75_hashref.t --- old/Text-CSV-1.21/t/75_hashref.t 2010-06-18 05:00:28.000000000 +0200 +++ new/Text-CSV-1.32/t/75_hashref.t 2013-06-10 17:12:22.000000000 +0200 @@ -4,7 +4,7 @@ $^W = 1; #use Test::More "no_plan"; - use Test::More tests => 68; + use Test::More tests => 75; BEGIN { $ENV{PERL_TEXT_CSV} = 0; @@ -123,4 +123,17 @@ close FH; +open FH, ">_75test.csv"; +$hr = { c_foo => 1, foo => "poison", zebra => "Of course" }; +is ($csv->column_names (undef), undef, "reset column headers"); +ok ($csv->column_names (sort keys %$hr), "set column names"); +ok ($csv->eol ("\n"), "set eol for output"); +ok ($csv->print (*FH, [ $csv->column_names ]), "print header"); +ok ($csv->print_hr (*FH, $hr), "print_hr"); +close FH; +open FH, "<_75test.csv"; +ok ($csv->column_names ($csv->getline (*FH)), "get column names"); +is_deeply ($csv->getline_hr (*FH), $hr, "compare to written hr"); +close FH; + unlink "_75test.csv"; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Test-Requires for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package perl-Test-Requires for openSUSE:Factory checked in at 2013-07-31 17:24:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Test-Requires (Old) and /work/SRC/openSUSE:Factory/.perl-Test-Requires.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Test-Requires" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Test-Requires/perl-Test-Requires.changes 2011-11-21 12:47:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Test-Requires.new/perl-Test-Requires.changes 2013-07-31 17:24:36.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Jul 27 11:58:05 UTC 2013 - coolo(a)suse.com + +- updated to 0.07 + - If the C<< RELEASE_TESTING >> environment variable is true, then instead + of skipping tests, Test::Requires bails out. + (tobyink) + - document that use Test::Requires "5.010" works. + (tobyink) + +------------------------------------------------------------------- Old: ---- Test-Requires-0.06.tar.gz New: ---- Test-Requires-0.07.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-Requires.spec ++++++ --- /var/tmp/diff_new_pack.qNwK75/_old 2013-07-31 17:24:37.000000000 +0200 +++ /var/tmp/diff_new_pack.qNwK75/_new 2013-07-31 17:24:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Test-Requires # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,54 +15,56 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: perl-Test-Requires +Version: 0.07 +Release: 0 %define cpan_name Test-Requires Summary: Checks to see if the module can be loaded -Version: 0.06 -Release: 2 -License: GPL-1.0+ or Artistic-1.0 +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Test-Requires/ -#Source: http://search.cpan.org/CPAN/authors/id/T/TO/TOKUHIROM/Test-Requires-0.06.ta… -Source: %{cpan_name}-%{version}.tar.gz +Source: http://www.cpan.org/authors/id/T/TO/TOKUHIROM/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{perl_requires} BuildRequires: perl BuildRequires: perl-macros -BuildRequires: perl(Test::More) >= 0.61 -Requires: perl(Test::More) >= 0.61 +BuildRequires: perl(CPAN::Meta) +BuildRequires: perl(CPAN::Meta::Prereqs) +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.59 +BuildRequires: perl(Module::Build) >= 0.38 +#BuildRequires: perl(Test::Perl::Critic) +#BuildRequires: perl(Test::Requires) +%{perl_requires} %description Test::Requires checks to see if the module can be loaded. +If this fails rather than failing tests this *skips all tests*. + +Test::Requires can also be used to require a minimum version of Perl: + + use Test::Requires "5.010"; # quoting is necessary!! + + # or + use Test::Requires "v5.10"; + %prep %setup -q -n %{cpan_name}-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -%{__make} %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build build flags=%{?_smp_mflags} %check -%{__make} test +./Build test %install -%perl_make_install -# do not perl_process_packlist (noarch) -# remove .packlist file -%{__rm} -rf $RPM_BUILD_ROOT%perl_vendorarch -# remove perllocal.pod file -%{__rm} -rf $RPM_BUILD_ROOT%perl_archlib +./Build install destdir=%{buildroot} create_packlist=0 %perl_gen_filelist -%clean -%{__rm} -rf $RPM_BUILD_ROOT - %files -f %{name}.files -%defattr(-,root,root,-) -%doc Changes README +%defattr(-,root,root,755) +%doc Changes cpanfile LICENSE README.md %changelog ++++++ Test-Requires-0.06.tar.gz -> Test-Requires-0.07.tar.gz ++++++ ++++ 3048 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Test-Output for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package perl-Test-Output for openSUSE:Factory checked in at 2013-07-31 17:24:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Test-Output (Old) and /work/SRC/openSUSE:Factory/.perl-Test-Output.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Test-Output" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Test-Output/perl-Test-Output.changes 2011-09-23 12:39:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Test-Output.new/perl-Test-Output.changes 2013-07-31 17:24:31.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Jul 27 11:58:48 UTC 2013 - coolo(a)suse.com + +- updated to 1.02 + * Bump to stable release + * Remove the ::Tie stuff. It should be fully Capture::Tiny + now. + * David Golden re-did everything with Capture::Tiny + to get around the odd output paths that we coudn't + handle with a tie. + +------------------------------------------------------------------- Old: ---- Test-Output-1.01.tar.gz New: ---- Test-Output-1.02.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Test-Output.spec ++++++ --- /var/tmp/diff_new_pack.fW5c3G/_old 2013-07-31 17:24:32.000000000 +0200 +++ /var/tmp/diff_new_pack.fW5c3G/_new 2013-07-31 17:24:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Test-Output # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,25 @@ # - Name: perl-Test-Output -Version: 1.01 -Release: 1 -License: GPL-1.0+ or Artistic-1.0 +Version: 1.02 +Release: 0 %define cpan_name Test-Output Summary: Utilities to test STDOUT and STDERR messages. -Url: http://search.cpan.org/dist/Test-Output/ +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl +Url: http://search.cpan.org/dist/Test-Output/ Source: http://www.cpan.org/authors/id/B/BD/BDFOY/%{cpan_name}-%{version}.tar.gz BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros +BuildRequires: perl(Capture::Tiny) >= 0.17 BuildRequires: perl(File::Temp) >= 0.17 BuildRequires: perl(Sub::Exporter) BuildRequires: perl(Test::Tester) >= 0.107 +#BuildRequires: perl(Test::Output) +Requires: perl(Capture::Tiny) >= 0.17 Requires: perl(File::Temp) >= 0.17 Requires: perl(Sub::Exporter) Requires: perl(Test::Tester) >= 0.107 @@ -47,7 +49,9 @@ however, the features provided by the Sub::Exporter manpage over what the Exporter manpage provides is just to great to pass up. -Test::Output ties STDOUT and STDERR using Test::Output::Tie. +Likewise, Capture::Tiny provides a much more robust capture mechanism +without than the original Test::Output::Tie. (Test::Output::Tie is +deprecated, but included for backwards compatibility.) %prep %setup -q -n %{cpan_name}-%{version} @@ -64,11 +68,8 @@ %perl_process_packlist %perl_gen_filelist -%clean -%{__rm} -rf %{buildroot} - %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE README TODO +%doc Changes LICENSE MYMETA.json README TODO %changelog ++++++ Test-Output-1.01.tar.gz -> Test-Output-1.02.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Output-1.01/Changes new/Test-Output-1.02/Changes --- old/Test-Output-1.01/Changes 2011-04-22 07:59:02.000000000 +0200 +++ new/Test-Output-1.02/Changes 2013-07-09 04:15:57.000000000 +0200 @@ -1,5 +1,17 @@ Revision history for Test-Output +1.02 - Mon Jul 8 21:15:30 2013 + * Bump to stable release + +1.01_02 - Thu Jul 19 06:18:35 2012 + * Remove the ::Tie stuff. It should be fully Capture::Tiny + now. + +1.01_01 - Mon May 14 16:05:22 2012 + * David Golden re-did everything with Capture::Tiny + to get around the odd output paths that we coudn't + handle with a tie. + 1.01 - Fri Apr 22 07:58:19 2011 * Bump to a full release. This fixes the tests that failed in the new 5.14 regex stringification diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Output-1.01/MANIFEST new/Test-Output-1.02/MANIFEST --- old/Test-Output-1.01/MANIFEST 2011-04-22 07:59:03.000000000 +0200 +++ new/Test-Output-1.02/MANIFEST 2013-07-09 04:15:59.000000000 +0200 @@ -1,10 +1,10 @@ Changes lib/Test/Output.pm -lib/Test/Output/Tie.pm LICENSE Makefile.PL MANIFEST MANIFEST.SKIP +MYMETA.json README t/00.load.t t/binmode.t @@ -28,4 +28,5 @@ t/stdout_like.t t/stdout_unlike.t TODO -META.yml Module meta-data (added by MakeMaker) +META.yml Module YAML meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Output-1.01/META.json new/Test-Output-1.02/META.json --- old/Test-Output-1.01/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Test-Output-1.02/META.json 2013-07-09 04:15:59.000000000 +0200 @@ -0,0 +1,56 @@ +{ + "abstract" : "Utilities to test STDOUT and STDERR messages.", + "author" : [ + "brian d foy <bdfoy(a)cpan.org>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "keywords" : [ + "testing", + "STDOUT", + "STDERR" + ], + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Test-Output", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Capture::Tiny" : "0.17", + "File::Temp" : "0.17", + "Sub::Exporter" : 0, + "Test::More" : 0, + "Test::Tester" : "0.107", + "perl" : "5.006" + } + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "url" : "git://github.com/briandfoy/test-output.git" + } + }, + "version" : "1.02" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Output-1.01/META.yml new/Test-Output-1.02/META.yml --- old/Test-Output-1.01/META.yml 2011-04-22 07:59:03.000000000 +0200 +++ new/Test-Output-1.02/META.yml 2013-07-09 04:15:59.000000000 +0200 @@ -1,32 +1,33 @@ ---- #YAML:1.0 -name: Test-Output -version: 1.01 -abstract: Utilities to test STDOUT and STDERR messages. +--- +abstract: 'Utilities to test STDOUT and STDERR messages.' author: - - brian d foy <bdfoy(a)cpan.org> -license: perl -distribution_type: module -configure_requires: - ExtUtils::MakeMaker: 0 + - 'brian d foy <bdfoy(a)cpan.org>' build_requires: - ExtUtils::MakeMaker: 0 + ExtUtils::MakeMaker: 0 +configure_requires: + ExtUtils::MakeMaker: 0 +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150' +keywords: + - testing + - STDOUT + - STDERR +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: 1.4 +name: Test-Output +no_index: + directory: + - t + - inc requires: - File::Temp: 0.17 - perl: 5.006 - Sub::Exporter: 0 - Test::More: 0 - Test::Tester: 0.107 + Capture::Tiny: 0.17 + File::Temp: 0.17 + Sub::Exporter: 0 + Test::More: 0 + Test::Tester: 0.107 + perl: 5.006 resources: - repository: git://github.com/briandfoy/test-output.git -no_index: - directory: - - t - - inc -generated_by: ExtUtils::MakeMaker version 6.55_02 -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 -keywords: - - testing - - STDOUT - - STDERR + repository: git://github.com/briandfoy/test-output.git +version: 1.02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Output-1.01/MYMETA.json new/Test-Output-1.02/MYMETA.json --- old/Test-Output-1.01/MYMETA.json 1970-01-01 01:00:00.000000000 +0100 +++ new/Test-Output-1.02/MYMETA.json 2013-07-09 04:15:58.000000000 +0200 @@ -0,0 +1,56 @@ +{ + "abstract" : "Utilities to test STDOUT and STDERR messages.", + "author" : [ + "brian d foy <bdfoy(a)cpan.org>" + ], + "dynamic_config" : 0, + "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.112150", + "keywords" : [ + "testing", + "STDOUT", + "STDERR" + ], + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec", + "version" : "2" + }, + "name" : "Test-Output", + "no_index" : { + "directory" : [ + "t", + "inc" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "configure" : { + "requires" : { + "ExtUtils::MakeMaker" : 0 + } + }, + "runtime" : { + "requires" : { + "Capture::Tiny" : "0.17", + "File::Temp" : "0.17", + "Sub::Exporter" : 0, + "Test::More" : 0, + "Test::Tester" : "0.107", + "perl" : "5.006" + } + } + }, + "release_status" : "stable", + "resources" : { + "repository" : { + "url" : "git://github.com/briandfoy/test-output.git" + } + }, + "version" : "1.02" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Output-1.01/Makefile.PL new/Test-Output-1.02/Makefile.PL --- old/Test-Output-1.01/Makefile.PL 2011-04-22 07:59:02.000000000 +0200 +++ new/Test-Output-1.02/Makefile.PL 2013-07-09 04:15:57.000000000 +0200 @@ -18,6 +18,7 @@ 'Test::More' => '0', 'Sub::Exporter' => '0', 'File::Temp' => '0.17', # needs :seekable + 'Capture::Tiny' => '0.17', }, ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Output-1.01/lib/Test/Output/Tie.pm new/Test-Output-1.02/lib/Test/Output/Tie.pm --- old/Test-Output-1.01/lib/Test/Output/Tie.pm 2011-04-22 07:59:02.000000000 +0200 +++ new/Test-Output-1.02/lib/Test/Output/Tie.pm 1970-01-01 01:00:00.000000000 +0100 @@ -1,121 +0,0 @@ -package Test::Output::Tie; -use vars qw($VERSION); - -$VERSION='1.01'; - -use strict; -use warnings; - -=head1 NAME - -Test::Output::Tie - module used by Test::Output to tie STDERR and STDOUT - -=head1 DESCRIPTION - -You are probably more interested in reading Test::Output. - -This module is used to tie STDOUT and STDERR in Test::Output. - -=cut - -=head2 Methods - -=over 4 - -=item TIEHANDLE - -The constructor for the class. - -=cut - -sub TIEHANDLE { - my $class = shift; - my $scalar = ''; - my $obj = shift || \$scalar; - - bless( $obj, $class); -} - -=item PRINT - -This method is called each time STDERR or STDOUT are printed to. - -=cut - -sub PRINT { - my $self = shift; - $$self .= join(defined $, ? $, : '', @_); - $$self .= defined $\ ? $\ : ''; # for say() -} - -=item PRINTF - -This method is called each time STDERR or STDOUT are printed to with C<printf>. - -=cut - -sub PRINTF { - my $self = shift; - my $fmt = shift; - $$self .= sprintf $fmt, @_; -} - -=item FILENO - -=cut - -sub FILENO {} - -=item BINMODE - -=cut - -sub BINMODE {} - -=item read - -This function is used to return all output printed to STDOUT or STDERR. - -=cut - -sub read { - my $self = shift; - my $data = $$self; - $$self = ''; - return $data; -} - -=back - -=head1 AUTHOR - -Currently maintained by brian d foy, C<bdfoy(a)cpan.org>. - -Shawn Sorichetti, C<< <ssoriche(a)cpan.org> >> - -=head1 SOURCE AVAILABILITY - -This module is in Github: - - http://github.com/briandfoy/test-output/tree/master - -=head1 COPYRIGHT & LICENSE - -Currently maintained by brian d foy, C<bdfoy(a)cpan.org>. - -Copyright 2005-2008 Shawn Sorichetti, All Rights Reserved. - -This program is free software; you can redistribute it and/or modify it -under the same terms as Perl itself. - - -=head1 ACKNOWLEDGMENTS - -This code was taken from Test::Simple's TieOut.pm maintained -Michael G Schwern. TieOut.pm was originally written by chromatic. - -Thanks for the idea and use of the code. - -=cut - -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Test-Output-1.01/lib/Test/Output.pm new/Test-Output-1.02/lib/Test/Output.pm --- old/Test-Output-1.01/lib/Test/Output.pm 2011-04-22 07:59:02.000000000 +0200 +++ new/Test-Output-1.02/lib/Test/Output.pm 2013-07-09 04:15:57.000000000 +0200 @@ -5,7 +5,7 @@ use strict; use Test::Builder; -use Test::Output::Tie; +use Capture::Tiny qw/capture capture_stdout capture_stderr capture_merged/; use Sub::Exporter -setup => { exports => [ qw(output_is output_isnt output_like output_unlike @@ -65,7 +65,7 @@ =cut -$VERSION = '1.01'; +$VERSION = '1.02'; =head1 SYNOPSIS @@ -111,7 +111,9 @@ however, the features provided by L<Sub::Exporter> over what L<Exporter> provides is just to great to pass up. -Test::Output ties STDOUT and STDERR using Test::Output::Tie. +Likewise, Capture::Tiny provides a much more robust capture mechanism without +than the original Test::Output::Tie. (Test::Output::Tie is deprecated, but +included for backwards compatibility.) =cut @@ -484,7 +486,7 @@ except that $coderef is only executed once. Unlike, stdout_is() and stderr_is() which ignore STDERR and STDOUT -repectively, output_is() requires both STDOUT and STDERR to match in order +respectively, output_is() requires both STDOUT and STDERR to match in order to pass. Setting either $expected_stdout or $expected_stderr to C<undef> ignores STDOUT or STDERR respectively. @@ -819,14 +821,10 @@ sub stdout_from (&) { my $test = shift; - select( ( select(STDOUT), $| = 1 )[0] ); - my $out = tie *STDOUT, 'Test::Output::Tie'; - - &$test; - my $stdout = $out->read; - - undef $out; - untie *STDOUT; + my $stdout = capture_stdout { + select( ( select(STDOUT), $| = 1 )[0] ); + $test->() + }; return $stdout; } @@ -843,17 +841,14 @@ sub stderr_from (&) { my $test = shift; + # XXX why is this here and not in output_from or combined_from -- xdg, 2012-05-13 local $SIG{__WARN__} = sub { print STDERR @_ } if $] < 5.008; - - select( ( select(STDERR), $| = 1 )[0] ); - my $err = tie *STDERR, 'Test::Output::Tie'; - &$test; - my $stderr = $err->read; - - undef $err; - untie *STDERR; + my $stderr = capture_stderr { + select( ( select(STDERR), $| = 1 )[0] ); + $test->() + }; return $stderr; } @@ -870,19 +865,11 @@ sub output_from (&) { my $test = shift; - select( ( select(STDOUT), $| = 1 )[0] ); - select( ( select(STDERR), $| = 1 )[0] ); - my $out = tie *STDOUT, 'Test::Output::Tie'; - my $err = tie *STDERR, 'Test::Output::Tie'; - - &$test; - my $stdout = $out->read; - my $stderr = $err->read; - - undef $out; - undef $err; - untie *STDOUT; - untie *STDERR; + my ($stdout, $stderr) = capture { + select( ( select(STDOUT), $| = 1 )[0] ); + select( ( select(STDERR), $| = 1 )[0] ); + $test->(); + }; return ( $stdout, $stderr ); } @@ -900,25 +887,13 @@ sub combined_from (&) { my $test = shift; - select( ( select(STDOUT), $| = 1 )[0] ); - select( ( select(STDERR), $| = 1 )[0] ); - - open( STDERR, ">&STDOUT" ); + my $combined = capture_merged { + select( ( select(STDOUT), $| = 1 )[0] ); + select( ( select(STDERR), $| = 1 )[0] ); + $test->(); + }; - my $out = tie *STDOUT, 'Test::Output::Tie'; - tie *STDERR, 'Test::Output::Tie', $out; - - &$test; - my $combined = $out->read; - - undef $out; - { - no warnings; - untie *STDOUT; - untie *STDERR; - } - - return ($combined); + return $combined; } sub _chkregex { @@ -963,7 +938,7 @@ Thanks to chromatic whose TieOut.pm was the basis for capturing output. -Also thanks to rjbs for his help cleaning the documention, and pushing me to +Also thanks to rjbs for his help cleaning the documentation, and pushing me to L<Sub::Exporter>. Thanks to David Wheeler for providing code block support and tests. @@ -972,7 +947,7 @@ =head1 COPYRIGHT & LICENSE -Copyright 2005-2008 Shawn Sorichetti, All Rights Reserved. +Copyright 2005-2013 Shawn Sorichetti, All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-DBD-SQLite for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package perl-DBD-SQLite for openSUSE:Factory checked in at 2013-07-31 17:24:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-DBD-SQLite (Old) and /work/SRC/openSUSE:Factory/.perl-DBD-SQLite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-DBD-SQLite" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-DBD-SQLite/perl-DBD-SQLite.changes 2013-07-27 15:50:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-DBD-SQLite.new/perl-DBD-SQLite.changes 2013-07-31 17:24:26.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jul 28 20:18:35 UTC 2013 - coolo(a)suse.com + +- updated to 1.40 + - NetBSD also doesn't like the _XOPEN_SOURCE hack (ISHIGAKI) + - Resolved #86080: PATCH: statistics_info support (DDICK) + +------------------------------------------------------------------- Old: ---- DBD-SQLite-1.39.tar.gz New: ---- DBD-SQLite-1.40.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBD-SQLite.spec ++++++ --- /var/tmp/diff_new_pack.ZuPc7s/_old 2013-07-31 17:24:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ZuPc7s/_new 2013-07-31 17:24:27.000000000 +0200 @@ -21,7 +21,7 @@ Summary: Self-contained RDBMS in a DBI Driver License: GPL-1.0+ or Artistic-1.0 Group: Development/Libraries/Perl -Version: 1.39 +Version: 1.40 Release: 0 Url: http://search.cpan.org/dist/DBD-SQLite/ Source: http://www.cpan.org/authors/id/I/IS/ISHIGAKI/%{cpan_name}-%{version}.tar.gz ++++++ DBD-SQLite-1.39.tar.gz -> DBD-SQLite-1.40.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-SQLite-1.39/Changes new/DBD-SQLite-1.40/Changes --- old/DBD-SQLite-1.39/Changes 2013-06-09 17:03:58.000000000 +0200 +++ new/DBD-SQLite-1.40/Changes 2013-07-28 07:29:31.000000000 +0200 @@ -1,5 +1,9 @@ Changes for Perl extension DBD-SQLite +1.40 Sun 28 Jul 2013 + - NetBSD also doesn't like the _XOPEN_SOURCE hack (ISHIGAKI) + - Resolved #86080: PATCH: statistics_info support (DDICK) + 1.39 Fri 31 May 2013 - Production release, no changes from 1.38_05 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-SQLite-1.39/META.json new/DBD-SQLite-1.40/META.json --- old/DBD-SQLite-1.39/META.json 2013-06-09 17:10:07.000000000 +0200 +++ new/DBD-SQLite-1.40/META.json 2013-07-28 07:31:22.000000000 +0200 @@ -54,5 +54,5 @@ }, "x_MailingList" : "http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbd-sqlite" }, - "version" : "1.39" + "version" : "1.40" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-SQLite-1.39/META.yml new/DBD-SQLite-1.40/META.yml --- old/DBD-SQLite-1.39/META.yml 2013-06-09 17:10:06.000000000 +0200 +++ new/DBD-SQLite-1.40/META.yml 2013-07-28 07:31:22.000000000 +0200 @@ -29,4 +29,4 @@ bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=DBD-SQLite license: http://dev.perl.org/licenses/ repository: https://github.com/DBD-SQLite/DBD-SQLite -version: 1.39 +version: 1.40 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-SQLite-1.39/Makefile.PL new/DBD-SQLite-1.40/Makefile.PL --- old/DBD-SQLite-1.39/Makefile.PL 2013-05-31 06:30:29.000000000 +0200 +++ new/DBD-SQLite-1.40/Makefile.PL 2013-07-28 07:29:31.000000000 +0200 @@ -248,7 +248,7 @@ if ($^O eq 'aix') { push @CC_DEFINE, '-DSQLITE_DISABLE_DIRSYNC'; } -if ($^O =~ /bsd/i && $^O ne 'openbsd') { +if ($^O =~ /bsd/i && $^O !~ /(?:open|net)bsd/) { push @CC_DEFINE, '-D_XOPEN_SOURCE'; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-SQLite-1.39/lib/DBD/SQLite.pm new/DBD-SQLite-1.40/lib/DBD/SQLite.pm --- old/DBD-SQLite-1.39/lib/DBD/SQLite.pm 2013-06-09 17:04:08.000000000 +0200 +++ new/DBD-SQLite-1.40/lib/DBD/SQLite.pm 2013-07-28 07:29:31.000000000 +0200 @@ -5,7 +5,7 @@ use DBI 1.57 (); use DynaLoader (); -our $VERSION = '1.39'; +our $VERSION = '1.40'; our @ISA = 'DynaLoader'; # sqlite_version cache (set in the XS bootstrap) @@ -613,6 +613,90 @@ }) or return $dbh->DBI::set_err( $sponge_dbh->err, $sponge_dbh->errstr, + ); + return $sponge_sth; +} + +my @STATISTICS_INFO_ODBC = ( + 'TABLE_CAT', # The catalog identifier. + 'TABLE_SCHEM', # The schema identifier. + 'TABLE_NAME', # The table identifier. + 'NON_UNIQUE', # Unique index indicator. + 'INDEX_QUALIFIER', # Index qualifier identifier. + 'INDEX_NAME', # The index identifier. + 'TYPE', # The type of information being returned. + 'ORDINAL_POSITION', # Column sequence number (starting with 1). + 'COLUMN_NAME', # The column identifier. + 'ASC_OR_DESC', # Column sort sequence. + 'CARDINALITY', # Cardinality of the table or index. + 'PAGES', # Number of storage pages used by this table or index. + 'FILTER_CONDITION', # The index filter condition as a string. +); + +sub statistics_info { + my ($dbh, $catalog, $schema, $table, $unique_only, $quick) = @_; + + my $databases = $dbh->selectall_arrayref("PRAGMA database_list", {Slice => {}}); + + my @statistics_info; + for my $database (@$databases) { + my $dbname = $database->{name}; + next if defined $schema && $schema ne '%' && $schema ne $dbname; + + my $quoted_dbname = $dbh->quote_identifier($dbname); + my $master_table = + ($dbname eq 'main') ? 'sqlite_master' : + ($dbname eq 'temp') ? 'sqlite_temp_master' : + $quoted_dbname.'.sqlite_master'; + + my $tables = $dbh->selectall_arrayref("SELECT name FROM $master_table WHERE type = ?", undef, "table"); + for my $table_ref (@$tables) { + my $tbname = $table_ref->[0]; + next if defined $table && $table ne '%' && $table ne $tbname; + + my $quoted_tbname = $dbh->quote_identifier($tbname); + my $sth = $dbh->prepare("PRAGMA $quoted_dbname.index_list($quoted_tbname)"); + $sth->execute; + while(my $row = $sth->fetchrow_hashref) { + + next if defined $unique_only && $unique_only && $row->{unique}; + my $quoted_idx = $dbh->quote_identifier($row->{name}); + for my $db (@$databases) { + my $quoted_db = $dbh->quote_identifier($db->{name}); + my $i_sth = $dbh->prepare("PRAGMA $quoted_db.index_info($quoted_idx)"); + $i_sth->execute; + my $cols = {}; + while(my $info = $i_sth->fetchrow_hashref) { + push @statistics_info, { + TABLE_CAT => undef, + TABLE_SCHEM => $db->{name}, + TABLE_NAME => $tbname, + NON_UNIQUE => $row->{unique} ? 0 : 1, + INDEX_QUALIFIER => undef, + INDEX_NAME => $row->{name}, + TYPE => 'btree', # see http://www.sqlite.org/version3.html esp. "Traditional B-trees are still used for indices" + ORDINAL_POSITION => $info->{seqno} + 1, + COLUMN_NAME => $info->{name}, + ASC_OR_DESC => undef, + CARDINALITY => undef, + PAGES => undef, + FILTER_CONDITION => undef, + }; + } + } + } + } + } + + my $sponge_dbh = DBI->connect("DBI:Sponge:", "", "") + or return $dbh->DBI::set_err($DBI::err, "DBI::Sponge: $DBI::errstr"); + my $sponge_sth = $sponge_dbh->prepare("statistics_info", { + NAME => \@STATISTICS_INFO_ODBC, + rows => [ map { [@{$_}{@STATISTICS_INFO_ODBC} ] } @statistics_info ], + NUM_OF_FIELDS => scalar(@STATISTICS_INFO_ODBC), + }) or return $dbh->DBI::set_err( + $sponge_dbh->err, + $sponge_dbh->errstr, ); return $sponge_sth; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-SQLite-1.39/t/lib/Test.pm new/DBD-SQLite-1.40/t/lib/Test.pm --- old/DBD-SQLite-1.39/t/lib/Test.pm 2013-06-09 17:04:19.000000000 +0200 +++ new/DBD-SQLite-1.40/t/lib/Test.pm 2013-07-28 07:29:31.000000000 +0200 @@ -7,7 +7,7 @@ use File::Spec (); use Test::More (); -our $VERSION = '1.39'; +our $VERSION = '1.40'; our @ISA = 'Exporter'; our @EXPORT = qw/connect_ok dies dbfile @CALL_FUNCS/; our @CALL_FUNCS; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit liblnk for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package liblnk for openSUSE:Factory checked in at 2013-07-31 17:23:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liblnk (Old) and /work/SRC/openSUSE:Factory/.liblnk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "liblnk" Changes: -------- --- /work/SRC/openSUSE:Factory/liblnk/liblnk.changes 2013-04-19 09:57:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.liblnk.new/liblnk.changes 2013-07-31 17:23:48.000000000 +0200 @@ -0,0 +1,15 @@ +Tue Jul 30 01:07:48 UTC 2013 - Greg.Freemyer(a)gmail.com + +- update to v0~20130413 + * updated dependencies + * moved examples to project site + * updated lnkinfo man page + * worked on tests + * updates and bug fixes in pylnk + * fixed codepage 949, 950, 1255 restriction + * added PackageMaker files + * added functions to retrieve drive type, drive serial number and volume label + * fix trailing \ for local and network path when common path is an emtpy string +- use gz compression to simplify download/convert +- use factory version of sub-packages as possible + Old: ---- liblnk-alpha-20130304.tar.xz New: ---- liblnk-alpha-20130413.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liblnk.spec ++++++ --- /var/tmp/diff_new_pack.8RYT9g/_old 2013-07-31 17:23:49.000000000 +0200 +++ /var/tmp/diff_new_pack.8RYT9g/_new 2013-07-31 17:23:49.000000000 +0200 @@ -18,7 +18,7 @@ Name: liblnk %define lname liblnk1 -%define timestamp 20130304 +%define timestamp 20130413 Version: 0~%timestamp Release: 0 Summary: Library and tools to access the Windows Shortcut File (LNK) format @@ -26,26 +26,27 @@ Group: Productivity/File utilities Url: http://code.google.com/p/liblnk/ -#DL-URL: http://liblnk.googlecode.com/files/liblnk-alpha-20130304.tar.gz -Source: %name-alpha-%timestamp.tar.xz +#DL-URL: https://googledrive.com/host/0B3fBvzttpiiSQmluVC1YeDVvZWM/liblnk-alpha-2013… +Source: %name-alpha-%timestamp.tar.gz Source2: Windows_Shortcut_File_(LNK)_format.pdf BuildRequires: pkg-config BuildRequires: python-devel -BuildRequires: xz -#BuildRequires: pkgconfig(libbfio) >= 20120426 -#BuildRequires: pkgconfig(libcdata) >= 20120425 +BuildRequires: pkgconfig(libbfio) >= 0~20130721 +BuildRequires: pkgconfig(libcfile) >= 0~20130609 +BuildRequires: pkgconfig(libclocale) >= 0~20130609 +BuildRequires: pkgconfig(libcnotify) >= 0~20130609 +BuildRequires: pkgconfig(libcpath) >= 0~20130609 +BuildRequires: pkgconfig(libcsplit) >= 0~20130609 +BuildRequires: pkgconfig(libfdatetime) >= 0~20130317 +# the below failed to compile with factory version as of July 29, 2013 +#BuildRequires: pkgconfig(libcdata) >= 0~20130407 #BuildRequires: pkgconfig(libcerror) >= 20120425 -#BuildRequires: pkgconfig(libcfile) >= 20120526 -#BuildRequires: pkgconfig(libclocale) >= 20120425 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -#BuildRequires: pkgconfig(libcpath) >= 20120701 -BuildRequires: pkgconfig(libcsplit) >= 20120701 -#BuildRequires: pkgconfig(libcstring) >= 20120425 -#BuildRequires: pkgconfig(libcsystem) >= 20120425 -BuildRequires: pkgconfig(libfdatetime) >= 20120522 -BuildRequires: pkgconfig(libfguid) >= 20120426 -#BuildRequires: pkgconfig(libfwsi) >= 20120426 +#BuildRequires: pkgconfig(libfguid) >= 20120426 #BuildRequires: pkgconfig(libuna) >= 20120425 +# the below are not (yet) in factory +#BuildRequires: pkgconfig(libfwsi) >= 20120426 +#BuildRequires: pkgconfig(libcsystem) >= 20120425 +#BuildRequires: pkgconfig(libcstring) >= 20120425 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libregf for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package libregf for openSUSE:Factory checked in at 2013-07-31 17:23:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libregf (Old) and /work/SRC/openSUSE:Factory/.libregf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libregf" Changes: -------- --- /work/SRC/openSUSE:Factory/libregf/libregf.changes 2013-05-02 11:20:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libregf.new/libregf.changes 2013-07-31 17:23:44.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Jul 30 20:55:17 UTC 2013 - Greg.Freemyer(a)gmail.com + +- update to v0~20130716 + * updated dependencies + * worked on tests + * bug fix for large values + * added support for REG_LINK as a string + * fixed multiple open issues + * pyregf: fix for retrieving default value by name + * worked on tests + * changes for strings values with trailing data + * small update for 64-bit build + * Textual changes + * updates and bug fixes in pyregf + * fixed codepage 1255 restriction + * fixed codepage 949 and 950 restriction + * changes for libfdata update + * removed item flags +- changed to gz compression to simplyfy download/convert + +------------------------------------------------------------------- Old: ---- libregf-alpha-20130319.tar.xz New: ---- libregf-alpha-20130716.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libregf.spec ++++++ --- /var/tmp/diff_new_pack.2NQDF3/_old 2013-07-31 17:23:45.000000000 +0200 +++ /var/tmp/diff_new_pack.2NQDF3/_new 2013-07-31 17:23:45.000000000 +0200 @@ -18,7 +18,7 @@ Name: libregf %define lname libregf1 -%define timestamp 20130319 +%define timestamp 20130716 Version: 0~%timestamp Release: 0 Summary: Library to access Windows REGF-type Registry files @@ -26,25 +26,25 @@ Group: Productivity/File utilities Url: http://code.google.com/p/libregf/ -#DL-URL: http://libregf.googlecode.com/files/libregf-alpha-20130319.tar.gz -Source: %{name}-alpha-%timestamp.tar.xz +#DL-URL: https://googledrive.com/host/0B3fBvzttpiiSSC1yUDZpb3l0UHM/libregf-alpha-201… +Source: %{name}-alpha-%timestamp.tar.gz Source2: Windows_NT_Registry_File_(REGF)_format.pdf BuildRequires: pkg-config BuildRequires: python-devel -BuildRequires: xz BuildRequires: pkgconfig(fuse) >= 2.6 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcsplit) >= 20120701 -BuildRequires: pkgconfig(libfdatetime) >= 20120522 +BuildRequires: pkgconfig(libcnotify) >= 0~20130609 +BuildRequires: pkgconfig(libcsplit) >= 0~20130609 +BuildRequires: pkgconfig(libfdatetime) >= 0~20130317 # Using these packages from factory causes build failures, so use the internal version instead -#BuildRequires: pkgconfig(libuna) >= 20120425 +# Verified 7/30/2013 #BuildRequires: pkgconfig(libfguid) >= 20120426 #BuildRequires: pkgconfig(libcpath) >= 20120701 #BuildRequires: pkgconfig(libclocale) >= 20120425 #BuildRequires: pkgconfig(libcerror) >= 20120425 #BuildRequires: pkgconfig(libcfile) >= 20120526 -#BuildRequires: pkgconfig(libbfio) >= 20120426 #BuildRequires: pkgconfig(libcdata) >= 20120425 +#BuildRequires: pkgconfig(libuna) >= 20120425 +#BuildRequires: pkgconfig(libbfio) >= 0~20130721 # These packages are not yet in factory #BuildRequires: pkgconfig(libcstring) >= 20120425 #BuildRequires: pkgconfig(libcsystem) >= 20120425 ++++++ Windows_NT_Registry_File_(REGF)_format.pdf ++++++ (binary differes) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcfile for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '13

31 Jul '13

Hello community, here is the log from the commit of package libcfile for openSUSE:Factory checked in at 2013-07-31 17:23:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcfile (Old) and /work/SRC/openSUSE:Factory/.libcfile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcfile" Changes: -------- --- /work/SRC/openSUSE:Factory/libcfile/libcfile.changes 2013-04-19 09:49:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libcfile.new/libcfile.changes 2013-07-31 17:23:42.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Jul 29 02:59:46 UTC 2013 - Greg.Freemyer(a)gmail.com + +- update to v0~20130609 + * fix in .pc.in file + * updated dependencies + * removed WINAPI CRT function fallbacks + * changes to ioctl detection in configure + * textual changes +- change to gz compression to simplyfy download/convert step + +------------------------------------------------------------------- +Mon Apr 22 17:27:42 UTC 2013 - Greg.Freemyer(a)gmail.com + +- add BuildRequires: libcnotify +- run spec-cleaner + +------------------------------------------------------------------- Old: ---- libcfile-alpha-20130329.tar.xz New: ---- libcfile-alpha-20130609.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcfile.spec ++++++ --- /var/tmp/diff_new_pack.LLlD84/_old 2013-07-31 17:23:43.000000000 +0200 +++ /var/tmp/diff_new_pack.LLlD84/_new 2013-07-31 17:23:43.000000000 +0200 @@ -18,22 +18,23 @@ Name: libcfile %define lname libcfile1 -%define timestamp 20130329 +%define timestamp 20130609 Version: 0~%timestamp Release: 0 -License: LGPL-3.0+ Summary: Library for cross-platform C file functions +License: LGPL-3.0+ Group: Development/Libraries/C and C++ Url: http://code.google.com/p/libcfile/ #Git-Clone: http://code.google.com/p/libcfile -#DL-URL: http://libcfile.googlecode.com/files/libcfile-alpha-20130329.tar.gz -Source: %name-alpha-%timestamp.tar.xz +#DL-URL: https://googledrive.com/host/0B3fBvzttpiiSem41RXpvQkIyZlU/libcfile-alpha-20… +Source: %{name}-alpha-%timestamp.tar.gz BuildRequires: pkg-config -BuildRequires: xz -BuildRequires: pkgconfig(libcerror) >= 20120425 -BuildRequires: pkgconfig(libclocale) >= 20120425 -#BuildRequires: pkgconfig(libcnotify) >= 20120425 +BuildRequires: pkgconfig(libcerror) >= 0~20130609 +BuildRequires: pkgconfig(libclocale) >= 0~20130609 +BuildRequires: pkgconfig(libcnotify) >= 20130103 +# This can cause a build loop. The internal version should be used. +#BuildRequires: pkgconfig(libuna) >= 20120425 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,7 +50,7 @@ %package devel Summary: Development files for libcfile, a cross-platform C file library Group: Development/Libraries/C and C++ -Requires: %lname = %version +Requires: %lname = %{version} %description devel A library for cross-platform C file functions. @@ -65,8 +66,8 @@ make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" -rm -f "%buildroot/%_libdir"/*.la +%make_install +rm -f "%{buildroot}/%{_libdir}"/*.la %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -74,13 +75,13 @@ %files -n %lname %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog -%_libdir/libcfile.so.1* +%{_libdir}/libcfile.so.1* %files devel %defattr(-,root,root) -%_includedir/libcfile* -%_libdir/libcfile.so -%_libdir/pkgconfig/libcfile.pc -%_mandir/man3/libcfile.3* +%{_includedir}/libcfile* +%{_libdir}/libcfile.so +%{_libdir}/pkgconfig/libcfile.pc +%{_mandir}/man3/libcfile.3* %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0