Merge lp:~ted/ubuntu-app-launch/click-info into lp:ubuntu-app-launch/13.10

[Ted Gould]

Use 'click info' to get manifests

Click devs didn't like us going through and finding the files ourselves, so they made a command to help us.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:76
http://10.97.0.26:8080/job/upstart-app-launch-ci/138/
Executed test runs:
    SUCCESS: http://10.97.0.26:8080/job/upstart-app-launch-saucy-amd64-ci/140
    SUCCESS: http://10.97.0.26:8080/job/upstart-app-launch-saucy-armhf-ci/139
    SUCCESS: http://10.97.0.26:8080/job/upstart-app-launch-saucy-i386-ci/138

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/upstart-app-launch-ci/138/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Cool. Nice improvement.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-09-24 03:53:13 +0000
+++ debian/control	2013-10-04 21:03:37 +0000
@@ -25,7 +25,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         click,
+         click (>= 0.4.9),
          click-apparmor,
 Description: Upstart Job for Launching Applications
  Upstart Job file and associated utilities that is used to launch

=== modified file 'helpers.c'
--- helpers.c	2013-09-23 19:42:54 +0000
+++ helpers.c	2013-10-04 21:03:37 +0000
@@ -61,6 +61,7 @@
 manifest_to_desktop (const gchar * app_dir, const gchar * app_id)
 {
 	gchar * package = NULL;
+	gchar * output = NULL;
 	gchar * application = NULL;
 	gchar * version = NULL;
 	JsonParser * parser = NULL;
@@ -72,60 +73,63 @@
 		return NULL;
 	}
 
-	gchar * manifestfile = g_strdup_printf("%s.manifest", package);
-	gchar * manifestpath = g_build_filename(app_dir, ".click", "info", manifestfile, NULL);
-	g_free(manifestfile);
+	gchar * cmdline = g_strdup_printf("click info \"%s\"", package);
+	g_spawn_command_line_sync(cmdline, &output, NULL, NULL, &error);
+	g_free(cmdline);
 
-	if (!g_file_test(manifestpath, G_FILE_TEST_EXISTS)) {
-		g_warning("Unable to find manifest file: %s", manifestpath);
+	if (error != NULL) {
+		g_warning("Unable to get manifest for '%s': %s", package, error->message);
+		g_error_free(error);
 		goto manifest_out;
 	}
 
 	parser = json_parser_new();
 
-	json_parser_load_from_file(parser, manifestpath, &error);
+	json_parser_load_from_data(parser, output, -1, &error);
+	g_free(output);
+
 	if (error != NULL) {
-		g_warning("Unable to load manifest file '%s': %s", manifestpath, error->message);
+		g_warning("Unable to load manifest data '%s': %s", package, error->message);
 		g_error_free(error);
 		goto manifest_out;
 	}
 
 	JsonNode * root = json_parser_get_root(parser);
 	if (json_node_get_node_type(root) != JSON_NODE_OBJECT) {
-		g_warning("Manifest '%s' doesn't start with an object", manifestpath);
+		g_warning("Manifest '%s' doesn't start with an object", package);
 		goto manifest_out;
 	}
 
 	JsonObject * rootobj = json_node_get_object(root);
 	if (!json_object_has_member(rootobj, "version")) {
-		g_warning("Manifest '%s' doesn't have a version", manifestpath);
+		g_warning("Manifest '%s' doesn't have a version", package);
 		goto manifest_out;
 	}
 
 	if (g_strcmp0(json_object_get_string_member(rootobj, "version"), version) != 0) {
-		g_warning("Manifest '%s' version '%s' doesn't match AppID version '%s'", manifestpath, json_object_get_string_member(rootobj, "version"), version);
+		g_warning("Manifest '%s' version '%s' doesn't match AppID version '%s'", package, json_object_get_string_member(rootobj, "version"), version);
 		goto manifest_out;
 	}
 
 	if (!json_object_has_member(rootobj, "hooks")) {
-		g_warning("Manifest '%s' doesn't have an hooks section", manifestpath);
+		g_warning("Manifest '%s' doesn't have an hooks section", package);
 		goto manifest_out;
 	}
 
 	JsonObject * appsobj = json_object_get_object_member(rootobj, "hooks");
 	if (appsobj == NULL) {
-		g_warning("Manifest '%s' has an hooks section that is not a JSON object", manifestpath);
+		g_warning("Manifest '%s' has an hooks section that is not a JSON object", package);
 		goto manifest_out;
 	}
 
 	if (!json_object_has_member(appsobj, application)) {
-		g_warning("Manifest '%s' doesn't have the application '%s' defined", manifestpath, application);
+		g_warning("Manifest '%s' doesn't have the application '%s' defined", package, application);
 		goto manifest_out;
 	}
 
 	JsonObject * appobj = json_object_get_object_member(appsobj, application);
 	if (appobj == NULL) {
-		g_warning("Manifest '%s' has a definition for application '%s' that is not an object", manifestpath, application);
+		g_warning("Manifest '%s' has a definition for application '%s' that is not an object", package, application);
 		goto manifest_out;
 	}
 
@@ -147,7 +151,6 @@
 
 manifest_out:
 	g_clear_object(&parser);
-	g_free(manifestpath);
 	g_free(package);
 	g_free(application);
 	g_free(version);

=== added file 'tests/click'
--- tests/click	1970-01-01 00:00:00 +0000
+++ tests/click	2013-10-04 21:03:37 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/bin/cat "${XDG_DATA_DIRS}/click-app-dir/.click/info/${2}.manifest"