Merge lp:~mvo/click/lp1324853-manifest into lp:click/devel

[Michael Vogt]

Add "click info" interface to get manifest corresponding to file in installed package.

This branch implements a CLI interface to get the manifest of the click package that the file given belongs to.

E.g.
$ click info /opt/click.ubuntu.com/com.ubuntu.calendar/0.4/EventListModel.qml
{
    "description": "Calendar application for Ubuntu devices",
...
}

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:468
http://jenkins.qa.ubuntu.com/job/click-devel-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-devel-utopic-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-devel-ci/5/rebuild

review: Approve (continuous-integration)

[Colin Watson (cjwatson)]

review: Approve

[Colin Watson (cjwatson)]

review: Approve

[Colin Watson (cjwatson)]

Oops, duplicate. Anyway, needs a test, but I can deal with that.

=== modified file 'click/commands/info.py'
--- click/commands/info.py	2014-04-03 08:52:02 +0000
+++ click/commands/info.py	2014-06-24 06:33:04 +0000
@@ -26,6 +26,13 @@
 
 from click.install import DebFile
 from click.json_helpers import json_object_to_python
+def _load_manifest(manifest_file):
+    manifest = json.load(manifest_file)
+    keys = list(manifest)
+    for key in keys:
+        if key.startswith("_"):
+            del manifest[key]
+    return manifest
 
 
 def get_manifest(options, arg):
@@ -38,15 +45,21 @@
         if registry.has_package_name(arg):
             return json_object_to_python(registry.get_manifest(arg))
 
-    with closing(DebFile(filename=arg)) as package:
-        with package.control.get_file(
-                "manifest", encoding="UTF-8") as manifest_file:
-            manifest = json.load(manifest_file)
-            keys = list(manifest)
-            for key in keys:
-                if key.startswith("_"):
-                    del manifest[key]
-            return manifest
+    if arg.endswith(".click"):
+        with closing(DebFile(filename=arg)) as package:
+            with package.control.get_file(
+                    "manifest", encoding="UTF-8") as manifest_file:
+                return _load_manifest(manifest_file)
+    else:
+        import glob, os
+        pkgdir = Click.find_package_directory(arg)
+        manifest_path = glob.glob(
+            os.path.join(pkgdir, ".click", "info", "*.manifest"))
+        if len(manifest_path) > 1:
+            raise Exception("Multiple manifest files found in '%s'" % (
+                manifest_path))
+        with open(manifest_path[0]) as f:
+            return _load_manifest(f)
 
 
 def run(argv):