r74343 - in /trunk/libterm-sk-perl: Changes META.yml README debian/changelog lib/Term/Sk.pm t/0010_test.t
carnil at users.alioth.debian.org
carnil at users.alioth.debian.org
Fri May 13 18:38:09 UTC 2011
Author: carnil
Date: Fri May 13 18:37:59 2011
New Revision: 74343
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74343
Log:
* Team upload.
* New upstream release
Modified:
trunk/libterm-sk-perl/Changes
trunk/libterm-sk-perl/META.yml
trunk/libterm-sk-perl/README
trunk/libterm-sk-perl/debian/changelog
trunk/libterm-sk-perl/lib/Term/Sk.pm
trunk/libterm-sk-perl/t/0010_test.t
Modified: trunk/libterm-sk-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-sk-perl/Changes?rev=74343&op=diff
==============================================================================
--- trunk/libterm-sk-perl/Changes (original)
+++ trunk/libterm-sk-perl/Changes Fri May 13 18:37:59 2011
@@ -33,3 +33,9 @@
2_870 of 9_274
Also, write something reasonable in file README
+
+0.07 09 May 2011
+ Introduce a new format character "%k" (="Token"). Idea and patch provided by Bruce Ravel.
+ Token which updates its value before being displayed. An example use
+ of this would be a loop wherein every step of the loop could be
+ identified by a particular string.
Modified: trunk/libterm-sk-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-sk-perl/META.yml?rev=74343&op=diff
==============================================================================
--- trunk/libterm-sk-perl/META.yml (original)
+++ trunk/libterm-sk-perl/META.yml Fri May 13 18:37:59 2011
@@ -3,7 +3,7 @@
author: []
configure_requires:
Module::Build: 0.36
-generated_by: 'Module::Build version 0.3607'
+generated_by: 'Module::Build version 0.3609'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -12,7 +12,7 @@
provides:
Term::Sk:
file: lib/Term/Sk.pm
- version: 0.06
+ version: 0.07
resources:
license: http://dev.perl.org/licenses/
-version: 0.06
+version: 0.07
Modified: trunk/libterm-sk-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-sk-perl/README?rev=74343&op=diff
==============================================================================
--- trunk/libterm-sk-perl/README (original)
+++ trunk/libterm-sk-perl/README Fri May 13 18:37:59 2011
@@ -1,4 +1,4 @@
-Term-Sk Version 0.06
+Term-Sk Version 0.07
This is a Perl extension for displaying a progress indicator on a terminal.
Modified: trunk/libterm-sk-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-sk-perl/debian/changelog?rev=74343&op=diff
==============================================================================
--- trunk/libterm-sk-perl/debian/changelog (original)
+++ trunk/libterm-sk-perl/debian/changelog Fri May 13 18:37:59 2011
@@ -1,8 +1,9 @@
-libterm-sk-perl (0.06-2) UNRELEASED; urgency=low
+libterm-sk-perl (0.07-1) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * Team upload.
+ * New upstream release
- -- Carlo Segre <segre at debian.org> Sat, 07 Aug 2010 23:40:41 -0500
+ -- Salvatore Bonaccorso <carnil at debian.org> Fri, 13 May 2011 20:31:02 +0200
libterm-sk-perl (0.06-1) unstable; urgency=low
Modified: trunk/libterm-sk-perl/lib/Term/Sk.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-sk-perl/lib/Term/Sk.pm?rev=74343&op=diff
==============================================================================
--- trunk/libterm-sk-perl/lib/Term/Sk.pm (original)
+++ trunk/libterm-sk-perl/lib/Term/Sk.pm Fri May 13 18:37:59 2011
@@ -16,7 +16,7 @@
our @EXPORT = qw();
-our $VERSION = '0.06';
+our $VERSION = '0.07';
our $errcode = 0;
our $errmsg = '';
@@ -45,6 +45,7 @@
$self->{line} = '';
$self->{pdisp} = '#';
$self->{commify} = $hash{commify};
+ $self->{token} = defined($hash{token}) ? $hash{token} : q{};
unless (defined $self->{quiet}) {
$self->{quiet} = !-t STDOUT;
@@ -89,9 +90,10 @@
or $disp_code eq 'm'
or $disp_code eq 'p'
or $disp_code eq 'P'
- or $disp_code eq 't') {
+ or $disp_code eq 't'
+ or $disp_code eq 'k') {
$errcode = 110;
- $errmsg = qq{Found invalid display-code ('$disp_code'), expected ('b', 'c', 'd', 'm', 'p', 'P' or 't') in '%$portion', total line is '$format'};
+ $errmsg = qq{Found invalid display-code ('$disp_code'), expected ('b', 'c', 'd', 'm', 'p', 'P' 't' or 'k') in '%$portion', total line is '$format'};
die sprintf('Error-%04d: %s', $errcode, $errmsg);
}
@@ -147,6 +149,8 @@
sub close { my $self = shift; $self->{value} = undef; $self->show; }
sub ticks { my $self = shift; return $self->{tick} }
+
+sub token { my $self = shift; $self->{token} = shift; $self->up }
sub DESTROY {
my $self = shift;
@@ -239,7 +243,11 @@
$text .= sprintf "%${len}s", commify($self->{commify}, $self->{target}, $self->{sep}, $self->{group});
next;
}
- # default: do nothing, in the (impossible) event that $type is none of '*lit', 't', 'b', 'p', 'P', 'c' or 'm'
+ if ($type eq 'k') { # print (= append to $text) token
+ $text .= sprintf "%-${len}s", $self->{token};
+ next;
+ }
+ # default: do nothing, in the (impossible) event that $type is none of '*lit', 't', 'b', 'p', 'P', 'c', 'm' or 'k'
}
# End of string composition
@@ -528,6 +536,24 @@
Target maximum value (commified by '_'), format '99_999_999'
+=item characters '%k'
+
+Token which updates its value before being displayed. An example use
+of this would be a loop wherein every step of the loop could be
+identified by a particular string. For example:
+
+ my $ctr = Term::Sk->new('Processing %k', {base => 0, token => 'Albania'})
+ or die "Error 0010: Term::Sk->new, (code $Term::Sk::errcode) $Term::Sk::errmsg";
+ foreach my $country (@list_of_european_nations) {
+ $ctr->token($country);
+ ## do something for each country
+ };
+ $ctr->close;
+
+The C<token> method is used to update the token value and is also a
+wrapper around the C<up> method. The counter can be instantiated
+with an intial value for the token.
+
=item characters '%P'
The '%' character itself
Modified: trunk/libterm-sk-perl/t/0010_test.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-sk-perl/t/0010_test.t?rev=74343&op=diff
==============================================================================
--- trunk/libterm-sk-perl/t/0010_test.t (original)
+++ trunk/libterm-sk-perl/t/0010_test.t Fri May 13 18:37:59 2011
@@ -1,7 +1,7 @@
use strict;
use warnings;
-use Test::More tests => 63;
+use Test::More tests => 66;
use_ok('Term::Sk');
@@ -214,6 +214,13 @@
'Test-0600: show commified numbers');
}
+{
+ my $ctr = Term::Sk->new('Token %6k Ctr %c', { test => 1, base => 1, token => 'Spain' } );
+ ok(defined($ctr), 'Test-0610: %6k %c works ok');
+ is(content($ctr->get_line), q{Token Spain Ctr 1}, 'Test-0620: first Token displayed correctly');
+ $ctr->token('USA');
+ is(content($ctr->get_line), q{Token USA Ctr 2}, 'Test-0630: second Token displayed correctly');
+}
sub content {
my ($text) = @_;
More information about the Pkg-perl-cvs-commits
mailing list