Merge lp:~kyrofa/unity-scope-snappy/launcher_scope into lp:~unity-api-team/unity-scope-snappy/trunk

[Kyle Fazzari]

Add basic launcher scope with debian packaging and integration tests.

Add basic launcher scope, along with debian packaging and integration test.

The scope has no functionality yet-- this is all just scaffolding.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/126/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/80

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/126/rebuild

review: Approve (continuous-integration)

Unmerged revisions

34. By Kyle Fazzari on 2015-07-28

Add basic launcher scope with debian packaging and integration tests.

=== modified file 'Makefile'
--- Makefile	2015-07-16 16:41:37 +0000
+++ Makefile	2015-07-28 16:46:34 +0000
@@ -5,7 +5,7 @@
 GOFMT=gofmt -w
 
 TOP_PACKAGE := launchpad.net/unity-scope-snappy
-EXECUTABLES := store package-management-daemon
+EXECUTABLES := launcher store package-management-daemon
 PACKAGES_TO_TEST := package-management-daemon/daemon \
                     store/actions \
                     store/packages \

=== added file 'data/snappy-launcher.png'
Binary files data/snappy-launcher.png	1970-01-01 00:00:00 +0000 and data/snappy-launcher.png	2015-07-28 16:46:34 +0000 differ
=== modified file 'debian/rules'
--- debian/rules	2015-07-16 18:09:58 +0000
+++ debian/rules	2015-07-28 16:46:34 +0000
@@ -10,12 +10,13 @@
 export PATH := $(GOPATH)/bin:$(PATH)
 
 STORE_FILE_PATH := /usr/lib/$(DEB_HOST_MULTIARCH)/unity-scopes/snappy-store/store
+LAUNCHER_FILE_PATH := /usr/lib/$(DEB_HOST_MULTIARCH)/unity-scopes/snappy-launcher/launcher
 
 %:
 	dh $@ --buildsystem=golang --with=golang
 
 # Run the tests and produce a Cobertura-compatible coverage report.
-override_dh_auto_test: debian/snappy-store.ini debian/com.canonical.applications.WebdmPackageManager.service
+override_dh_auto_test: debian/snappy-launcher.ini debian/snappy-store.ini debian/com.canonical.applications.WebdmPackageManager.service
 	dbus-test-runner -m 600 -t make -p integration_tests
 	dbus-test-runner -m 600 -t make -p coverage.xml
 
@@ -23,6 +24,10 @@
 debian/%: data/%.in
 	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
 
-# Rewrite the scope.ini file to point to the multiarch location.
+# Rewrite the snappy-store.ini file to point to the multiarch location.
 debian/snappy-store.ini: store/snappy-store.ini
 	sed 's|ScopeRunner.*|ScopeRunner = $(STORE_FILE_PATH) --runtime %R --scope %S|g' $< > $@
+
+# Rewrite the snappy-launcher.ini file to point to the multiarch location.
+debian/snappy-launcher.ini: launcher/snappy-launcher.ini
+	sed 's|ScopeRunner.*|ScopeRunner = $(LAUNCHER_FILE_PATH) --runtime %R --scope %S|g' $< > $@

=== modified file 'debian/unity-scope-snappy.install'
--- debian/unity-scope-snappy.install	2015-07-16 18:09:58 +0000
+++ debian/unity-scope-snappy.install	2015-07-28 16:46:34 +0000
@@ -1,5 +1,11 @@
 #!/usr/bin/dh-exec
 
-usr/bin/store usr/lib/${DEB_HOST_MULTIARCH}/unity-scopes/snappy-store/
-debian/snappy-store.ini usr/lib/${DEB_HOST_MULTIARCH}/unity-scopes/snappy-store/
-data/snappy-store.png usr/share/unity/scopes/snappy-store/
+# Install Snappy Store
+usr/bin/store usr/lib/${DEB_HOST_MULTIARCH}/unity-scopes/snappy-store
+debian/snappy-store.ini usr/lib/${DEB_HOST_MULTIARCH}/unity-scopes/snappy-store
+data/snappy-store.png usr/share/unity/scopes/snappy-store
+
+# Install Snappy Launcher
+usr/bin/launcher usr/lib/${DEB_HOST_MULTIARCH}/unity-scopes/snappy-launcher
+debian/snappy-launcher.ini usr/lib/${DEB_HOST_MULTIARCH}/unity-scopes/snappy-launcher
+data/snappy-launcher.png usr/share/unity/scopes/snappy-launcher

