Update upstream source from tag 'upstream/0.94'

Update to upstream version '0.94'
with Debian dir 30d471dd2ec355037a4d212eaef882ce4e4ec747

8 files changed, 66 insertions, 55 deletions

diff --git a/ChangeLog b/ChangeLog
index 60bc3e5..0215861 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
 
 ========== version history of String::Print
 
-version 0.93:
+All modifications where created by Mark Overmeer, unless explicitly
+stated differently.
+
+version 0.94: Sun  1 Mar 12:37:41 CET 2020
+
+	Fixes:
+	- fix metadata [Mohammad S Anwar]
+	- test failed when year with blanks [cpantesters]
+
+version 0.93: Tue Jan 23 22:08:31 CET 2018
 
 	Improvements:
 	- convert to GIT
diff --git a/META.json b/META.json
index 185db7c..d8898c5 100644
--- a/META.json
+++ b/META.json
@@ -1,13 +1,12 @@
 {
    "abstract" : "printf extensions",
    "author" : [
-      "Mark Overmeer"
+      "Mark Overmeer <markov@cpan.org>"
    ],
    "dynamic_config" : 1,
    "generated_by" : "ExtUtils::MakeMaker version 7.3, CPAN::Meta::Converter version 2.150010",
    "license" : [
-      "perl_5",
-      "unknown"
+      "perl_5"
    ],
    "meta-spec" : {
       "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
@@ -43,13 +42,16 @@
    },
    "release_status" : "stable",
    "resources" : {
+      "homepage" : "http://perl.overmeer.net/CPAN/",
+      "license" : [
+         "http://dev.perl.org/licenses/"
+      ],
       "repository" : {
          "type" : "git",
          "url" : "https://github.com/markov2/perl5-String-Print.git",
          "web" : "https://github.com/markov2/perl5-String-Print"
       }
    },
-   "version" : "0.93",
-   "x_homepage" : "http://perl.overmeer.net/CPAN/",
+   "version" : "0.94",
    "x_serialization_backend" : "JSON::PP version 2.94"
 }
diff --git a/META.yml b/META.yml
index a046c06..303d539 100644
--- a/META.yml
+++ b/META.yml
@@ -1,14 +1,14 @@
 ---
 abstract: 'printf extensions'
 author:
-  - 'Mark Overmeer'
+  - 'Mark Overmeer <markov@cpan.org>'
 build_requires:
   ExtUtils::MakeMaker: '0'
 configure_requires:
   ExtUtils::MakeMaker: '0'
 dynamic_config: 1
 generated_by: 'ExtUtils::MakeMaker version 7.3, CPAN::Meta::Converter version 2.150010'
-license: unknown
+license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
   version: '1.4'
@@ -24,7 +24,8 @@ requires:
   Test::More: '0.86'
   Unicode::GCString: '0'
 resources:
+  homepage: http://perl.overmeer.net/CPAN/
+  license: http://dev.perl.org/licenses/
   repository: https://github.com/markov2/perl5-String-Print.git
-version: '0.93'
-x_homepage: http://perl.overmeer.net/CPAN/
+version: '0.94'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.011'
diff --git a/Makefile.PL b/Makefile.PL
index 5eb241c..edf32fc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;
 
 use 5.010;
 
-my $version = '0.93';
+my $version = '0.94';
 
 my %prereq  =
   ( Test::More        => 0.86
@@ -17,9 +17,9 @@ WriteMakefile
   , VERSION   => $version
   , PREREQ_PM => \%prereq
 
-  , AUTHOR    => 'Mark Overmeer'
+  , AUTHOR    => 'Mark Overmeer <markov@cpan.org>'
   , ABSTRACT  => 'printf extensions'
-  , LICENSE   => 'perl'
+  , LICENSE   => 'perl_5'
 
   , META_MERGE =>
       { 'meta-spec' => { version => 2 }
@@ -29,9 +29,9 @@ WriteMakefile
              , url  => 'https://github.com/markov2/perl5-String-Print.git'
              , web  => 'https://github.com/markov2/perl5-String-Print'
              }
+         , homepage => 'http://perl.overmeer.net/CPAN/'
+         , license  => [ 'http://dev.perl.org/licenses/' ]
          }
-      , homepage => 'http://perl.overmeer.net/CPAN/'
-      , license  => [ 'http://dev.perl.org/licenses/' ]
       }
   );
 
diff --git a/README b/README
index c587a23..b548900 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-=== README for String-Print version 0.93
-=   Generated on Tue Jan 23 22:05:16 2018 by OODoc 2.02
+=== README for String-Print version 0.94
+=   Generated on Sun Mar  1 12:37:31 2020 by OODoc 2.02
 
 There are various ways to install this module:
 
@@ -9,16 +9,16 @@ There are various ways to install this module:
  (2) if you use Windows, have a look at http://ppm.activestate.com/
 
  (3) if you have downloaded this module manually (as root/administrator)
