Merge branch 'master' into em-device-ports-json

Netdisco/Changes

@@ -1,9 +1,13 @@
-2.029005
+2.029005 - 2014-08-13
 
   [ENHANCEMENTS]
 
   * Custom portsort plug-in for DataTables
 
+  [BUG FIXES]
+
+  * Filter undefined entries from user log
+
 2.029004 - 2014-08-11
 
   [BUG FIXES]

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

Netdisco/META.yml

@@ -3,7 +3,9 @@ abstract: 'An open source web-based network management tool.'
 author:
   - 'Oliver Gorwits <oliver@cpan.org>'
 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
@@ -86,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

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;

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 ();

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
       ],
     );

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";
 }