Merge ~sylvain-pineau/plainbox-provider-resource:resource_improv into plainbox-provider-resource:master

[Sylvain Pineau]

Speed and mem improvements for two major resources jobs, executable and package.

package only lists the deb package names
executable only lists the executable names, output is piped to `sort -u`

The package fallback execution on core just listing plainbox 0.1 is also removed since checkbox can properly handle empty resource objects.
Tested here: https://certification.canonical.com/hardware/201202-10584/submission/179550/

Finally staging/udev is gone

[Jonathan Cave (jocave)]

If they aren't used then I'm fine with them being removed, +1

review: Approve

diff --git a/bin/udev2resource.py b/bin/udev2resource.py
 deleted file mode 100755
index d4999ae..0000000
--- a/bin/udev2resource.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-# This file is part of Checkbox.
-#
-# Copyright 2014 Canonical Ltd.
-# Written by:
-#   Zygmunt Krynicki <[e-mail]>
-#
-# Checkbox is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 3,
-# as published by the Free Software Foundation.
-#
-# Checkbox is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
-"""
-udev2resource.py -- udev to plainbox resource converter
-=======================================================
-
-This script converts the output of 'udev info --export-db' into a RFC822-esque
-PlainBox resource syntax. It handles the P:, N:, E:, S: and L: "directives"
-"""
-
-import sys
-import re
-
-
-def udev2resource(in_stream, out_stream):
-    """
-    Convert the output of 'udev info --export-db' to RFC822 records.
-
-    :param in_stream:
-        Input stream to process
-    :param out_stream:
-        Output stream to process
-
-    The syntax is not documented anywhere that I could find but based on simple
-    experiments it looks like a sequence of lines starting with a one
-    letter-code followed by a colon and a value.
-
-    The following fields are recognized:
-
-        'P' - device path relative to /sysfs
-        'N' - device path relative to /dev
-        'E' - a key-value attribute
-        'S' - symlink path relative to /dev
-        'L' - unknown field
-    """
-    symlink_count = 0
-    for line in in_stream:
-        line = line.rstrip()
-        if line == '':
-            symlink_count = 0
-        elif line.startswith("P: "):
-            line = line.replace("P: ", "path: ", 1)
-        elif line.startswith("N: "):
-            line = line.replace("N: ", "name: ", 1)
-        elif line.startswith("E: "):
-            line = re.sub("E: ([A-Za-z0-9_]+)=", "attr_\\1: ", line)
-        elif line.startswith("S: "):
-            line = re.sub("S: ", "symlink_{}: ".format(symlink_count), line)
-            symlink_count += 1
-        elif line.startswith("L: "):
-            line = line.replace("L: ", "l_something: ", 1)
-        print(line, file=out_stream)
-
-
-if __name__ == '__main__':
-    udev2resource(sys.stdin, sys.stdout)
diff --git a/jobs/resource.pxu b/jobs/resource.pxu
index 0022978..115224e 100644
--- a/jobs/resource.pxu
+++ b/jobs/resource.pxu
@@ -112,10 +112,8 @@ id: package
 estimated_duration: 1.16
 plugin: resource
 command:
-    # shellcheck disable=SC2016
-    dpkg-query -W -f='name: ${Package}\nversion: ${Version}\n\n' || \
-    echo -e 'name: plainbox\nversion: 0.1\n\n' |\
-    awk 'BEGIN {RS = ""; FS = "\n"}{print $1; print $2; print "" }'
+  # shellcheck disable=SC2016
+  dpkg-query -W -f='name: ${Package}\n\n' || true
 _description: Generates a list of packages
 _summary: Collect information about installed software packages
 
@@ -125,8 +123,7 @@ plugin: resource
 _summary: Enumerate available system executables
 _description: Generates a resource for all available executables
 command:
-    xargs -n1 -d: <<< "$PATH" | xargs -I{} find -H {} -maxdepth 1 -xtype f -executable -printf "name: %f\nlocation: %h\n\n"
-    true
+  xargs -n1 -d: <<< "$PATH" | xargs -I{} find -H {} -maxdepth 1 -xtype f -executable -printf "name: %f\n\n" | sort -u | awk '{print}' ORS='\n\n' || true
 
 id: device
 estimated_duration: 0.48
@@ -142,17 +139,6 @@ command: udev_resource.py -f PARTITION || true
 _description: Creates removable partitions info from udev
 _summary: Collect removable partitions info from udev
 
-id: staging/udev
-estimated_duration: 1.1
-plugin: resource
-shell: /bin/sh
-command: udevadm info --export-db | udev2resource.py
-_summary: Collect unfiltered udev data
-_description:
- This job collects the udev database in mostly raw format. The only
- transformations applied are basic changes to make the format compatible with
- RFC822 syntax required by PlainBox.
-
 id: dmi_present
 estimated_duration: 0.02
 plugin: resource