-       gzip -d String-Print-0.93.tar.gz
-       tar -xf String-Print-0.93.tar
-       cd String-Print-0.93
+       gzip -d String-Print-0.94.tar.gz
+       tar -xf String-Print-0.94.tar
+       cd String-Print-0.94
        perl Makefile.PL
        make          # optional
        make test     # optional
        make install
 
 For usage, see the included manual-pages or
-    http://search.cpan.org/dist/String-Print-0.93/
+    http://search.cpan.org/dist/String-Print-0.94/
 
 Please report problems to
     http://rt.cpan.org/Dist/Display.html?Queue=String-Print
diff --git a/README.md b/README.md
index 550de83..7bdfd96 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,7 @@
   * My extended documentation: <http://perl.overmeer.net/CPAN/>
   * Development via GitHub: <https://github.com/markov2/perl5-String-Print>
   * Download from CPAN: <ftp://ftp.cpan.org/pub/CPAN/authors/id/M/MA/MARKOV/>
-  * Indexed from CPAN: <http://search.cpan.org/~markov/String-Print/>
-    and <https://metacpan.org/release/String-Print>
+  * Indexed from CPAN: <https://metacpan.org/release/String-Print>
 
 This module inserts values into (format) strings.  It provides printf()
 and sprintf() alternatives via both an object oriented and a functional
diff --git a/lib/String/Print.pm b/lib/String/Print.pm
index 1a5d783..cb90714 100644
--- a/lib/String/Print.pm
+++ b/lib/String/Print.pm
@@ -1,4 +1,4 @@
-# Copyrights 2016-2018 by [Mark Overmeer].
+# Copyrights 2016-2020 by [Mark Overmeer <markov@cpan.org>].
 #  For other contributors see ChangeLog.
 # See the manual pages for details on the licensing terms.
 # Pod stripped from pm file by OODoc 2.02.
@@ -8,7 +8,7 @@
 
 package String::Print;
 use vars '$VERSION';
-$VERSION = '0.93';
+$VERSION = '0.94';
 
 
 use warnings;
@@ -72,7 +72,7 @@ sub init($)
       = { %default_serializers, (ref $s eq 'ARRAY' ? @$s : %$s) };
 
     $self->encodeFor($args->{encode_for});
-	$self->{SP_missing} = $args->{missing_key} || \&_reportMissingKey;
+    $self->{SP_missing} = $args->{missing_key} || \&_reportMissingKey;
     $self;
 }
 
@@ -158,7 +158,7 @@ sub sprinti($@)
             my ($name, $tricks) = (shift @frags)
                 =~ m!^\s*([\pL\p{Pc}\pM][\w.]*)\s*(.*?)\s*$!o or die $format;
 
-	    push @parts, $name =~ $exclude
+        push @parts, $name =~ $exclude
               ? $self->_expand($name, $tricks, $args)
               : $encode->($self->_expand($name, $tricks, $args));
 
