From a93a9dd26d8c104ac481dd8d9c762dfa5a5545dc Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 13 Aug 2014 11:41:29 +0100 Subject: [PATCH 1/3] add test dependencies to Makefile.PL --- Netdisco/META.yml | 3 +++ Netdisco/Makefile.PL | 3 +++ Netdisco/t/11-portsort.t | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Netdisco/META.yml b/Netdisco/META.yml index eea17dbc..3baac1e8 100644 --- a/Netdisco/META.yml +++ b/Netdisco/META.yml @@ -3,7 +3,9 @@ abstract: 'An open source web-based network management tool.' author: - 'Oliver Gorwits ' build_requires: + Env::Path: 0 ExtUtils::MakeMaker: 6.59 + Test::More: 0.88 configure_requires: ExtUtils::MakeMaker: 6.59 distribution_type: module @@ -67,6 +69,7 @@ requires: Sereal: 0 Socket6: 0.23 Starman: 0.4008 + Sys::Proctitle: 0 Template: 2.24 Template::Plugin::CSV: 0.04 Template::Plugin::Number::Format: 1.02 diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL index 92226919..8e818eb4 100644 --- a/Netdisco/Makefile.PL +++ b/Netdisco/Makefile.PL @@ -3,6 +3,9 @@ use inc::Module::Install; name 'App-Netdisco'; license 'bsd'; all_from 'lib/App/Netdisco.pm'; + +test_requires 'Test::More' => 0.88; +test_requires 'Env::Path' => 0; requires 'Algorithm::Cron' => 0.07; requires 'AnyEvent' => 7.05; diff --git a/Netdisco/t/11-portsort.t b/Netdisco/t/11-portsort.t index 3563f3b6..6d34e6ec 100755 --- a/Netdisco/t/11-portsort.t +++ b/Netdisco/t/11-portsort.t @@ -9,7 +9,7 @@ use FindBin qw( $Bin ); my @phantomjs = Env::Path->PATH->Whence('phantomjs'); my $phantomjs = scalar @phantomjs ? $phantomjs[0] : $ENV{ND_PHANTOMJS}; -if ( !-x $phantomjs ) { +if ( ! defined $phantomjs or !-x $phantomjs ) { plan skip_all => "phantomjs not found, please set ND_PHANTOMJS or install phantomjs to the default location"; } From 0028598461b0e150f549baa00109d58b8d6d4e1c Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 13 Aug 2014 11:42:50 +0100 Subject: [PATCH 2/3] Filter undefined entries from user log --- Netdisco/Changes | 4 ++++ Netdisco/lib/App/Netdisco/Web/PortControl.pm | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Netdisco/Changes b/Netdisco/Changes index b9d62f14..69594dc8 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -4,6 +4,10 @@ * Custom portsort plug-in for DataTables + [BUG FIXES] + + * Filter undefined entries from user log + 2.029004 - 2014-08-11 [BUG FIXES] diff --git a/Netdisco/lib/App/Netdisco/Web/PortControl.pm b/Netdisco/lib/App/Netdisco/Web/PortControl.pm index d4a182e8..4a410430 100644 --- a/Netdisco/lib/App/Netdisco/Web/PortControl.pm +++ b/Netdisco/lib/App/Netdisco/Web/PortControl.pm @@ -69,12 +69,14 @@ ajax '/ajax/userlog' => require_login sub { map {s/\[\]/<empty>/; $_} map { $_->log } grep { $_->status eq 'done' } + grep { defined } @jobs ], 'error' => [ map {s/\[\]/<empty>/; $_} map { $_->log } grep { $_->status eq 'error' } + grep { defined } @jobs ], ); From c5caab66012d9f3d9ef08da6c0d9259ba6a9f40b Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Wed, 13 Aug 2014 11:44:02 +0100 Subject: [PATCH 3/3] release 2.029005 --- Netdisco/Changes | 2 +- Netdisco/MANIFEST | 5 +++++ Netdisco/META.yml | 2 +- Netdisco/lib/App/Netdisco.pm | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Netdisco/Changes b/Netdisco/Changes index 69594dc8..781e3fff 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,4 +1,4 @@ -2.029005 +2.029005 - 2014-08-13 [ENHANCEMENTS] diff --git a/Netdisco/MANIFEST b/Netdisco/MANIFEST index 581877a7..8ef8ad38 100644 --- a/Netdisco/MANIFEST +++ b/Netdisco/MANIFEST @@ -292,6 +292,7 @@ share/public/javascripts/moment.min.js share/public/javascripts/natural.js share/public/javascripts/netdisco.js share/public/javascripts/netdisco_portcontrol.js +share/public/javascripts/portsort.js share/public/javascripts/toastr.js share/public/javascripts/underscore.min.js share/views/admintask.tt @@ -395,3 +396,7 @@ share/views/sidebar/search/device.tt share/views/sidebar/search/node.tt share/views/sidebar/search/port.tt t/10-sort_port.t +t/11-portsort.t +t/html/portsort.html +t/js/qunit-tap.js +t/js/run_qunit.js diff --git a/Netdisco/META.yml b/Netdisco/META.yml index 3baac1e8..2d7e34e7 100644 --- a/Netdisco/META.yml +++ b/Netdisco/META.yml @@ -89,4 +89,4 @@ resources: homepage: http://netdisco.org/ license: http://opensource.org/licenses/bsd-license.php repository: git://git.code.sf.net/p/netdisco/netdisco-ng -version: 2.029004 +version: 2.029005 diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm index 2d72b82e..c0acaf1c 100644 --- a/Netdisco/lib/App/Netdisco.pm +++ b/Netdisco/lib/App/Netdisco.pm @@ -4,7 +4,7 @@ use strict; use warnings; use 5.010_000; -our $VERSION = '2.029004'; +our $VERSION = '2.029005'; use App::Netdisco::Configuration; use Module::Find ();