r65528 - in /branches/upstream/libnagios-plugin-perl/current: Changes META.yml lib/Nagios/Plugin.pm lib/Nagios/Plugin/Functions.pm lib/Nagios/Plugin/Getopt.pm t/Nagios-Plugin-Performance.t

[carnil at users.alioth.debian.org]

Author: carnil
Date: Sat Dec  4 13:48:32 2010
New Revision: 65528

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=65528
Log:
[svn-upgrade] new version libnagios-plugin-perl (0.35)

Modified:
    branches/upstream/libnagios-plugin-perl/current/Changes
    branches/upstream/libnagios-plugin-perl/current/META.yml
    branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin.pm
    branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Functions.pm
    branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Getopt.pm
    branches/upstream/libnagios-plugin-perl/current/t/Nagios-Plugin-Performance.t

Modified: branches/upstream/libnagios-plugin-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-plugin-perl/current/Changes?rev=65528&op=diff
==============================================================================
--- branches/upstream/libnagios-plugin-perl/current/Changes (original)
+++ branches/upstream/libnagios-plugin-perl/current/Changes Sat Dec  4 13:48:32 2010
@@ -1,4 +1,7 @@
 Revision history for Perl module Nagios::Plugin.
+
+0.35 3rd December 2010
+  - Fixed test failures with Test::More 0.96 (Slaven Rezic and Peter John Edwards - RT57709)
 
 0.34 15th April 2010
   - Amended standard --extra-opts help

Modified: branches/upstream/libnagios-plugin-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-plugin-perl/current/META.yml?rev=65528&op=diff
==============================================================================
--- branches/upstream/libnagios-plugin-perl/current/META.yml (original)
+++ branches/upstream/libnagios-plugin-perl/current/META.yml Sat Dec  4 13:48:32 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Nagios-Plugin
-version:            0.34
+version:            0.35
 abstract:           A family of perl modules to streamline writing Nagios 
 author:
     - Nagios Plugin Development Team <nagiosplug-devel at lists.sourceforge.net>

Modified: branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin.pm?rev=65528&op=diff
==============================================================================
--- branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin.pm (original)
+++ branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin.pm Sat Dec  4 13:48:32 2010
@@ -26,7 +26,7 @@
 # CPAN stupidly won't index this module without a literal $VERSION here,
 #   so we're forced to duplicate it explicitly
 # Make sure you update $Nagios::Plugin::Functions::VERSION too
-our $VERSION = "0.34";
+our $VERSION = "0.35";
 
 sub new {
 	my $class = shift;

Modified: branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Functions.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Functions.pm?rev=65528&op=diff
==============================================================================
--- branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Functions.pm (original)
+++ branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Functions.pm Sat Dec  4 13:48:32 2010
@@ -12,7 +12,7 @@
 use Math::Calc::Units;
 
 # Remember to update Nagios::Plugins as well
-our $VERSION = "0.34";
+our $VERSION = "0.35";
 
 our @STATUS_CODES = qw(OK WARNING CRITICAL UNKNOWN DEPENDENT);
 
@@ -392,6 +392,8 @@
 join the resultant critical, warning, and ok messages together i.e.
 all messages are joined and returned.
 
+=back
+
 =item get_shortname
 
 Return the default shortname used for this plugin i.e. the first

Modified: branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Getopt.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Getopt.pm?rev=65528&op=diff
==============================================================================
--- branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Getopt.pm (original)
+++ branches/upstream/libnagios-plugin-perl/current/lib/Nagios/Plugin/Getopt.pm Sat Dec  4 13:48:32 2010
@@ -38,7 +38,7 @@
     help => "-V, --version\n   Print version information",
   }, {
     spec => 'extra-opts:s@',
-    help => "--extra-opts=[section][\@file]\n   Read options from an ini file. See http://nagiosplugins.org/extra-opts for usage",
+    help => "--extra-opts=[section][\@file]\n   Read options from an ini file. See http://nagiosplugins.org/extra-opts\n   for usage and examples.",
   }, {
     spec => 'timeout|t=i',
     help => "-t, --timeout=INTEGER\n   Seconds before plugin times out (default: %s)",

Modified: branches/upstream/libnagios-plugin-perl/current/t/Nagios-Plugin-Performance.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnagios-plugin-perl/current/t/Nagios-Plugin-Performance.t?rev=65528&op=diff
==============================================================================
--- branches/upstream/libnagios-plugin-perl/current/t/Nagios-Plugin-Performance.t (original)
+++ branches/upstream/libnagios-plugin-perl/current/t/Nagios-Plugin-Performance.t Sat Dec  4 13:48:32 2010
@@ -202,8 +202,9 @@
     ok( defined $p[0]->threshold->critical->is_set, "Critical range has been set");
 # The two below used to be cmp_ok, but Test::More 0.86 appears to have a problem with a stringification
 # of 0. See http://rt.cpan.org/Ticket/Display.html?id=41109
-is( $p[0]->threshold->warning, "0", "warn okay");
-is( $p[0]->threshold->critical, "0", "crit okay");
+# We need to force stringification for test. See RT 57709
+is( $p[0]->threshold->warning."", "0", "warn okay");
+is( $p[0]->threshold->critical."", "0", "crit okay");
 
 @p = Nagios::Plugin::Performance->parse_perfstring("pct_used=73.7%;90;95");
 cmp_ok( $p[0]->label, "eq", "pct_used", "label okay");