Hello community,
here is the log from the commit of package perl-Spreadsheet-Read for
openSUSE:Factory checked in at 2012-02-17 15:01:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Spreadsheet-Read (Old)
and /work/SRC/openSUSE:Factory/.perl-Spreadsheet-Read.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Spreadsheet-Read", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-Spreadsheet-Read/perl-Spreadsheet-Read.changes
2011-11-21 12:45:51.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Spreadsheet-Read.new/perl-Spreadsheet-Read.changes
2012-02-17 15:01:09.000000000 +0100
@@ -1,0 +2,8 @@
+Fri Feb 17 11:25:52 UTC 2012 - [email protected]
+
+- updated to 0.46
+ * Updated copyright to 2012
+ * Support passing attributes to the underlying parser
+ * Do not strip fields in sheets with no cells at all (RT#74976)
+
+-------------------------------------------------------------------
Old:
----
Spreadsheet-Read-0.45.tgz
New:
----
Spreadsheet-Read-0.46.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Spreadsheet-Read.spec ++++++
--- /var/tmp/diff_new_pack.8A97OW/_old 2012-02-17 15:01:11.000000000 +0100
+++ /var/tmp/diff_new_pack.8A97OW/_new 2012-02-17 15:01:11.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package perl-Spreadsheet-Read
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -19,13 +19,13 @@
%bcond_with opt
Name: perl-Spreadsheet-Read
-Version: 0.45
-Release: 1
-License: GPL-1.0+ or Artistic-1.0
+Version: 0.46
+Release: 0
%define cpan_name Spreadsheet-Read
Summary: Read the data from a spreadsheet
-Url: http://search.cpan.org/dist/Spreadsheet-Read/
+License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
+Url: http://search.cpan.org/dist/Spreadsheet-Read/
Source:
http://www.cpan.org/authors/id/H/HM/HMBRAND/%{cpan_name}-%{version}.tgz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ Spreadsheet-Read-0.45.tgz -> Spreadsheet-Read-0.46.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/Changes
new/Spreadsheet-Read-0.46/Changes
--- old/Spreadsheet-Read-0.45/Changes 2011-09-07 18:03:32.000000000 +0200
+++ new/Spreadsheet-Read-0.46/Changes 2012-02-14 08:48:36.000000000 +0100
@@ -1,297 +1,255 @@
-Revision history for Spreadsheet::Read
-
-0.45 Wed 07 Sep 2011
-
- - NAME / DISTNAME in Makefile.PL
-
-0.44 Wed 07 Sep 2011
-
- - More cross-checks for META data
-
-0.43 Tue 02 Aug 2011
-
- - Changed name in META.yml (RT#69574)
-
-0.42 Wed 01 Jun 2011
-
- - Add --html output option to xlscat
- - Force CSV parser when in-sep is given
- - Prefer Data::Peek over Data::Dumper if available
-
-0.41 Wed 06 Oct 2010
-
- - Spell-check
- - Fixed requiring optional modules (RT#61928 - Roderick Schupp)
-
-0.40 Wed 31 Mar 2010
-
- - Default option for clip fixed (RT#56151 - Alan James)
-
-0.39 Tue 16 Mar 2010
-
- - Doc fix (RT#54507, Patrick Cronin)
- - Upped Copyright notices to 2010
- - Drop YAML version to 1.0
-
-0.38 Tue 15 Dec 2009
-
- - Add row () and cellrow ()
- - Updated META.yml to meet most recent specs (optional_features = map)
-
-0.37 Mon 09 Nov 2009
-
- - IO streams improvements
- - MANIFEST fix
-
-0.36 Thu 06 Nov 2009
-
- - Add strip option
- - Spreadsheet::XLSX 0.12 still does not support attributes
- - Require Text::CSV_XS-0.69 for CSV for auto-detection of \r
- - New attribute "parser" to force format
- - Allow CSV streams
- - Allow SC streams
- - Allow XLS streams
-
-0.35 Wed 03 Jun 2009
-
- - Add Test::NoWarnings, which is not run in AUTOMATED_TESTING
- - Switched to Test::More using tests_done ()
- - Text::CSV_XS requires 0.43 or up, as we use ->eof ()
+0.46 - 14 Feb 2012, H.Merijn Brand
+ * Updated copyright to 2012
+ * Support passing attributes to the underlying parser
+ * Do not strip fields in sheets with no cells at all (RT#74976)
+
+0.45 - 07 Sep 2011, H.Merijn Brand
+ * NAME / DISTNAME in Makefile.PL
+
+0.44 - 07 Sep 2011, H.Merijn Brand
+ * More cross-checks for META data
+
+0.43 - 02 Aug 2011, H.Merijn Brand
+ * Changed name in META.yml (RT#69574)
+
+0.42 - 01 Jun 2011, H.Merijn Brand
+ * Add --html output option to xlscat
+ * Force CSV parser when in-sep is given
+ * Prefer Data::Peek over Data::Dumper if available
+
+0.41 - 06 Oct 2010, H.Merijn Brand
+ * Spell-check
+ * Fixed requiring optional modules (RT#61928 - Roderick Schupp)
+
+0.40 - 31 Mar 2010, H.Merijn Brand
+ * Default option for clip fixed (RT#56151 - Alan James)
+
+0.39 - 16 Mar 2010, H.Merijn Brand
+ * Doc fix (RT#54507, Patrick Cronin)
+ * Upped Copyright notices to 2010
+ * Drop YAML version to 1.0
+
+0.38 - 15 Dec 2009, H.Merijn Brand
+ * Add row () and cellrow ()
+ * Updated META.yml to meet most recent specs (optional_features = map)
+
+0.37 - 09 Nov 2009, H.Merijn Brand
+ * IO streams improvements
+ * MANIFEST fix
+
+0.36 - 06 Nov 2009, H.Merijn Brand
+ * Add strip option
+ * Spreadsheet::XLSX 0.12 still does not support attributes
+ * Require Text::CSV_XS-0.69 for CSV for auto-detection of \r
+ * New attribute "parser" to force format
+ * Allow CSV streams
+ * Allow SC streams
+ * Allow XLS streams
+
+0.35 - 03 Jun 2009, H.Merijn Brand
+ * Add Test::NoWarnings, which is not run in AUTOMATED_TESTING
+ * Switched to Test::More using tests_done ()
+ * Text::CSV_XS requires 0.43 or up, as we use ->eof ()
still prefer a really new release, like 0.65, which
is Test::NoWarnings safe
- - Spreadsheet::XLSX 0.10 still does not support attributes
- - Added -n to xlscat
- - XLSX tests skip on feature, not on version
-
-0.34 Tue 27 Jan 2009
+ * Spreadsheet::XLSX 0.10 still does not support attributes
+ * Added -n to xlscat
+ * XLSX tests skip on feature, not on version
- - Spreadsheet::XLSX 0.09 still does not support attributes
+0.34 - 27 Jan 2009, H.Merijn Brand
+ * Spreadsheet::XLSX 0.09 still does not support attributes
still think it is better to follow closely. 0.09 is much
better than 0.08
-0.33 Fri 23 Jan 2009
-
- - A few Perl::Critic inspired changes
- - Modified tests to prevent rounding errors (we were not checking for that)
- - Added examples/ss-dups-tk.pl
-
-0.32 Tue 06 Jan 2009
-
- - Add basic support for M$ Excel 2007 using Spreadsheet::XLSX
- - Test suite reports the parsers it found
-
-0.31 Sun 04 Jan 2009
+0.33 - 23 Jan 2009, H.Merijn Brand
+ * A few Perl::Critic inspired changes
+ * Modified tests to prevent rounding errors (we were not checking for that)
+ * Added examples/ss-dups-tk.pl
+
+0.32 - 06 Jan 2009, H.Merijn Brand
+ * Add basic support for M$ Excel 2007 using Spreadsheet::XLSX
+ * Test suite reports the parsers it found
+
+0.31 - 04 Jan 2009, H.Merijn Brand
+ * Upped Copyright notices to 2009
+ * Detection of percentage type
+ * Even more reliable detection of Date types
+
+0.30 - 22 Dec 2008, H.Merijn Brand
+ * Wrong e-mail in META.yml
+ * CSV files from a Mac, with \r as eol, would not parse
- - Upped Copyright notices to 2009
- - Detection of percentage type
- - Even more reliable detection of Date types
-
-0.30 Mon 22 Dec 2008
-
- - Wrong e-mail in META.yml
- - CSV files from a Mac, with \r as eol, would not parse
-
-0.29 Sun 19 Oct 2008
-
- - Make Read safer for files that do not match extension,
+0.29 - 19 Oct 2008, H.Merijn Brand
+ * Make Read safer for files that do not match extension,
like HTML in foo.xls
- - YAML declared 1.4 (META.yml) instead of 1.1 (YAML)
- - Bring Makefile.PL in sync with META.yml
- - Recommend Text-CSV-0.56
-
-0.28 Wed 04 Sep 2008
-
- - More tests on date formats
- - Declare Spreadsheet::ParseExcel::FmtDefault in META.yml
- - Add 'size' from Excel font size
- - Update docs about Excel quirks and CPAN links
- - Reference to public git repo
- - Some typo's
-
-0.27 Sun 31 Aug 2008
-
- - Fixed META.yml (the specs are inconsistent)
- - Added --dtfmt to xlscat
-
-0.26 Fri 29 Aug 2008
-
- - Added examples/xls2csv
- - Upped copyright to 2008 in examples
- - Don't ask to install examples under automated testing
- - die => croak
- - Added tgzdist target
- - Added encoding options to examples/xlscat
- - Added date-type checks for SS:PE > 0.32
-
-0.25 Wed 02 Jan 2008
-
- - Spreadsheet-Read now under git
- - Upped copyrights to 2008
- - Added all prereq's to Makefile.PL, even core mods
- - Tested under perl-5.10.0
- - Text::CSV as of 1.00 is OK
-
-0.24 Thu 05 Oct 2007
-
- - -? and --help in utils moved to Getopt::Long
- - Adjusted copyright notice in utils
- - removed prototypes in utils
- - next is illegal in do {} while (); (Johan Vromans)
+ * YAML declared 1.4 (META.yml) instead of 1.1 (YAML)
+ * Bring Makefile.PL in sync with META.yml
+ * Recommend Text-CSV-0.56
+
+0.28 - 04 Sep 2008, H.Merijn Brand
+ * More tests on date formats
+ * Declare Spreadsheet::ParseExcel::FmtDefault in META.yml
+ * Add 'size' from Excel font size
+ * Update docs about Excel quirks and CPAN links
+ * Reference to public git repo
+ * Some typo's
+
+0.27 - 31 Aug 2008, H.Merijn Brand
+ * Fixed META.yml (the specs are inconsistent)
+ * Added --dtfmt to xlscat
+
+0.26 - 29 Aug 2008, H.Merijn Brand
+ * Added examples/xls2csv
+ * Upped copyright to 2008 in examples
+ * Don't ask to install examples under automated testing
+ * die => croak
+ * Added tgzdist target
+ * Added encoding options to examples/xlscat
+ * Added date-type checks for SS:PE > 0.32
+
+0.25 - 02 Jan 2008, H.Merijn Brand
+ * Spreadsheet-Read now under git
+ * Upped copyrights to 2008
+ * Added all prereq's to Makefile.PL, even core mods
+ * Tested under perl-5.10.0
+ * Text::CSV as of 1.00 is OK
+
+0.24 - 05 Oct 2007, H.Merijn Brand
+ * -? and --help in utils moved to Getopt::Long
+ * Adjusted copyright notice in utils
+ * removed prototypes in utils
+ * next is illegal in do {} while (); (Johan Vromans)
only happens with old Text::CSV_XS
-0.23 Thu 21 Jun 2007
-
- - Use IO::Scalar instead of File::Temp when installed
+0.23 - 21 Jun 2007, H.Merijn Brand
+ * Use IO::Scalar instead of File::Temp when installed
Thanks to David Cantrell for making a OpenBSD test box available!
- - use binmode () when opening files
- - Also use 3-arg open in test files
- - die if test files cannot be opene'ed
-
-0.22 Mon 18 Jun 2007
+ * use binmode () when opening files
+ * Also use 3-arg open in test files
+ * die if test files cannot be opene'ed
- - 0.21 should already support Text::CSV_PP 1.05
+0.22 - 18 Jun 2007, H.Merijn Brand
+ * 0.21 should already support Text::CSV_PP 1.05
Tested Text::CSV_PP 1.05 on bleadperl.
- - Better detection of (not) installed modules
- - Module requires perl 5.6.x
-
-0.21 Mon 18 Jun 2007
-
- - Text::CSV_XS uses keep_meta_info instead of get_flags
- - Removed always_quote from xlscat's CSV output
+ * Better detection of (not) installed modules
+ * Module requires perl 5.6.x
-0.20 Thu 31 May 2007
-
- - perlcritic OK
- - CSV parsing now uses getline (), and auto-detects eol
+0.21 - 18 Jun 2007, H.Merijn Brand
+ * Text::CSV_XS uses keep_meta_info instead of get_flags
+ * Removed always_quote from xlscat's CSV output
+
+0.20 - 31 May 2007, H.Merijn Brand
+ * perlcritic OK
+ * CSV parsing now uses getline (), and auto-detects eol
Assumes first line does not contain embedded eol. This implies that
parsing CSV with embedded eol sequences is now safe.
- - As I now also maintain Text::CSV_XS, I changed the references
- - Changed TODO's from Text::CSV to Text::CSV_PP (::CSV is dated 1997)
-
-0.19 Fri 04 May 2007
-
- - Could not retreive '0' fields from OpenOffice (Jim Kelly)
-
-0.18 Fri 27 Apr 2007
-
- - use strict in Makefile.PL
- - Added test_cover make target
- - Added "ods" for OpenOffice conversions
- - Added color tests for ods (but SR::RS doesn't support that yet)
- - Switched from \d to 0-9 in regexp
- - Added more test files and tests (increase coverage)
-
-0.17 Tue 04 Jul 2006
-
- - xlscat new option: --ansii to (try to) use the ansi colors for fields
- - Fixed a color attribute off-by-one error
- - Added test cases (not yet complete)
- - Added bold and underline
-
-0.16 Tue 04 Jul 2006
-
- - xlscat new option: --in-sep-char to force-define input sep-char for CSV
- - More debug lines
- - Parser name info in $ref->[0]
- - SquirrelCalc now reports Spreadsheet::Read and its version for parser
info
- - Most of the attributes for Excel now implemented. Tested, but no test
case
+ * As I now also maintain Text::CSV_XS, I changed the references
+ * Changed TODO's from Text::CSV to Text::CSV_PP (::CSV is dated 1997)
-0.15 Wed 21 Jun 2006
+0.19 - 04 May 2007, H.Merijn Brand
+ * Could not retreive '0' fields from OpenOffice (Jim Kelly)
- - Small doc change from AnnoCPAN
- - Sheets with undefined labels might cause havoc
- - Clip now skips empty xls sheets (TODO: sxc)
- - xlscat clips by default
- - xlscat new options -d and --noclip
- - xlscat usage () from -?/--help to STDOUT from fault to STDERR
-
-0.14 Fri 20 Jan 2006
-
- - maxrow and maxcol were swapped in csv sheets
- - promoted internal debug flag to option
- - small doc changes
-
-0.13 Thu 04 Nov 2005
-
- - Control attrib 'cells' was misinterpreted
- - New option: clip, default is true if {cell} is selected, false otherwise
+0.18 - 27 Apr 2007, H.Merijn Brand
+ * use strict in Makefile.PL
+ * Added test_cover make target
+ * Added "ods" for OpenOffice conversions
+ * Added color tests for ods (but SR::RS doesn't support that yet)
+ * Switched from \d to 0-9 in regexp
+ * Added more test files and tests (increase coverage)
+
+0.17 - 04 Jul 2006, H.Merijn Brand
+ * xlscat new option: --ansii to (try to) use the ansi colors for fields
+ * Fixed a color attribute off-by-one error
+ * Added test cases (not yet complete)
+ * Added bold and underline
+
+0.16 - 04 Jul 2006, H.Merijn Brand
+ * xlscat new option: --in-sep-char to force-define input sep-char for CSV
+ * More debug lines
+ * Parser name info in $ref->[0]
+ * SquirrelCalc now reports Spreadsheet::Read and its version for parser
info
+ * Most of the attributes for Excel now implemented. Tested, but no test
case
+
+0.15 - 21 Jun 2006, H.Merijn Brand
+ * Small doc change from AnnoCPAN
+ * Sheets with undefined labels might cause havoc
+ * Clip now skips empty xls sheets (TODO: sxc)
+ * xlscat clips by default
+ * xlscat new options -d and --noclip
+ * xlscat usage () from -?/--help to STDOUT from fault to STDERR
+
+0.14 - 20 Jan 2006, H.Merijn Brand
+ * maxrow and maxcol were swapped in csv sheets
+ * promoted internal debug flag to option
+ * small doc changes
+
+0.13 - 04 Nov 2005, H.Merijn Brand
+ * Control attrib 'cells' was misinterpreted
+ * New option: clip, default is true if {cell} is selected, false otherwise
Removes trailing lines and columns in each sheet that have no visible
data
- - new test t/11_call.t for checking options. Not complete yet
- - Added test_cover target to Makefile.PL
-
-0.12 Mon 31 Oct 2005
-
- - Added ss2tk to examples
-
-0.11 Wed 26 Oct 2005
-
- - Allow ods (OpenOffice 2.0) for sxc
- - include real ods test files and new test
- - Check if sc.version is undef, not 0
-
-0.10 Mon 19 Sep 2005
-
- - More test coverage
- - cr2cell () returns "" for illegal col/row values
- - cell2cr () returns (0, 0) for illegal cell values
- - rows () tests even better for valid reference pointer
- - Renamed the test files
-
-0.09 Sun 18 Sep 2005
-
- - Added Test::Pod
- - Added Test::Pod::Coverage
- - Spreadsheet::ReadSXC 0.20 now required (too many tests fail on 0.12)
- - Small changes to the docs
- - More secure handling of false values
- - Mention a bug in Spreadsheet::ParseExcel
-
-0.08 Mon 22 Aug 2005
-
- - Slightly changed the Synopsis
-
-0.07 Wed 06 Jul 2005
-
- - Added function rows ()
- - Added function parses ()
- - Made all modules optional
- - Prepared for Spreadsheet::Perl
- - Doc updates
-
-0.06 Wed 22 Jun 2005
-
- - Repaired error in label names in metadata for SXC
-
-0.05 Thu 17 Jun 2005
-
- - Spreadsheet::ReadSXC >= 0.20 supports sheet order
- - Spreadsheet::ReadSXC has new data structure (we still support the old)
- - Added "version" to the meta data for parser version
- - More tests
-
-0.04 Tue 14 Jun 2005
-
- - Changed TODO
- - Added options "rc", and "cell"
- - Added CSV
- - Added CSV options "sep", and "quote"
- - Support xls from content
- - Added basic support for SquirrelCalc format
- - Updated pod
- - xlscat -R option for row selection was a one-off
- - xlscat now supports selecting fields with -F
-
-0.03 Thu 19 May 2005
-
- - Expanded xlscat to support -i for index
- - Optionally install xlscat
-
-0.02 Thu 19 May 2005
+ * new test t/11_call.t for checking options. Not complete yet
+ * Added test_cover target to Makefile.PL
- - Typoes in the doc
- - Small change in organization so it actually installs
+0.12 - 31 Oct 2005, H.Merijn Brand
+ * Added ss2tk to examples
-0.01 Thu 12 May 2005
+0.11 - 26 Oct 2005, H.Merijn Brand
+ * Allow ods (OpenOffice 2.0) for sxc
+ * include real ods test files and new test
+ * Check if sc.version is undef, not 0
+
+0.10 - 19 Sep 2005, H.Merijn Brand
+ * More test coverage
+ * cr2cell () returns "" for illegal col/row values
+ * cell2cr () returns (0, 0) for illegal cell values
+ * rows () tests even better for valid reference pointer
+ * Renamed the test files
+
+0.09 - 18 Sep 2005, H.Merijn Brand
+ * Added Test::Pod
+ * Added Test::Pod::Coverage
+ * Spreadsheet::ReadSXC 0.20 now required (too many tests fail on 0.12)
+ * Small changes to the docs
+ * More secure handling of false values
+ * Mention a bug in Spreadsheet::ParseExcel
+
+0.08 - 22 Aug 2005, H.Merijn Brand
+ * Slightly changed the Synopsis
+
+0.07 - 06 Jul 2005, H.Merijn Brand
+ * Added function rows ()
+ * Added function parses ()
+ * Made all modules optional
+ * Prepared for Spreadsheet::Perl
+ * Doc updates
+
+0.06 - 22 Jun 2005, H.Merijn Brand
+ * Repaired error in label names in metadata for SXC
+
+0.05 - 17 Jun 2005, H.Merijn Brand
+ * Spreadsheet::ReadSXC >= 0.20 supports sheet order
+ * Spreadsheet::ReadSXC has new data structure (we still support the old)
+ * Added "version" to the meta data for parser version
+ * More tests
+
+0.04 - 14 Jun 2005, H.Merijn Brand
+ * Changed TODO
+ * Added options "rc", and "cell"
+ * Added CSV
+ * Added CSV options "sep", and "quote"
+ * Support xls from content
+ * Added basic support for SquirrelCalc format
+ * Updated pod
+ * xlscat -R option for row selection was a one-off
+ * xlscat now supports selecting fields with -F
+
+0.03 - 19 May 2005, H.Merijn Brand
+ * Expanded xlscat to support -i for index
+ * Optionally install xlscat
+
+0.02 - 19 May 2005, H.Merijn Brand
+ * Typoes in the doc
+ * Small change in organization so it actually installs
- - Initial CPAN version. A lot can still change
+0.01 - 12 May 2005, H.Merijn Brand
+ * Initial CPAN version. A lot can still change
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/MANIFEST
new/Spreadsheet-Read-0.46/MANIFEST
--- old/Spreadsheet-Read-0.45/MANIFEST 2011-09-07 18:15:30.000000000 +0200
+++ new/Spreadsheet-Read-0.46/MANIFEST 2012-02-14 08:53:37.000000000 +0100
@@ -6,6 +6,9 @@
files/attr.ods
files/attr.xls
files/attr.xlsx
+files/blank.csv
+files/blank.xls
+files/blank.xlsx
files/content.xml
files/Dates.xls
files/Dates.xlsx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/META.json
new/Spreadsheet-Read-0.46/META.json
--- old/Spreadsheet-Read-0.45/META.json 2011-09-07 18:15:31.000000000 +0200
+++ new/Spreadsheet-Read-0.46/META.json 2012-02-14 08:53:38.000000000 +0100
@@ -14,7 +14,7 @@
},
"distribution_type" : "module",
"generated_by" : "Author",
- "version" : "0.45",
+ "version" : "0.46",
"name" : "Spreadsheet-Read",
"author" : [
"H.Merijn Brand <[email protected]>"
@@ -22,7 +22,7 @@
"license" : "perl",
"provides" : {
"Spreadsheet::Read" : {
- "version" : "0.45",
+ "version" : "0.46",
"file" : "Read.pm"
}
},
@@ -48,7 +48,7 @@
},
"recommends" : {
"Text::CSV_PP" : "1.29",
- "Text::CSV_XS" : "0.83",
+ "Text::CSV_XS" : "0.86",
"Text::CSV" : "1.21"
},
"description" : "Provides parsing of CSV streams"
@@ -79,7 +79,7 @@
},
"recommends" : {
"Test::More" : "0.98",
- "perl" : "5.014001",
+ "perl" : "5.014002",
"IO::Scalar" : "0"
},
"abstract" : "Meta-Wrapper for reading spreadsheet data",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/META.yml
new/Spreadsheet-Read-0.46/META.yml
--- old/Spreadsheet-Read-0.45/META.yml 2011-09-07 18:15:31.000000000 +0200
+++ new/Spreadsheet-Read-0.46/META.yml 2012-02-14 08:53:38.000000000 +0100
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Spreadsheet-Read
-version: 0.45
+version: 0.46
abstract: Meta-Wrapper for reading spreadsheet data
license: perl
author:
@@ -10,7 +10,7 @@
provides:
Spreadsheet::Read:
file: Read.pm
- version: 0.45
+ version: 0.46
requires:
perl: 5.006
Exporter: 0
@@ -24,7 +24,7 @@
Test::More: 0.88
Test::NoWarnings: 0
recommends:
- perl: 5.014001
+ perl: 5.014002
IO::Scalar: 0
Test::More: 0.98
resources:
@@ -41,7 +41,7 @@
recommends:
Text::CSV: 1.21
Text::CSV_PP: 1.29
- Text::CSV_XS: 0.83
+ Text::CSV_XS: 0.86
opt_excel:
description: Provides parsing of Microsoft Excel files
requires:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/README
new/Spreadsheet-Read-0.46/README
--- old/Spreadsheet-Read-0.45/README 2011-02-03 10:40:02.000000000 +0100
+++ new/Spreadsheet-Read-0.46/README 2012-01-11 09:25:18.000000000 +0100
@@ -59,7 +59,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright (C) 2005-2011 H.Merijn Brand
+Copyright (C) 2005-2012 H.Merijn Brand
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/Spreadsheet-Read-0.45/Read.pm
new/Spreadsheet-Read-0.46/Read.pm
--- old/Spreadsheet-Read-0.45/Read.pm 2011-09-07 16:35:21.000000000 +0200
+++ new/Spreadsheet-Read-0.46/Read.pm 2012-02-14 08:42:22.000000000 +0100
@@ -23,7 +23,7 @@
use strict;
use warnings;
-our $VERSION = "0.45";
+our $VERSION = "0.46";
sub Version { $VERSION }
use Carp;
@@ -57,6 +57,18 @@
$can{sc} = __PACKAGE__; # SquirelCalc is built-in
my $debug = 0;
+my %def_opts = (
+ rc => 1,
+ cells => 1,
+ attr => 0,
+ clip => undef, # $opt{cells};
+ strip => 0,
+ dtfmt => "yyyy-mm-dd", # Format 14
+ debug => 0,
+ parser => undef,
+ sep => undef,
+ quote => undef,
+ );
my @def_attr = (
type => "text",
fgcolor => undef,
@@ -171,9 +183,10 @@
{
my ($opt, $ref) = @_;
- if (my $s = $opt->{strip}) {
+ if (my $s = $opt->{strip} and $ref->[0]{sheets}) {
foreach my $sheet (1 .. $ref->[0]{sheets}) {
my $ss = $ref->[$sheet];
+ $ss->{maxrow} && $ss->{maxcol} or next;
foreach my $row (1 .. $ss->{maxrow}) {
foreach my $col (1 .. $ss->{maxcol}) {
defined $ss->{cell}[$col][$row] or next;
@@ -236,17 +249,22 @@
if (ref $_[0] eq "HASH") { %opt = %{shift @_} }
elsif (@_ % 2 == 0) { %opt = @_ }
}
- defined $opt{rc} or $opt{rc} = 1;
- defined $opt{cells} or $opt{cells} = 1;
- defined $opt{attr} or $opt{attr} = 0;
+
+ defined $opt{rc} or $opt{rc} = $def_opts{rc};
+ defined $opt{cells} or $opt{cells} = $def_opts{cells};
+ defined $opt{attr} or $opt{attr} = $def_opts{attr};
defined $opt{clip} or $opt{clip} = $opt{cells};
- defined $opt{strip} or $opt{strip} = 0;
- defined $opt{dtfmt} or $opt{dtfmt} = "yyyy-mm-dd"; # Format 14
+ defined $opt{strip} or $opt{strip} = $def_opts{strip};
+ defined $opt{dtfmt} or $opt{dtfmt} = $def_opts{dtfmt};
# $debug = $opt{debug} // 0;
- $debug = defined $opt{debug} ? $opt{debug} : 0;
+ $debug = defined $opt{debug} ? $opt{debug} : $def_opts{debug};
$debug > 4 and print STDERR Data::Dumper->Dump ([\%opt],["Options"]);
+ my %parser_opts = map { $_ => $opt{$_} }
+ grep { !exists $def_opts{$_} }
+ keys %opt;
+
my $io_ref = ref ($txt) =~ m/GLOB|IO/ ? $txt : undef;
my $io_fil = $io_ref ? 0 : do { no warnings "newline"; -f $txt ? 1 : 0 };
my $io_txt = $io_ref || $io_fil ? 0 : 1;
@@ -310,6 +328,8 @@
}
$debug > 1 and print STDERR "CSV sep_char '$sep', quote_char '$quo'\n";
$csv = $can{csv}->new ({
+ %parser_opts,
+
sep_char => ($data[0]{sepchar} = $sep),
quote_char => ($data[0]{quote} = $quo),
keep_meta_info => 1,
@@ -368,14 +388,13 @@
if ($io_ref) {
$oBook = $parse_type eq "XLSX"
? Spreadsheet::XLSX->new ($io_ref)
- : Spreadsheet::ParseExcel::Workbook->Parse ($io_ref);
+ : Spreadsheet::ParseExcel->new (%parser_opts)->Parse ($io_ref);
}
else {
$oBook = $parse_type eq "XLSX"
? Spreadsheet::XLSX->new ($txt)
- : Spreadsheet::ParseExcel::Workbook->Parse ($txt);
+ : Spreadsheet::ParseExcel->new (%parser_opts)->Parse ($txt);
}
- $oBook or return;
$debug > 8 and print STDERR Data::Dumper->Dump ([$oBook],["oBook"]);
my @data = ( {
type => lc $parse_type,
@@ -569,7 +588,7 @@
if ($opt{parser} ? _parser ($opt{parser}) eq "sxc"
: ($txt =~ m/^<\?xml/ or -f $txt)) {
$can{sxc} or croak "Spreadsheet::ReadSXC not installed";
- my $sxc_options = { OrderBySheet => 1 }; # New interface 0.20 and up
+ my $sxc_options = { %parser_opts, OrderBySheet => 1 }; # New interface
0.20 and up
my $sxc;
if ($txt =~ m/\.(sxc|ods)$/i) {
$debug and print STDERR "Opening \U$1\E $txt\n";
@@ -811,6 +830,9 @@
=back
+All other attributes/options will be passed to the underlying parser if
+that parser supports attributes.
+
=back
=head2 Using CSV
@@ -1045,7 +1067,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright (C) 2005-2011 H.Merijn Brand
+Copyright (C) 2005-2012 H.Merijn Brand
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/Spreadsheet-Read-0.45/examples/ss-dups-tk.pl
new/Spreadsheet-Read-0.46/examples/ss-dups-tk.pl
--- old/Spreadsheet-Read-0.45/examples/ss-dups-tk.pl 2009-01-23
21:45:37.000000000 +0100
+++ new/Spreadsheet-Read-0.46/examples/ss-dups-tk.pl 2012-01-11
09:28:25.000000000 +0100
@@ -1,5 +1,8 @@
#!/pro/bin/perl
+# ss-dup-tk.pl: Find dups in spreadsheet
+# (m)'09 [23-01-2009] Copyright H.M.Brand 2005-2012
+
use strict;
use warnings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/examples/ss2tk
new/Spreadsheet-Read-0.46/examples/ss2tk
--- old/Spreadsheet-Read-0.45/examples/ss2tk 2011-02-03 10:40:09.000000000
+0100
+++ new/Spreadsheet-Read-0.46/examples/ss2tk 2012-01-11 09:26:16.000000000
+0100
@@ -1,7 +1,7 @@
#!/pro/bin/perl
# ss2tk: show SpreadSheet file in Tk::TableMatrix::Spreadsheet (*)
-# (m)'07 [26-06-2007] Copyright H.M.Brand 2005-2011
+# (m)'07 [26-06-2007] Copyright H.M.Brand 2005-2012
use strict;
use warnings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/examples/xls2csv
new/Spreadsheet-Read-0.46/examples/xls2csv
--- old/Spreadsheet-Read-0.45/examples/xls2csv 2011-02-03 10:40:12.000000000
+0100
+++ new/Spreadsheet-Read-0.46/examples/xls2csv 2012-01-11 09:26:23.000000000
+0100
@@ -1,7 +1,7 @@
#!/pro/bin/perl
# xls2csv: Convert Microsoft Excel spreadsheet to CSV
-# (m)'08 [10-03-2008] Copyright H.M.Brand 2008-2011
+# (m)'08 [10-03-2008] Copyright H.M.Brand 2008-2012
use strict;
use warnings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/examples/xlscat
new/Spreadsheet-Read-0.46/examples/xlscat
--- old/Spreadsheet-Read-0.45/examples/xlscat 2011-06-02 14:15:09.000000000
+0200
+++ new/Spreadsheet-Read-0.46/examples/xlscat 2012-01-20 13:37:41.000000000
+0100
@@ -1,7 +1,7 @@
#!/pro/bin/perl
# xls2cat: show XLS/SXC file as Text
-# (m)'11 [03-02-2011] Copyright H.M.Brand 2005-2011
+# (m)'11 [03-02-2011] Copyright H.M.Brand 2005-2012
use strict;
use warnings;
@@ -250,7 +250,7 @@
<head>
<title>$file</title>
<meta name="Author" content="xlscat $VERSION" />
- <style type="text/css"><!--
+ <style type="text/css">
body, h2,
td, th { font-family: "Nimbus Sans L", "DejaVu Sans",
Helvetica, Arial, sans; }
@@ -265,7 +265,7 @@
table > tr > td:not([class]) {
background: #f0f0f0; }
.odd { background: #e0e0e0; }
- --></style>
+ </style>
</head>
<body>
EOH
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/files/blank.csv
new/Spreadsheet-Read-0.46/files/blank.csv
--- old/Spreadsheet-Read-0.45/files/blank.csv 1970-01-01 01:00:00.000000000
+0100
+++ new/Spreadsheet-Read-0.46/files/blank.csv 2012-02-14 08:19:26.000000000
+0100
@@ -0,0 +1,3 @@
+,,,
+,,,
+,,,
Files old/Spreadsheet-Read-0.45/files/blank.xls and
new/Spreadsheet-Read-0.46/files/blank.xls differ
Files old/Spreadsheet-Read-0.45/files/blank.xlsx and
new/Spreadsheet-Read-0.46/files/blank.xlsx differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/t/20_csv.t
new/Spreadsheet-Read-0.46/t/20_csv.t
--- old/Spreadsheet-Read-0.45/t/20_csv.t 2009-03-29 17:24:24.000000000
+0200
+++ new/Spreadsheet-Read-0.46/t/20_csv.t 2012-02-14 08:37:41.000000000
+0100
@@ -3,7 +3,7 @@
use strict;
use warnings;
-my $tests = 117;
+my $tests = 121;
use Test::More;
require Test::NoWarnings;
@@ -16,7 +16,7 @@
{ my $ref;
$ref = ReadData ("no_such_file.csv");
ok (!defined $ref, "Nonexistent file");
- $ref = ReadData ("empty.csv");
+ $ref = ReadData ("files/empty.csv");
ok (!defined $ref, "Empty file");
}
@@ -84,6 +84,13 @@
is ($csv->[1]{$cell}, "", "Formatted cell $cell");
}
+{ # RT#74976] Error Received when reading empty sheets
+ foreach my $strip (0 .. 3) {
+ my $ref = ReadData ("files/blank.csv", strip => $strip);
+ ok ($ref, "File with no content - strip $strip");
+ }
+ }
+
unless ($ENV{AUTOMATED_TESTING}) {
Test::NoWarnings::had_no_warnings ();
$tests++;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/t/23_csv.t
new/Spreadsheet-Read-0.46/t/23_csv.t
--- old/Spreadsheet-Read-0.45/t/23_csv.t 2009-11-09 08:50:34.000000000
+0100
+++ new/Spreadsheet-Read-0.46/t/23_csv.t 2012-02-14 08:50:08.000000000
+0100
@@ -21,7 +21,7 @@
{ my $ref;
$ref = ReadDataStream ("no_such_file.csv");
ok (!defined $ref, "Nonexistent file");
- $ref = ReadDataStream ("empty.csv");
+ $ref = ReadDataStream ("files/empty.csv");
ok (!defined $ref, "Empty file");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/t/30_xls.t
new/Spreadsheet-Read-0.46/t/30_xls.t
--- old/Spreadsheet-Read-0.45/t/30_xls.t 2010-03-31 14:01:21.000000000
+0200
+++ new/Spreadsheet-Read-0.46/t/30_xls.t 2012-02-14 08:50:11.000000000
+0100
@@ -10,7 +10,7 @@
my $parser;
if ($parser = Spreadsheet::Read::parses ("xls")) {
print STDERR "# Parser: $parser-", $parser->VERSION, "\n";
- plan tests => 218;
+ plan tests => 222;
Test::NoWarnings->import;
}
else {
@@ -20,7 +20,7 @@
{ my $ref;
$ref = ReadData ("no_such_file.xls");
ok (!defined $ref, "Nonexistent file");
- $ref = ReadData ("empty.xls");
+ $ref = ReadData ("files/empty.xls");
ok (!defined $ref, "Empty file");
}
@@ -141,6 +141,13 @@
is ($ss->{E1}, "1", "formatted numeric 1");
is ($ss->{F1}, "", "formatted a single '");
+{ # RT#74976] Error Received when reading empty sheets
+ foreach my $strip (0 .. 3) {
+ my $ref = ReadData ("files/blank.xls", strip => $strip);
+ ok ($ref, "File with no content - strip $strip");
+ }
+ }
+
__END__
--- PM 2005-09-15 14:16:36.163623616 +0200
+++ PM 2005-09-15 14:11:56.289171000 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/t/36_xls.t
new/Spreadsheet-Read-0.46/t/36_xls.t
--- old/Spreadsheet-Read-0.45/t/36_xls.t 2010-03-31 14:02:00.000000000
+0200
+++ new/Spreadsheet-Read-0.46/t/36_xls.t 2012-02-14 08:50:17.000000000
+0100
@@ -26,7 +26,7 @@
{ my $ref;
$ref = ReadDataStream ("no_such_file.xls");
ok (!defined $ref, "Nonexistent file");
- $ref = ReadDataStream ("empty.xls");
+ $ref = ReadDataStream ("files/empty.xls");
ok (!defined $ref, "Empty file");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.45/t/60_xlsx.t
new/Spreadsheet-Read-0.46/t/60_xlsx.t
--- old/Spreadsheet-Read-0.45/t/60_xlsx.t 2009-03-29 12:41:19.000000000
+0200
+++ new/Spreadsheet-Read-0.46/t/60_xlsx.t 2012-02-14 08:50:23.000000000
+0100
@@ -3,7 +3,7 @@
use strict;
use warnings;
-my $tests = 62;
+my $tests = 66;
use Test::More;
require Test::NoWarnings;
@@ -17,7 +17,7 @@
{ my $ref;
$ref = ReadData ("no_such_file.xlsx");
ok (!defined $ref, "Nonexistent file");
- $ref = ReadData ("empty.xlsx");
+ $ref = ReadData ("files/empty.xlsx");
ok (!defined $ref, "Empty file");
}
@@ -81,6 +81,13 @@
is ($ss->{E1}, "1", "formatted numeric 1");
is ($ss->{F1}, "", "formatted a single '");
+{ # RT#74976] Error Received when reading empty sheets
+ foreach my $strip (0 .. 3) {
+ my $ref = ReadData ("files/blank.xlsx", strip => $strip);
+ ok ($ref, "File with no content - strip $strip");
+ }
+ }
+
unless ($ENV{AUTOMATED_TESTING}) {
Test::NoWarnings::had_no_warnings ();
$tests++;
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
