Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package perl-Spreadsheet-Read for
openSUSE:Factory checked in at 2021-04-12 17:10:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Spreadsheet-Read (Old)
and /work/SRC/openSUSE:Factory/.perl-Spreadsheet-Read.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Spreadsheet-Read"
Mon Apr 12 17:10:25 2021 rev:17 rq:876532 version:0.84
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-Spreadsheet-Read/perl-Spreadsheet-Read.changes
2021-01-21 21:57:08.589852474 +0100
+++
/work/SRC/openSUSE:Factory/.perl-Spreadsheet-Read.new.2401/perl-Spreadsheet-Read.changes
2021-04-12 17:10:26.794570430 +0200
@@ -1,0 +2,17 @@
+Tue Mar 2 11:30:42 UTC 2021 - Tina M??ller <[email protected]>
+
+- Update nonstdperlpath.patch
+
+-------------------------------------------------------------------
+Sat Feb 27 03:09:10 UTC 2021 - Tina M??ller <[email protected]>
+
+- updated to 0.84
+ see /usr/share/doc/packages/perl-Spreadsheet-Read/Changes
+
+ 0.84 - 26 Feb 2021, H.Merijn Brand
+ * It's 2021
+ * Alias pivot to transpose (issue#36)
+ * Alias strip to trim (issue#36)
+ * Check for consistent return values of parses ()
+
+-------------------------------------------------------------------
Old:
----
Spreadsheet-Read-0.83.tgz
New:
----
Spreadsheet-Read-0.84.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Spreadsheet-Read.spec ++++++
--- /var/tmp/diff_new_pack.s5Vjm3/_old 2021-04-12 17:10:27.294570983 +0200
+++ /var/tmp/diff_new_pack.s5Vjm3/_new 2021-04-12 17:10:27.298570988 +0200
@@ -16,19 +16,17 @@
#
+%define cpan_name Spreadsheet-Read
Name: perl-Spreadsheet-Read
-Version: 0.83
+Version: 0.84
Release: 0
-%define cpan_name Spreadsheet-Read
Summary: Read the data from a spreadsheet
License: Artistic-1.0 OR GPL-1.0-or-later
-Group: Development/Libraries/Perl
URL: https://metacpan.org/release/%{cpan_name}
Source0:
https://cpan.metacpan.org/authors/id/H/HM/HMBRAND/%{cpan_name}-%{version}.tgz
Source1: cpanspec.yml
Patch0: nonstdperlpath.patch
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
BuildRequires: perl(Data::Peek)
@@ -70,9 +68,8 @@
For SquirrelCalc there is a very simplistic built-in parser
%prep
-%setup -q -n %{cpan_name}-%{version}
+%autosetup -n %{cpan_name}-%{version} -p1
find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path
"*/script/*" ! -name "configure" -print0 | xargs -0 chmod 644
-%patch0 -p1
%build
# disable installation of examples to {_bindir}
@@ -89,7 +86,6 @@
%perl_gen_filelist
%files -f %{name}.files
-%defattr(-,root,root,755)
%doc Changes CONTRIBUTING.md examples README
%changelog
++++++ Spreadsheet-Read-0.83.tgz -> Spreadsheet-Read-0.84.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/Changes
new/Spreadsheet-Read-0.84/Changes
--- old/Spreadsheet-Read-0.83/Changes 2020-12-21 15:45:53.000000000 +0100
+++ new/Spreadsheet-Read-0.84/Changes 2021-02-26 10:50:47.000000000 +0100
@@ -1,3 +1,9 @@
+0.84 - 26 Feb 2021, H.Merijn Brand
+ * It's 2021
+ * Alias pivot to transpose (issue#36)
+ * Alias strip to trim (issue#36)
+ * Check for consistent return values of parses ()
+
0.83 - 21 Dec 2020, H.Merijn Brand
* Require ParseODS 0.26
* Add ::parsers to get list of supported formats
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/META.json
new/Spreadsheet-Read-0.84/META.json
--- old/Spreadsheet-Read-0.83/META.json 2020-12-21 15:54:00.000000000 +0100
+++ new/Spreadsheet-Read-0.84/META.json 2021-02-26 12:52:23.000000000 +0100
@@ -1,17 +1,31 @@
{
- "license" : [
- "perl_5"
- ],
"provides" : {
"Spreadsheet::Read" : {
- "version" : "0.83",
- "file" : "Read.pm"
+ "file" : "Read.pm",
+ "version" : "0.84"
}
},
"meta-spec" : {
"version" : 2,
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";
},
+ "release_status" : "stable",
+ "resources" : {
+ "license" : [
+ "http://dev.perl.org/licenses/";
+ ],
+ "bugtracker" : {
+ "web" : "https://github.com/Tux/Spreadsheet-Read/issues";
+ },
+ "repository" : {
+ "type" : "git",
+ "web" : "https://github.com/Tux/Spreadsheet-Read";,
+ "url" : "https://github.com/Tux/Spreadsheet-Read";
+ }
+ },
+ "name" : "Spreadsheet-Read",
+ "abstract" : "Meta-Wrapper for reading spreadsheet data",
+ "dynamic_config" : 1,
"author" : [
"H.Merijn Brand <[email protected]>"
],
@@ -24,131 +38,117 @@
},
"test" : {
"requires" : {
+ "Test::Harness" : "0",
"Test::NoWarnings" : "0",
- "Test::More" : "0.88",
- "Test::Harness" : "0"
+ "Test::More" : "0.88"
},
"recommends" : {
"Test::More" : "1.302183"
}
},
"runtime" : {
- "recommends" : {
- "File::Temp" : "0.2311",
- "Data::Peek" : "0.50",
- "IO::Scalar" : "0"
- },
"requires" : {
- "Carp" : "0",
- "Exporter" : "0",
- "perl" : "5.008001",
- "Data::Peek" : "0",
"Data::Dumper" : "0",
- "File::Temp" : "0.22",
+ "Carp" : "0",
"List::Util" : "0",
- "Encode" : "0"
+ "Encode" : "0",
+ "File::Temp" : "0.22",
+ "Data::Peek" : "0",
+ "Exporter" : "0",
+ "perl" : "5.008001"
+ },
+ "recommends" : {
+ "Data::Peek" : "0.50",
+ "File::Temp" : "0.2311",
+ "IO::Scalar" : "0"
}
}
},
- "dynamic_config" : 1,
- "release_status" : "stable",
- "name" : "Spreadsheet-Read",
"optional_features" : {
- "opt_xls" : {
+ "opt_ods" : {
"prereqs" : {
"runtime" : {
- "recommends" : {
- "Spreadsheet::ParseExcel" : "0.65"
- },
"requires" : {
- "Spreadsheet::ParseExcel" : "0.34",
- "Spreadsheet::ParseExcel::FmtDefault" : "0"
+ "Spreadsheet::ParseODS" : "0.26"
+ },
+ "recommends" : {
+ "Spreadsheet::ParseODS" : "0.33"
}
}
},
- "description" : "Provides parsing of Microsoft Excel files"
+ "description" : "Provides parsing of OpenOffice spreadsheets"
},
- "opt_sxc" : {
+ "opt_tools" : {
+ "description" : "Spreadsheet tools",
"prereqs" : {
"runtime" : {
"recommends" : {
- "Spreadsheet::ReadSXC" : "0.32"
- },
- "requires" : {
- "Spreadsheet::ReadSXC" : "0.26"
+ "Tk::TableMatrix::Spreadsheet" : "0",
+ "Tk::NoteBook" : "0",
+ "Tk" : "804.036"
}
}
- },
- "description" : "Provides parsing of OpenOffice spreadsheets old
style"
+ }
},
- "opt_tools" : {
+ "opt_xlsx" : {
"prereqs" : {
"runtime" : {
+ "requires" : {
+ "Spreadsheet::ParseXLSX" : "0.24",
+ "Spreadsheet::ParseExcel::FmtDefault" : "0"
+ },
"recommends" : {
- "Tk::TableMatrix::Spreadsheet" : "0",
- "Tk" : "804.035",
- "Tk::NoteBook" : "0"
+ "Spreadsheet::ParseXLSX" : "0.27"
}
}
},
- "description" : "Spreadsheet tools"
+ "description" : "Provides parsing of Microsoft Excel 2007 files"
},
- "opt_xlsx" : {
- "description" : "Provides parsing of Microsoft Excel 2007 files",
+ "opt_xls" : {
+ "description" : "Provides parsing of Microsoft Excel files",
"prereqs" : {
"runtime" : {
"requires" : {
"Spreadsheet::ParseExcel::FmtDefault" : "0",
- "Spreadsheet::ParseXLSX" : "0.24"
+ "Spreadsheet::ParseExcel" : "0.34"
},
"recommends" : {
- "Spreadsheet::ParseXLSX" : "0.27"
+ "Spreadsheet::ParseExcel" : "0.65"
}
}
}
},
- "opt_ods" : {
+ "opt_sxc" : {
+ "description" : "Provides parsing of OpenOffice spreadsheets old
style",
"prereqs" : {
"runtime" : {
"requires" : {
- "Spreadsheet::ParseODS" : "0.26"
+ "Spreadsheet::ReadSXC" : "0.26"
},
"recommends" : {
- "Spreadsheet::ParseODS" : "0.32"
+ "Spreadsheet::ReadSXC" : "0.33"
}
}
- },
- "description" : "Provides parsing of OpenOffice spreadsheets"
+ }
},
"opt_csv" : {
- "description" : "Provides parsing of CSV streams",
"prereqs" : {
"runtime" : {
- "recommends" : {
- "Text::CSV_XS" : "1.44",
- "Text::CSV_PP" : "2.00",
- "Text::CSV" : "2.00"
- },
"requires" : {
"Text::CSV_XS" : "0.71"
+ },
+ "recommends" : {
+ "Text::CSV_PP" : "2.00",
+ "Text::CSV" : "2.00",
+ "Text::CSV_XS" : "1.45"
}
}
- }
+ },
+ "description" : "Provides parsing of CSV streams"
}
},
- "version" : "0.83",
- "abstract" : "Meta-Wrapper for reading spreadsheet data",
- "resources" : {
- "license" : [
- "http://dev.perl.org/licenses/";
- ],
- "bugtracker" : {
- "web" : "https://github.com/Tux/Spreadsheet-Read/issues";
- },
- "repository" : {
- "web" : "https://github.com/Tux/Spreadsheet-Read";,
- "type" : "git",
- "url" : "https://github.com/Tux/Spreadsheet-Read";
- }
- }
+ "version" : "0.84",
+ "license" : [
+ "perl_5"
+ ]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/META.yml
new/Spreadsheet-Read-0.84/META.yml
--- old/Spreadsheet-Read-0.83/META.yml 2020-12-21 15:54:00.000000000 +0100
+++ new/Spreadsheet-Read-0.84/META.yml 2021-02-26 12:52:23.000000000 +0100
@@ -39,7 +39,7 @@
provides:
Spreadsheet::Read:
file: Read.pm
- version: '0.83'
+ version: '0.84'
recommends:
Data::Peek: '0.50'
File::Temp: '0.2311'
@@ -61,4 +61,4 @@
bugtracker: https://github.com/Tux/Spreadsheet-Read/issues
license: http://dev.perl.org/licenses/
repository: https://github.com/Tux/Spreadsheet-Read
-version: '0.83'
+version: '0.84'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/Makefile.PL
new/Spreadsheet-Read-0.84/Makefile.PL
--- old/Spreadsheet-Read-0.83/Makefile.PL 2020-10-27 13:48:56.000000000
+0100
+++ new/Spreadsheet-Read-0.84/Makefile.PL 2021-01-01 12:12:27.000000000
+0100
@@ -143,7 +143,7 @@
' perl sandbox/genMETA.pl',
' ls -l */META.yml',
'',
- 'tgzdist: checkmeta fixmeta $(DISTVNAME).tar.gz distcheck',
+ 'tgzdist: doc checkmeta fixmeta $(DISTVNAME).tar.gz distcheck',
' -@mv -f $(DISTVNAME).tar.gz $(DISTVNAME).tgz',
' -@cpants_lint.pl $(DISTVNAME).tgz',
' -@rm -f Debian_CPANTS.txt',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/README
new/Spreadsheet-Read-0.84/README
--- old/Spreadsheet-Read-0.83/README 2020-10-27 14:01:28.000000000 +0100
+++ new/Spreadsheet-Read-0.84/README 2021-01-01 11:20:21.000000000 +0100
@@ -73,7 +73,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright (C) 2005-2020 H.Merijn Brand
+Copyright (C) 2005-2021 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.83/Read.pm
new/Spreadsheet-Read-0.84/Read.pm
--- old/Spreadsheet-Read-0.83/Read.pm 2020-10-27 14:07:06.000000000 +0100
+++ new/Spreadsheet-Read-0.84/Read.pm 2021-02-26 12:48:21.000000000 +0100
@@ -37,7 +37,7 @@
use strict;
use warnings;
-our $VERSION = "0.83";
+our $VERSION = "0.84";
sub Version { $VERSION }
use Carp;
@@ -65,6 +65,10 @@
# [ prl => "Spreadsheet::Perl", "" ],
[ sc => "Spreadsheet::Read", "0.01" ],
+ [ zzz1 => "Z10::Just::For::Testing", "1.23" ],
+ [ zzz2 => "Z20::Just::For::Testing", "" ],
+ [ zzz3 => "Z30::Just::For::Testing", "1.00" ],
+
# Helper modules
[ ios => "IO::Scalar", "" ],
[ dmp => "Data::Peek", "" ],
@@ -107,8 +111,11 @@
for (@parsers) {
my ($flag, $mod, $vsn) = @$_;
$can{$flag} and next;
- eval "require $mod; \$vsn and ${mod}->VERSION (\$vsn); \$can{\$flag} =
'$mod'" or
- $_->[0] = "! Cannot use $mod version $vsn: $@";
+ eval "require $mod; \$vsn and ${mod}->VERSION (\$vsn); \$can{\$flag} =
'$mod'" and next;
+ $_->[0] = "! Cannot use $mod version $vsn: $@";
+ $can{$flag} = $@ =~ m/need to install|can(?:not|'t) locate/i
+ ? 0 # Not found
+ : ""; # Too old
}
$can{sc} = __PACKAGE__; # SquirrelCalc is built-in
@@ -447,6 +454,10 @@
elsif (@_ % 2 == 0) { %opt = @_ }
}
+ # Aliasses
+ exists $opt{transpose} && !exists $opt{pivot} and $opt{pivot} = delete
$opt{transpose};
+ exists $opt{trim} && !exists $opt{strip} and $opt{strip} = delete
$opt{trim};
+
exists $opt{rc} or $opt{rc} = $def_opts{rc};
exists $opt{cells} or $opt{cells} = $def_opts{cells};
exists $opt{attr} or $opt{attr} = $def_opts{attr};
@@ -1460,6 +1471,20 @@
1;
+BEGIN {
+ $INC{"Z10/Just/For/Testing.pm"} = $0;
+ $INC{"Z20/Just/For/Testing.pm"} = $0;
+ $Z10::Just::For::Testing::VERSION = "1.00";
+ $Z20::Just::For::Testing::VERSION = undef;
+ }
+
+package Z10::Just::For::Testing;
+
+1;
+
+package Z20::Just::For::Testing;
+
+1;
__END__
=head1 DESCRIPTION
@@ -1664,6 +1689,8 @@
cells (after optional stripping). If a sheet has no data at all, the sheet
will be skipped entirely when this attribute is true.
+=item trim
+
=item strip
If set, L<C<ReadData>|/ReadData> will remove trailing- and/or
@@ -1676,6 +1703,11 @@
2 n/a strip
3 strip strip
+C<trim> and C<strip> are aliases. If passed both, C<trim> is ignored
+because of backward compatibility.
+
+=item transpose
+
=item pivot
Swap all rows and columns.
@@ -1686,7 +1718,7 @@
A2 C2 D2
A3 B3 C3 D3 E3
-using C<pivot> will return the sheet data as
+using C<transpose> or C<pivot> will return the sheet data as
A1 A2 A3
B1 B3
@@ -1694,6 +1726,9 @@
D2 D3
E1 E3
+C<transpose> and C<pivot> are aliases. If passed both, C<transpose> is
+ignored because of backward compatibility.
+
=item sep
Set separator for CSV. Default is comma C<,>.
@@ -2553,7 +2588,7 @@
=item Spreadsheet::ParseODS
-L<Spreadsheet::ParseODS|https://metacpan.org/release/Spreadsheet-ParseODS> is a
+L<Spreadsheet::ParseODS|https://metacpan.org/pod/Spreadsheet::ParseODS> is a
parser for OpenOffice/LibreOffice (.sxc and .ods) spreadsheet files. It is the
successor of
L<Spreadsheet::ReadSXC|https://metacpan.org/release/Spreadsheet-ReadSXC>.
@@ -2600,7 +2635,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright (C) 2005-2020 H.Merijn Brand
+Copyright (C) 2005-2021 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.83/cpanfile
new/Spreadsheet-Read-0.84/cpanfile
--- old/Spreadsheet-Read-0.83/cpanfile 2020-12-21 15:54:00.000000000 +0100
+++ new/Spreadsheet-Read-0.84/cpanfile 2021-02-26 12:52:23.000000000 +0100
@@ -27,23 +27,23 @@
recommends "Text::CSV" => "2.00";
recommends "Text::CSV_PP" => "2.00";
- recommends "Text::CSV_XS" => "1.44";
+ recommends "Text::CSV_XS" => "1.45";
};
feature "opt_ods", "Provides parsing of OpenOffice spreadsheets" => sub {
requires "Spreadsheet::ParseODS" => "0.26";
- recommends "Spreadsheet::ParseODS" => "0.32";
+ recommends "Spreadsheet::ParseODS" => "0.33";
};
feature "opt_sxc", "Provides parsing of OpenOffice spreadsheets old style" =>
sub {
requires "Spreadsheet::ReadSXC" => "0.26";
- recommends "Spreadsheet::ReadSXC" => "0.32";
+ recommends "Spreadsheet::ReadSXC" => "0.33";
};
feature "opt_tools", "Spreadsheet tools" => sub {
- recommends "Tk" => "804.035";
+ recommends "Tk" => "804.036";
recommends "Tk::NoteBook";
recommends "Tk::TableMatrix::Spreadsheet";
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/examples/ss-dups-tk.pl
new/Spreadsheet-Read-0.84/examples/ss-dups-tk.pl
--- old/Spreadsheet-Read-0.83/examples/ss-dups-tk.pl 2020-01-31
13:53:18.000000000 +0100
+++ new/Spreadsheet-Read-0.84/examples/ss-dups-tk.pl 2021-01-01
11:20:01.000000000 +0100
@@ -1,7 +1,7 @@
#!/pro/bin/perl
# ss-dup-tk.pl: Find dups in spreadsheet
-# (m)'18 [28-03-2018] Copyright H.M.Brand 2005-2020
+# (m)'18 [28-03-2018] Copyright H.M.Brand 2005-2021
use strict;
use warnings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/scripts/ss2tk
new/Spreadsheet-Read-0.84/scripts/ss2tk
--- old/Spreadsheet-Read-0.83/scripts/ss2tk 2020-01-31 13:53:21.000000000
+0100
+++ new/Spreadsheet-Read-0.84/scripts/ss2tk 2021-01-01 11:20:23.000000000
+0100
@@ -1,7 +1,7 @@
#!/pro/bin/perl
# ss2tk: show SpreadSheet file in Tk::TableMatrix::Spreadsheet (*)
-# (m)'17 [2017-07-03] Copyright H.M.Brand 2005-2020
+# (m)'17 [2017-07-03] Copyright H.M.Brand 2005-2021
use strict;
use warnings;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/scripts/xlscat
new/Spreadsheet-Read-0.84/scripts/xlscat
--- old/Spreadsheet-Read-0.83/scripts/xlscat 2020-10-27 13:20:37.000000000
+0100
+++ new/Spreadsheet-Read-0.84/scripts/xlscat 2021-02-02 13:32:37.000000000
+0100
@@ -2,12 +2,12 @@
# xlscat: show supported spreadsheet file as Text
# xlsgrep: grep pattern
-# (m)'20 [2020-10-27] Copyright H.M.Brand 2005-2020
+# (m)'21 [2021-02-02] Copyright H.M.Brand 2005-2021
use strict;
use warnings;
-our $VERSION = "3.19";
+our $VERSION = "3.20";
my $is_grep = $0 =~ m/grep$/;
@@ -456,13 +456,6 @@
{ map { $s->{cell}[$_ + 1][1] => $row[$_] } 0 .. $#row });
next;
}
- if ($opt_L) {
- foreach my $c (0 .. $#row) {
- my $l = length $row[$c];
- $l > $w[$c] and $w[$c] = $l;
- $row[$c] =~ m/^\s*(?:-\s*)?[0-9][0-9 .,]+$/ or $align[$c] = "-";
- }
- }
if ($opt_H) { # HTML
print " <tr>";
if (defined $opt_n) {
@@ -537,6 +530,18 @@
unshift @align, "";
}
$opt_n = 0;
+ if ($opt_L) {
+ foreach my $r (0 .. $#data) {
+ my $R = $data[$r][0];
+ foreach my $c (0 .. $#$R) {
+ my $d = $R->[$c];
+ my $l = length $d;
+ $l > $w[$c] and $w[$c] = $l;
+ $r && $d =~ m/\S/ or next;
+ $d =~ m/^\s*(?:-\s*)?[0-9][0-9 .,]*$/ or $align[$c] = "-";
+ }
+ }
+ }
for (@data) {
my ($row, $att) = @$_;
my @row = @$row;
@@ -544,7 +549,7 @@
my $l = length $row[$_];
my $w = $l < $w[$_] ? " " x ($w[$_] - $l) : "";
if ($align[$_]) {
- $_ == $#row or $row[$_] .= $w;
+ $_ == $#row or $row[$_] .= $w;
}
else {
substr $row[$_], 0, 0, $w;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/scripts/xlsx2csv
new/Spreadsheet-Read-0.84/scripts/xlsx2csv
--- old/Spreadsheet-Read-0.83/scripts/xlsx2csv 2020-10-27 13:20:48.000000000
+0100
+++ new/Spreadsheet-Read-0.84/scripts/xlsx2csv 2021-01-01 11:20:33.000000000
+0100
@@ -1,7 +1,7 @@
#!/pro/bin/perl
# xls2csv: Convert supported spreadsheet formats to CSV
-# (m)'20 [2020-10-27] Copyright H.M.Brand 2008-2020
+# (m)'20 [2020-10-27] Copyright H.M.Brand 2008-2021
require 5.008001;
@@ -261,7 +261,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright (C) 2008-2020 H.Merijn Brand
+Copyright (C) 2008-2021 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.83/t/10_basics.t
new/Spreadsheet-Read-0.84/t/10_basics.t
--- old/Spreadsheet-Read-0.83/t/10_basics.t 2020-10-27 14:04:35.000000000
+0100
+++ new/Spreadsheet-Read-0.84/t/10_basics.t 2021-02-26 10:42:22.000000000
+0100
@@ -3,7 +3,7 @@
use strict;
use warnings;
-use Test::More tests => 115;
+use Test::More tests => 118;
use Test::NoWarnings;
use Spreadsheet::Read qw(:DEFAULT parses rows );
@@ -13,7 +13,10 @@
ok (my @ext = parses (undef), "No sheet type");
is_deeply ([ grep m/^sc/ => @ext ], [ "sc" ], "Supports Squirrelcalc");
-is (parses ("xyzzy"), 0, "Unknown sheet type");
+is (parses ("zzz0"), 0, "Unknown sheet
type");
+is (parses ("zzz1"), "", "Too old sheet type");
+is (parses ("zzz2"), "Z20::Just::For::Testing", "Testing sheet
type");
+is (parses ("zzz3"), 0, "Unsupported sheet
type");
is (parses ("xls"), parses ("excel"), "Excel alias type");
is (parses ("ods"), parses ("oo"), "OpenOffice alias type 1");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Spreadsheet-Read-0.83/t/200_csv.t
new/Spreadsheet-Read-0.84/t/200_csv.t
--- old/Spreadsheet-Read-0.83/t/200_csv.t 2018-01-22 09:13:24.000000000
+0100
+++ new/Spreadsheet-Read-0.84/t/200_csv.t 2021-02-25 11:32:38.000000000
+0100
@@ -3,7 +3,7 @@
use strict;
use warnings;
-my $tests = 206;
+my $tests = 295;
use Test::More;
require Test::NoWarnings;
@@ -84,93 +84,97 @@
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");
+foreach my $attr ("strip", "trim") {
+ { # RT#74976 - Error Received when reading empty sheets
+ foreach my $strip (0 .. 3) {
+ my $ref = ReadData ("files/blank.csv", $attr => $strip);
+ ok ($ref, "File with no content - $attr $strip");
+ }
}
- }
-# blank.csv has only one sheet with A1 filled with ' '
-{ my $ref = ReadData ("files/blank.csv", clip => 0, strip => 0);
- ok ($ref, "!clip strip 0");
- is ($ref->[1]{maxrow}, 3, "maxrow 3");
- is ($ref->[1]{maxcol}, 4, "maxcol 4");
- is ($ref->[1]{cell}[1][1], " ", "(1, 1) = ' '");
- is ($ref->[1]{A1}, " ", "A1 = ' '");
- $ref = ReadData ("files/blank.csv", clip => 0, strip => 1);
- ok ($ref, "!clip strip 1");
- is ($ref->[1]{maxrow}, 3, "maxrow 3");
- is ($ref->[1]{maxcol}, 4, "maxcol 4");
- is ($ref->[1]{cell}[1][1], "", "blank (1, 1)");
- is ($ref->[1]{A1}, "", "undef A1");
- $ref = ReadData ("files/blank.csv", clip => 0, strip => 1, cells => 0);
- ok ($ref, "!clip strip 1");
- is ($ref->[1]{maxrow}, 3, "maxrow 3");
- is ($ref->[1]{maxcol}, 4, "maxcol 4");
- is ($ref->[1]{cell}[1][1], "", "blank (1, 1)");
- is ($ref->[1]{A1}, undef, "undef A1");
- $ref = ReadData ("files/blank.csv", clip => 0, strip => 2,
rc => 0);
- ok ($ref, "!clip strip 2");
- is ($ref->[1]{maxrow}, 3, "maxrow 3");
- is ($ref->[1]{maxcol}, 4, "maxcol 4");
- is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
- is ($ref->[1]{A1}, "", "blank A1");
- $ref = ReadData ("files/blank.csv", clip => 0, strip => 3, cells => 0,
rc => 0);
- ok ($ref, "!clip strip 3");
- is ($ref->[1]{maxrow}, 3, "maxrow 3");
- is ($ref->[1]{maxcol}, 4, "maxcol 4");
- is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
- is ($ref->[1]{A1}, undef, "undef A1");
-
- $ref = ReadData ("files/blank.csv", clip => 1, strip => 0);
- ok ($ref, " clip strip 0");
- is ($ref->[1]{maxrow}, 1, "maxrow 3");
- is ($ref->[1]{maxcol}, 1, "maxcol 4");
- is ($ref->[1]{cell}[1][1], " ", "(1, 1) = ' '");
- is ($ref->[1]{A1}, " ", "A1 = ' '");
-
- $ref = ReadData ("files/blank.csv", clip => 1, strip => 1);
- ok ($ref, " clip strip 1");
- is ($ref->[1]{maxrow}, 0, "maxrow 0");
- is ($ref->[1]{maxcol}, 0, "maxcol 0");
- is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
- is ($ref->[1]{A1}, undef, "undef A1");
- $ref = ReadData ("files/blank.csv", clip => 1, strip => 1, cells => 0);
- ok ($ref, " clip strip 1");
- is ($ref->[1]{maxrow}, 0, "maxrow 0");
- is ($ref->[1]{maxcol}, 0, "maxcol 0");
- is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
- is ($ref->[1]{A1}, undef, "undef A1");
- $ref = ReadData ("files/blank.csv", clip => 1, strip => 2,
rc => 0);
- ok ($ref, " clip strip 2");
- is ($ref->[1]{maxrow}, 0, "maxrow 0");
- is ($ref->[1]{maxcol}, 0, "maxcol 0");
- is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
- is ($ref->[1]{A1}, undef, "undef A1");
- $ref = ReadData ("files/blank.csv", clip => 1, strip => 3, cells => 0,
rc => 0);
- ok ($ref, " clip strip 3");
- is ($ref->[1]{maxrow}, 0, "maxrow 0");
- is ($ref->[1]{maxcol}, 0, "maxcol 0");
- is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
- is ($ref->[1]{A1}, undef, "undef A1");
+ # blank.csv has only one sheet with A1 filled with ' '
+ { my $ref = ReadData ("files/blank.csv", clip => 0, $attr => 0);
+ ok ($ref, "!clip $attr 0");
+ is ($ref->[1]{maxrow}, 3, "maxrow 3");
+ is ($ref->[1]{maxcol}, 4, "maxcol 4");
+ is ($ref->[1]{cell}[1][1], " ", "(1, 1) = ' '");
+ is ($ref->[1]{A1}, " ", "A1 = ' '");
+ $ref = ReadData ("files/blank.csv", clip => 0, $attr => 1);
+ ok ($ref, "!clip $attr 1");
+ is ($ref->[1]{maxrow}, 3, "maxrow 3");
+ is ($ref->[1]{maxcol}, 4, "maxcol 4");
+ is ($ref->[1]{cell}[1][1], "", "blank (1, 1)");
+ is ($ref->[1]{A1}, "", "undef A1");
+ $ref = ReadData ("files/blank.csv", clip => 0, $attr => 1, cells =>
0);
+ ok ($ref, "!clip $attr 1");
+ is ($ref->[1]{maxrow}, 3, "maxrow 3");
+ is ($ref->[1]{maxcol}, 4, "maxcol 4");
+ is ($ref->[1]{cell}[1][1], "", "blank (1, 1)");
+ is ($ref->[1]{A1}, undef, "undef A1");
+ $ref = ReadData ("files/blank.csv", clip => 0, $attr => 2,
rc => 0);
+ ok ($ref, "!clip $attr 2");
+ is ($ref->[1]{maxrow}, 3, "maxrow 3");
+ is ($ref->[1]{maxcol}, 4, "maxcol 4");
+ is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
+ is ($ref->[1]{A1}, "", "blank A1");
+ $ref = ReadData ("files/blank.csv", clip => 0, $attr => 3, cells =>
0, rc => 0);
+ ok ($ref, "!clip $attr 3");
+ is ($ref->[1]{maxrow}, 3, "maxrow 3");
+ is ($ref->[1]{maxcol}, 4, "maxcol 4");
+ is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
+ is ($ref->[1]{A1}, undef, "undef A1");
+
+ $ref = ReadData ("files/blank.csv", clip => 1, $attr => 0);
+ ok ($ref, " clip $attr 0");
+ is ($ref->[1]{maxrow}, 1, "maxrow 3");
+ is ($ref->[1]{maxcol}, 1, "maxcol 4");
+ is ($ref->[1]{cell}[1][1], " ", "(1, 1) = ' '");
+ is ($ref->[1]{A1}, " ", "A1 = ' '");
+
+ $ref = ReadData ("files/blank.csv", clip => 1, $attr => 1);
+ ok ($ref, " clip $attr 1");
+ is ($ref->[1]{maxrow}, 0, "maxrow 0");
+ is ($ref->[1]{maxcol}, 0, "maxcol 0");
+ is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
+ is ($ref->[1]{A1}, undef, "undef A1");
+ $ref = ReadData ("files/blank.csv", clip => 1, $attr => 1, cells =>
0);
+ ok ($ref, " clip $attr 1");
+ is ($ref->[1]{maxrow}, 0, "maxrow 0");
+ is ($ref->[1]{maxcol}, 0, "maxcol 0");
+ is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
+ is ($ref->[1]{A1}, undef, "undef A1");
+ $ref = ReadData ("files/blank.csv", clip => 1, $attr => 2,
rc => 0);
+ ok ($ref, " clip $attr 2");
+ is ($ref->[1]{maxrow}, 0, "maxrow 0");
+ is ($ref->[1]{maxcol}, 0, "maxcol 0");
+ is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
+ is ($ref->[1]{A1}, undef, "undef A1");
+ $ref = ReadData ("files/blank.csv", clip => 1, $attr => 3, cells =>
0, rc => 0);
+ ok ($ref, " clip $attr 3");
+ is ($ref->[1]{maxrow}, 0, "maxrow 0");
+ is ($ref->[1]{maxcol}, 0, "maxcol 0");
+ is ($ref->[1]{cell}[1][1], undef, "undef (1, 1)");
+ is ($ref->[1]{A1}, undef, "undef A1");
+ }
}
-ok ($csv = ReadData ("files/test.csv", pivot => 1), "Read/Parse csv file");
-ok (1, "Defined fields");
-foreach my $cell (qw( A1 A2 A3 A4 B1 B2 B4 C3 C4 D1 D3 )) {
- my ($c, $r) = cell2cr ($cell);
- is ($csv->[1]{cell}[$r][$c], $cell, "Unformatted cell $cell");
- my $llec = cr2cell ($r, $c);
- is ($csv->[1]{$llec}, $cell, "Formatted cell $cell");
- }
+foreach my $attr ("pivot", "transpose") {
+ ok ($csv = ReadData ("files/test.csv", $attr => 1), "Read/Parse csv
file");
+ ok (1, "Defined fields");
+ foreach my $cell (qw( A1 A2 A3 A4 B1 B2 B4 C3 C4 D1 D3 )) {
+ my ($c, $r) = cell2cr ($cell);
+ is ($csv->[1]{cell}[$r][$c], $cell, "Unformatted cell $cell");
+ my $llec = cr2cell ($r, $c);
+ is ($csv->[1]{$llec}, $cell, "Formatted cell $cell");
+ }
-ok (1, "Undefined fields");
-foreach my $cell (qw( B3 C1 C2 D2 D4 )) {
- my ($c, $r) = cell2cr ($cell);
- is ($csv->[1]{cell}[$r][$c], "", "Unformatted cell $cell");
- my $llec = cr2cell ($r, $c);
- is ($csv->[1]{$llec}, "", "Formatted cell $cell");
+ ok (1, "Undefined fields");
+ foreach my $cell (qw( B3 C1 C2 D2 D4 )) {
+ my ($c, $r) = cell2cr ($cell);
+ is ($csv->[1]{cell}[$r][$c], "", "Unformatted cell $cell");
+ my $llec = cr2cell ($r, $c);
+ is ($csv->[1]{$llec}, "", "Formatted cell $cell");
+ }
}
unless ($ENV{AUTOMATED_TESTING}) {
++++++ nonstdperlpath.patch ++++++
--- /var/tmp/diff_new_pack.s5Vjm3/_old 2021-04-12 17:10:27.410571112 +0200
+++ /var/tmp/diff_new_pack.s5Vjm3/_new 2021-04-12 17:10:27.414571116 +0200
@@ -6,7 +6,7 @@
+#!/usr/bin/perl
# ss2tk: show SpreadSheet file in Tk::TableMatrix::Spreadsheet (*)
- # (m)'17 [2017-07-03] Copyright H.M.Brand 2005-2020
+ # (m)'17 [2017-07-03] Copyright H.M.Brand 2005-2021
diff -ur Spreadsheet-Read-0.79/scripts/ssdiff
Spreadsheet-Read-0.79_fix/scripts/ssdiff
--- Spreadsheet-Read-0.79/scripts/ssdiff 2016-11-27 12:28:35.000000000
+0100
+++ Spreadsheet-Read-0.79_fix/scripts/ssdiff 2018-09-20 10:08:55.480707378
+0200
@@ -24,7 +24,7 @@
+#!/usr/bin/perl
# ss-dup-tk.pl: Find dups in spreadsheet
- # (m)'18 [28-03-2018] Copyright H.M.Brand 2005-2020
+ # (m)'18 [28-03-2018] Copyright H.M.Brand 2005-2021
diff -ur Spreadsheet-Read-0.79/scripts/xlsx2csv
Spreadsheet-Read-0.79_fix/scripts/xlsx2csv
--- Spreadsheet-Read-0.79/scripts/xlsx2csv 2018-08-29 10:28:43.000000000
+0200
+++ Spreadsheet-Read-0.79_fix/scripts/xlsx2csv 2018-09-20 10:08:55.480707378
+0200
@@ -33,7 +33,7 @@
+#!/usr/bin/perl
# xls2csv: Convert supported spreadsheet formats to CSV
- # (m)'20 [2020-10-27] Copyright H.M.Brand 2008-2020
+ # (m)'20 [2020-10-27] Copyright H.M.Brand 2008-2021
diff -ur Spreadsheet-Read-0.79/scripts/xlscat
Spreadsheet-Read-0.79_fix/scripts/xlscat
--- Spreadsheet-Read-0.79/scripts/xlscat 2018-06-27 11:33:30.000000000
+0200
+++ Spreadsheet-Read-0.79_fix/scripts/xlscat 2018-09-20 10:08:55.480707378
+0200
