Merge lp:~james-w/linaro-image-tools/add-script into lp:linaro-image-tools/11.11

[James Westby]

Hi,

The final piece of the puzzle, a script that you can run to build
a set of hardware packs.

Should be straightforward given the pieces that came before.

Thanks,

James

[Zygmunt Krynicki (zyga)]

Hi James

104 +from optparse import OptionParser

110 +if __name__ == '__main__':
111 + parser = OptionParser()
112 + opts, args = parser.parse_args()
113 + if len(args) < 2:
114 + sys.stderr.write("Requires arguments CONFIG_FILE VERSION\n")
115 + sys.exit(1)
116 + try:

I'd use argparse as it seems to do exactly what you need and is in general superior to optparse.

parser = argparse.ArgumentParser()
parser.add_argument("CONFIG_FILE")
parser.add_argument("VERSION")
args = parser.parse_args()
HardwarePackBuilder(args.CONFIG_FILE, args.VERSION)

You could even use type=argparse.FileType("r") to get various error handlers that understand the act of opening file for reading. This would require changing your API a bit since it returns an open file, not a pathname

[James Westby (james-w)]

Done, thanks.

James

[lp:~james-w/linaro-image-tools/add-script]

128. By James Westby on 2010-09-13

Use argparse. Thanks Zygmunt.

[Zygmunt Krynicki (zyga)]

Diff looks good, tests passed.

review: Approve

=== modified file 'hwpack/tests/__init__.py'
--- hwpack/tests/__init__.py	2010-09-13 19:16:50 +0000
+++ hwpack/tests/__init__.py	2010-09-13 19:16:50 +0000
@@ -6,6 +6,7 @@
                     'hwpack.tests.test_builder',
                     'hwpack.tests.test_hardwarepack',
                     'hwpack.tests.test_packages',
+                    'hwpack.tests.test_script',
                     'hwpack.tests.test_tarfile_matchers',
                    ]
     loader = unittest.TestLoader()

=== added file 'hwpack/tests/test_script.py'
--- hwpack/tests/test_script.py	1970-01-01 00:00:00 +0000
+++ hwpack/tests/test_script.py	2010-09-13 19:16:50 +0000
@@ -0,0 +1,84 @@
+import os
+import subprocess
+
+from hwpack.hardwarepack import Metadata
+from hwpack.testing import (
+    AptSourceFixture,
+    ChdirToTempdirFixture,
+    ConfigFileFixture,
+    DummyFetchedPackage,
+    IsHardwarePack,
+    TestCaseWithFixtures,
+    )
+
+
+class ScriptTests(TestCaseWithFixtures):
+    """Tests that execute the linaro-hwpack-create script."""
+
+    def setUp(self):
+        super(ScriptTests, self).setUp()
+        self.script_path = self.find_script()
+        self.useFixture(ChdirToTempdirFixture())
+
+    def find_script(self):
+        script_name = "linaro-hwpack-create"
+        this_path = os.path.abspath(__file__)
+        parent_path = this_path
+        for i in range(3):
+            parent_path = os.path.dirname(parent_path)
+        possible_paths = [
+            os.path.join(parent_path, script_name),
+            os.path.join("usr", "local", "bin", script_name),
+            os.path.join("usr", "bin", script_name),
+        ]
+        for script_path in possible_paths:
+            if os.path.exists(script_path):
+                return script_path
+        raise AssertionError(
+            "Could not find linaro-hwpack-create script to test.")
+
+    def run_script(self, args, expected_returncode=0):
+        cmdline = [self.script_path] + args
+        proc = subprocess.Popen(
+            cmdline, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        (stdout, stderr) = proc.communicate()
+        self.assertEqual(
+            expected_returncode, proc.returncode,
+            "%s exited with code %d. stdout: %s\nstderr: %s\n"
+            % (str(cmdline), proc.returncode, stdout, stderr))
+        return stdout, stderr
+
+    def test_errors_on_missing_configfile(self):
+        stdout, stderr = self.run_script(
+            ["nonexistant", "1.0"], expected_returncode=1)
+        self.assertEqual("No such config file: 'nonexistant'\n", stderr)
+        self.assertEqual("", stdout)
+
+    def test_errors_on_missing_configfile_argument(self):
+        stdout, stderr = self.run_script([], expected_returncode=2)
+        self.assertEqual(
+            "usage: linaro-hwpack-create [-h] CONFIG_FILE VERSION\n"
+            "linaro-hwpack-create: error: too few arguments\n", stderr)
+        self.assertEqual("", stdout)
+
+    def test_errors_on_missing_version_argument(self):
+        stdout, stderr = self.run_script(["somefile"], expected_returncode=2)
+        self.assertEqual(
+            "usage: linaro-hwpack-create [-h] CONFIG_FILE VERSION\n"
+            "linaro-hwpack-create: error: too few arguments\n", stderr)
+        self.assertEqual("", stdout)
+
+    def test_builds_a_hwpack(self):
+        available_package = DummyFetchedPackage(
+            "foo", "1.1", architecture="armel")
+        source = self.useFixture(AptSourceFixture([available_package]))
+        config = self.useFixture(ConfigFileFixture(
+            '[hwpack]\nname=ahwpack\npackages=foo\narchitectures=armel\n'
+            '\n[ubuntu]\nsources-entry=%s\n' % source.sources_entry))
+        stdout, stderr = self.run_script([config.filename, "1.0"])
+        metadata = Metadata("ahwpack", "1.0", "armel")
+        self.assertThat(
+            "hwpack_ahwpack_1.0_armel.tar.gz",
+            IsHardwarePack(
+                metadata, [available_package],
+                {"ubuntu": source.sources_entry}))

=== added file 'linaro-hwpack-create'
--- linaro-hwpack-create	1970-01-01 00:00:00 +0000
+++ linaro-hwpack-create	2010-09-13 19:16:50 +0000
@@ -0,0 +1,23 @@
+#!/usr/bin/python
+
+import argparse
+import sys
+
+from hwpack.builder import ConfigFileMissing, HardwarePackBuilder
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "CONFIG_FILE",
+        help="The configuration file to take the hardware pack information "
+        "from.")
+    parser.add_argument(
+        "VERSION", help="The version of the hardware pack to create.")
+    args = parser.parse_args()
+    try:
+        builder = HardwarePackBuilder(args.CONFIG_FILE, args.VERSION)
+    except ConfigFileMissing, e:
+        sys.stderr.write(str(e) + "\n")
+        sys.exit(1)
+    builder.build()