Merge ~pieq/bugit/+git/qabro:fix-1778444-additional-info into bugit:master

[Pierre Equoy]

This MP gathers standard info (CPU, GPU, BIOS version, etc.) and adds it to the bug description when creating the bug in Launchpad, such as:
=========================================================
Summary: (...)

Steps to reproduce: (...)

Expected result: (...)

Actual result: (...)

Failure rate: (...)

-----

BiosVersion: 1.4.1
GPU: 00:02.0 VGA compatible controller: Intel Corporation Device 5916 (rev 02)
ProductName: Latitude 3580
CPU: Intel(R) Core(TM) i7-7500U CPU @ 2.70GHz (4x)
Manufacturer: Dell Inc.
=========================================================

[Sylvain Pineau (sylvain-pineau)]

LGTM

review: Approve

diff --git a/qabro/__version__.py b/qabro/__version__.py
index 72c0657..4d61116 100644
--- a/qabro/__version__.py
+++ b/qabro/__version__.py
@@ -1,5 +1,5 @@
 __title__ = 'qabro'
-__version__ = '0.5'
+__version__ = '0.6dev'
 __description__ = 'Report bug information with attachments in Launchpad'
 __author__ = 'Pierre Equoy'
 __author_email__ = '[e-mail]'
diff --git a/qabro/bug_assistant.py b/qabro/bug_assistant.py
index ea7c131..c2a3927 100644
--- a/qabro/bug_assistant.py
+++ b/qabro/bug_assistant.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 from __future__ import print_function, unicode_literals
 
-import os, subprocess, sys, tarfile
+import os, re, subprocess, sys, tarfile
+from collections import Counter
 from httplib2 import ServerNotFoundError
 
 from launchpadlib.launchpad import (
@@ -64,10 +65,10 @@ class BugAssistant:
             os.mkdir(directory)
 
         launchpad = Launchpad.login_with(
-            'oem-bugreport',
+            'qabro',
             service_root,
             credentials_file=os.path.join(directory,
-                                          'oem-bugreport'),
+                                          'qabro'),
             allow_access_levels=['WRITE_PRIVATE'])
 
         # Small trick to force access to launchpad and verify authentication
@@ -124,8 +125,12 @@ class BugAssistant:
                 raise BugAssistantError(error_message)
 
         print('Creating Launchpad bug report...')
+        std_info = AttachmentAssistant.get_standard_info()
+        std_info_str = '\n'.join(['{}: {}'.format(elt, std_info[elt])
+                                  for elt in std_info])
+        description = self.lp_description + "\n\n-----\n\n" + std_info_str
         bug = launchpad.bugs.createBug(title=self.lp_title,
-                                       description=self.lp_description,
+                                       description=description,
                                        tags=self.lp_tags.split(),
                                        target=project)
         if series:
@@ -257,3 +262,63 @@ class AttachmentAssistant:
                 self.attachments['checkbox-session.tgz'] = data
         else:
             print('There does not seem to be any Checkbox session here...')
+
+    @classmethod
+    def get_standard_info(cls):
+        """Gather standard information that should be present in all bugs."""
+        standard_info = {}
+
+        buildstamp = '/etc/buildstamp'
+        if os.path.isfile(buildstamp):
+            standard_info['Image'] = \
+                subprocess.check_output(['tail', '-n', '1', buildstamp])
+
+        command = "sudo env \"PATH=$PATH\" dmidecode -s system-manufacturer"
+        standard_info['Manufacturer'] = \
+            subprocess.check_output(command, shell=True).strip()
+        command = "sudo env \"PATH=$PATH\" dmidecode -s system-product-name"
+        standard_info['ProductName'] = \
+            subprocess.check_output(command, shell=True).strip()
+        command = "sudo env \"PATH=$PATH\" dmidecode -s bios-version"
+        standard_info['BiosVersion'] = \
+            subprocess.check_output(command, shell=True).strip()
+
+        standard_info['CPU'] = cls.get_cpu_info()
+
+        lspci_output = subprocess.check_output(['lspci']).splitlines()
+        standard_info['GPU'] = '\n'.join([line for line in lspci_output
+                                          if 'VGA' in line])
+        return standard_info
+
+    @classmethod
+    def get_cpu_info(cls):
+        """Parse /proc/cpuinfo and return cpu model information."""
+        cpus = []
+        cpuinfo = {}
+        parse_line = re.compile(r'(.*?)\s+:\s+(.*)').match
+        processor_line = re.compile(r'^(p|P)rocessor')
+        with open('/proc/cpuinfo') as file:
+            for line in file:
+                if processor_line.match(line) and cpuinfo:
+                    cpus.append(cpuinfo)
+                    cpuinfo = {}
+                match = parse_line(line)
+                if match:
+                    key, value = match.groups()
+                    cpuinfo[key] = value
+        cpus.append(cpuinfo)
+
+        cpu_names = Counter()
+        for cpu_number, cpu in enumerate(cpus):
+            if 'model name' in cpu:
+                cpu_name =  ' '.join(cpu["model name"].split())
+                cpu_names[cpu_name] += 1
+            elif 'Processor' in cpu:
+                cpu_name = ' '.join(cpu["Processor"].split())
+                cpu_names[cpu_name] += 1
+
+        cpu_names_str = ['{} ({}x)'.format(cpu_name, count)
+                         for cpu_name, count in cpu_names.iteritems()]
+
+        return '\n'.join(cpu_names_str)
+
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index acff5b6..a24e2cd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: qabro
-version: '0.5'
+version: '0.6dev'
 summary: QA OEM bug reporting tool
 description: |
   Tool to generate a Launchpad bug report and attach useful logs (using
@@ -29,6 +29,8 @@ parts:
     stage-packages:
       - libc6
       - dbus-x11
+      - dmidecode
+      - pciutils
 
   sosreport:
     plugin: nil