=== added directory 'launcher'
=== added file 'launcher/main.go'
--- launcher/main.go	1970-01-01 00:00:00 +0000
+++ launcher/main.go	2015-07-28 16:46:34 +0000
@@ -0,0 +1,39 @@
+/* Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-scope-snappy.
+ *
+ * unity-scope-snappy is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * unity-scope-snappy 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
+ * unity-scope-snappy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package main
+
+import (
+	"launchpad.net/unity-scope-snappy/internal/launchpad.net/go-unityscopes/v2"
+	"launchpad.net/unity-scope-snappy/launcher/scope"
+	"log"
+)
+
+// main is the entry point of the scope.
+func main() {
+	scope, err := scope.New()
+	if err != nil {
+		log.Printf("snappy-launcher: Unable to create scope: %s", err)
+		return
+	}
+
+	err = scopes.Run(scope)
+	if err != nil {
+		log.Printf("snappy-launcher: Unable to run scope: %s", err)
+	}
+}

=== added directory 'launcher/scope'
=== added file 'launcher/scope/scope.go'
--- launcher/scope/scope.go	1970-01-01 00:00:00 +0000
+++ launcher/scope/scope.go	2015-07-28 16:46:34 +0000
@@ -0,0 +1,87 @@
+/* Copyright (C) 2015 Canonical Ltd.
+ *
+ * This file is part of unity-scope-snappy.
+ *
+ * unity-scope-snappy is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * unity-scope-snappy 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
+ * unity-scope-snappy. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package scope
+
+import (
+	"fmt"
+	"launchpad.net/unity-scope-snappy/internal/launchpad.net/go-unityscopes/v2"
+	"log"
+)
+
+// template for the grid layout of the search results.
+const layout = `{
+	"schema-version": 1,
+	"template": {
+		"category-layout": "grid",
+		"card-size": "small"
+	},
+	"components": {
+		"title": "title",
+		"art" : {
+			"field": "art"
+		},
+		"subtitle": "subtitle"
+        }
+}`
+
+// Scope is the struct representing the scope itself.
+type Scope struct {}
+
+// New creates a new Snappy Launcher scope.
+func New() (*Scope, error) {
+	return &Scope{}, nil
+}
+
+func (scope *Scope) SetScopeBase(base *scopes.ScopeBase) {
+	// Do nothing
+}
+
+func (scope Scope) Search(query *scopes.CannedQuery, metadata *scopes.SearchMetadata, reply *scopes.SearchReply, cancelled <-chan bool) error {
+	//createDepartments(query, reply)
+
+	return nil
+}
+
+func (scope Scope) Preview(result *scopes.Result, metadata *scopes.ActionMetadata, reply *scopes.PreviewReply, cancelled <-chan bool) error {
+	return nil
+}
+
+// createDepartments is used to create a set of static departments for the
+// scope.
+//
+// It accepts a query to be executed when the department is selected, and a
+// reply onto which the new departments will be registered.
+func createDepartments(query *scopes.CannedQuery, reply *scopes.SearchReply) error {
+	rootDepartment, err := scopes.NewDepartment("", query, "All Categories")
+	if err != nil {
+		return fmt.Errorf(`Unable to create "All Categories" department: %s`, err)
+	}
+
+	reply.RegisterDepartments(rootDepartment)
+
+	return nil
+}
+
+// scopeError prints an error to stderr as well as returning an actual error.
+// This is used because the errors returned from the scope functions don't seem
+// to be handled, logged, or otherwise displayed to the user in any way.
+func scopeError(format string, a ...interface{}) error {
+	log.Printf(format, a...)
+	return fmt.Errorf(format, a...)
+}

=== added file 'launcher/snappy-launcher.ini'
--- launcher/snappy-launcher.ini	1970-01-01 00:00:00 +0000
+++ launcher/snappy-launcher.ini	2015-07-28 16:46:34 +0000
@@ -0,0 +1,6 @@
+[ScopeConfig]
+DisplayName = Snappy Launcher
+Description = A scope to view and launch snap and legacy applications
+Author = Canonical
+Icon = /usr/share/unity/scopes/snappy-launcher/snappy-launcher.png
+ScopeRunner = $GOPATH/bin/launcher --runtime %R --scope %S

=== added directory 'test/launcher'
=== added file 'test/launcher/__init__.py'
=== added file 'test/launcher/test_surface.py'
--- test/launcher/test_surface.py	1970-01-01 00:00:00 +0000
+++ test/launcher/test_surface.py	2015-07-28 16:46:34 +0000
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2015 Canonical Ltd.
+#
+# This file is part of unity-scope-snappy.
+#
+# unity-scope-snappy is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# unity-scope-snappy 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
+# unity-scope-snappy. If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import sys
+import unittest
+
+from scope_harness.testing import ScopeHarnessTestCase
+from scope_harness import (ScopeHarness,
+                           Parameters)
+
+class TestInitialSurface(ScopeHarnessTestCase):
+	"""Test the initial surfacing of the launcher scope (no search query).
+	"""
+
+	def setUp(self):
+		"""Run the Snappy Launcher using the harness.
+		"""
+
+		self.harness = ScopeHarness.new_from_scope_list(Parameters([
+			"{}/../../launcher/snappy-launcher.ini".format(os.path.dirname(os.path.realpath(__file__)))
+		]))
+		self.view = self.harness.results_view
+		self.view.active_scope = "snappy-launcher"
+		self.view.search_query = ""
+
+	def testScopeProperties(self):
+		"""Test the scope properties from the .ini file"""
+
+		self.assertEqual(self.view.scope_id, "snappy-launcher")
+		self.assertEqual(self.view.display_name, "Snappy Launcher")
+		self.assertEqual(self.view.description, "A scope to view and launch snap and legacy applications")