@@ -170,9 +170,9 @@ sub sprinti($@)
     {   push @parts, $args->{_prepend} if defined $args->{_prepend};
         push @parts, shift @frags;
         while(@frags) {
-	    (shift @frags) =~ /^\s*([\pL\p{Pc}\pM][\w.]*)\s*(.*?)\s*$/o
+        (shift @frags) =~ /^\s*([\pL\p{Pc}\pM][\w.]*)\s*(.*?)\s*$/o
                 or die $format;
-	    push @parts, $self->_expand($1, $2, $args);
+        push @parts, $self->_expand($1, $2, $args);
             push @parts, shift @frags if @frags;
         }
         push @parts, $args->{_append} if defined $args->{_append};
@@ -194,7 +194,7 @@ sub _expand($$$)
     }
     else
     {   my @parts = split /\./, $key;
-		my $key   = shift @parts;
+        my $key   = shift @parts;
         $value = exists $args->{$key} ? $args->{$key}
           : $self->_missingKey($key, $args);
 
@@ -244,21 +244,21 @@ sub _expand($$$)
 
 sub _missingKey($$)
 {   my ($self, $key, $args) = @_;
-	$self->{SP_missing}->($self, $key, $args);
+    $self->{SP_missing}->($self, $key, $args);
 }
 
 sub _reportMissingKey($$)
 {   my ($self, $key, $args) = @_;
 
     my $depth = 0;
-	my ($filename, $linenr);
+    my ($filename, $linenr);
     while((my $pkg, $filename, $linenr) = caller $depth++)
     {   last unless
             $pkg->isa(__PACKAGE__)
          || $pkg->isa('Log::Report::Minimal::Domain');
     }
 
-	warn $self->sprinti
+    warn $self->sprinti
       ( "Missing key '{key}' in format '{format}', file {fn} line {line}\n"
       , key => $key, format => $args->{_format}
       , fn => $filename, line => $linenr
@@ -324,12 +324,12 @@ sub _modif_bytes($$$)
 {   my ($self, $format, $value, $args) = @_;
     defined $value && length $value or return undef;
 
-	return sprintf("%3d  B", $value) if $value < 1000;
+    return sprintf("%3d  B", $value) if $value < 1000;
 
     my @scale = qw/kB MB GB TB PB EB ZB/;
-	$value /= 1024;
+    $value /= 1024;
 
-	while(@scale > 1 && $value > 999)
+    while(@scale > 1 && $value > 999)
     {   shift @scale;
         $value /= 1024;
     }
@@ -337,7 +337,7 @@ sub _modif_bytes($$$)
     return sprintf "%3d $scale[0]", $value + 0.5
         if $value > 9.949;
 
-	sprintf "%3.1f $scale[0]", $value;
+    sprintf "%3.1f $scale[0]", $value;
 }
 
 # Be warned: %F and %T (from C99) are not supported on Windows
@@ -353,11 +353,11 @@ sub _modif_year($$$)
 {   my ($self, $format, $value, $args) = @_;
     defined $value && length $value or return undef;
 
-	return $value
-        if $value !~ /\D/ && $value < 2200;
+    return $1
+        if $value =~ /^\s*([0-9]+)\s*$/ && $1 < 2200;
 
-	my $stamp = $value =~ /\D/ ? str2time($value) : $value;
-	defined $stamp or return "year not found in '$value'";
+    my $stamp = $value =~ /^\s*([0-9]+)\s*$/ ? $1 : str2time($value);
+    defined $stamp or return "year not found in '$value'";
 
     strftime "%Y", localtime($stamp);
 }
@@ -366,12 +366,12 @@ sub _modif_date($$$)
 {   my ($self, $format, $value, $args) = @_;
     defined $value && length $value or return undef;
 
-	return sprintf("%4d-%02d-%02d", $1, $2, $3)
+    return sprintf("%4d-%02d-%02d", $1, $2, $3)
         if $value =~ m!^\s*([0-9]{4})[:/.-]([0-9]?[0-9])[:/.-]([0-9]?[0-9])\s*$!
         || $value =~ m!^\s*([0-9]{4})([0-9][0-9])([0-9][0-9])\s*$!;
 
-	my $stamp = $value =~ /\D/ ? str2time($value) : $value;
-	defined $stamp or return "date not found in '$value'";
+    my $stamp = $value =~ /\D/ ? str2time($value) : $value;
+    defined $stamp or return "date not found in '$value'";
 
     strftime "%Y-%m-%d", localtime($stamp);
 }
@@ -380,26 +380,26 @@ sub _modif_time($$$)
 {   my ($self, $format, $value, $args) = @_;
     defined $value && length $value or return undef;
 
-	return sprintf "%02d:%02d:%02d", $1, $2, $3||0
+    return sprintf "%02d:%02d:%02d", $1, $2, $3||0
         if $value =~ m!^\s*(0?[0-9]|1[0-9]|2[0-3])\:([0-5]?[0-9])(?:\:([0-5]?[0-9]))?\s*$!
         || $value =~ m!^\s*(0[0-9]|1[0-9]|2[0-3])([0-5][0-9])(?:([0-5][0-9]))?\s*$!;
 
-	my $stamp = $value =~ /\D/ ? str2time($value) : $value;
-	defined $stamp or return "time not found in '$value'";
+    my $stamp = $value =~ /\D/ ? str2time($value) : $value;
+    defined $stamp or return "time not found in '$value'";
 
     strftime "%H:%M:%S", localtime($stamp);
 }
 
 sub _modif_dt($$$)
 {   my ($self, $format, $value, $args) = @_;
-	defined $value && length $value or return undef;
+    defined $value && length $value or return undef;
 
-	my $kind    = ($format =~ m/DT\(([^)]*)\)/ ? $1 : undef) || 'FT';
-	my $pattern = $dt_format{$kind}
+    my $kind    = ($format =~ m/DT\(([^)]*)\)/ ? $1 : undef) || 'FT';
+    my $pattern = $dt_format{$kind}
         or return "dt format $kind not known";
 
-	my $stamp = $value =~ /\D/ ? str2time($value) : $value;
-	defined $stamp or return "dt not found in '$value'";
+    my $stamp = $value =~ /\D/ ? str2time($value) : $value;
+    defined $stamp or return "dt not found in '$value'";
 
     strftime $pattern, localtime($stamp);
 }
diff --git a/lib/String/Print.pod b/lib/String/Print.pod
index 27c5023..f5309a2 100644
--- a/lib/String/Print.pod
+++ b/lib/String/Print.pod
@@ -809,12 +809,12 @@ C<String::Print> is nicely integrated with Log::Report.
 
 =head1 SEE ALSO
 
-This module is part of String-Print distribution version 0.93,
-built on January 23, 2018. Website: F<http://perl.overmeer.net/CPAN/>
+This module is part of String-Print distribution version 0.94,
+built on March 01, 2020. Website: F<http://perl.overmeer.net/CPAN/>
 
 =head1 LICENSE
 
-Copyrights 2016-2018 by [Mark Overmeer]. For other contributors see ChangeLog.
+Copyrights 2016-2020 by [Mark Overmeer <markov@cpan.org>]. For other contributors see ChangeLog.
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.