Merge lp:~submarine/ubuntu-scopes/sshsearch-to-deprecatedscope-api into lp:~submarine/ubuntu-scopes/sshsearch

[David Callé]

Port to DeprecatedScope

- Port to the DeprecatedScope API
- Package

[lp:~submarine/ubuntu-scopes/sshsearch-to-deprecatedscope-api]

4. By Didier Roche-Tolomelli on 2013-03-18

* Rename and port of unity-lens-sshsearch
* Fix packaging
* Transition from unity-lens-sshsearch to this package

[Didier Roche-Tolomelli (didrocks)]

adding some packaging fixes + translation handling.

[James Henstridge (jamesh)]

The code changes look good. I see that the tests only handle the internal update_results_model() method. Would it make sense to test the external API of the scope too?

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-03-18 17:57:23 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True
 
=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2013-03-18 17:57:23 +0000
@@ -0,0 +1,4 @@
+include MANIFEST.in
+include src/*
+include data/*
+include po/*
 
=== modified file 'data/sshsearch.scope.in'
--- data/sshsearch.scope.in	2013-01-29 07:41:51 +0000
+++ data/sshsearch.scope.in	2013-03-18 17:57:23 +0000
@@ -1,11 +1,13 @@
 [Scope]
-DBusName=com.canonical.Unity.Scope.Connections.Sshsearch
-DBusPath=/com/canonical/unity/scope/connections/sshsearch
+DBusName=com.canonical.Unity.Scope.Boxes.Sshsearch
+DBusPath=/com/canonical/unity/scope/boxes/sshsearch
 Icon=
-_Keywords=sshsearch;
+Loader=/usr/share/unity-scopes/sshsearch/unity_sshsearch_daemon.py
+_Keywords=sshsearch;ssh;connections;
 RequiredMetadata=
 OptionalMetadata=
-Type=connections
+RemoteContent=false
+Type=boxes
 _Name=Sshsearch
 _Description=Find Sshsearch items
 _SearchHint=Search Sshsearch
 
=== modified file 'data/unity-scope-sshsearch.service'
--- data/unity-scope-sshsearch.service	2013-01-28 01:50:41 +0000
+++ data/unity-scope-sshsearch.service	2013-03-18 17:57:23 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Scope.Connections.Sshsearch
-Exec=/usr/lib/ubuntu-scopes/sshsearch/unity_sshsearch_daemon.py
+Exec=/usr/share/unity-scopes/sshsearch/unity_sshsearch_daemon.py
 
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2013-03-18 17:57:23 +0000
@@ -0,0 +1,10 @@
+unity-scope-sshsearch (0.1) UNRELEASED; urgency=low
+
+  [ Mark Tully ]
+  * Rename and port of unity-lens-sshsearch
+
+  [ Didier Roche ]
+  * Fix packaging
+  * Transition from unity-lens-sshsearch to this package
+
+ -- Mark Tully <[e-mail]>  Mon, 18 Mar 2013 18:24:36 +0100
 
=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2013-03-18 17:57:23 +0000
@@ -0,0 +1,1 @@
+9
 
=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2013-03-18 17:57:23 +0000
@@ -0,0 +1,34 @@
+Source: unity-scope-sshsearch
+Section: gnome
+Priority: optional
+Maintainer: Mark Tully <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               python,
+               python-distutils-extra,
+               python-gi,
+               pkg-config,
+               python-nose,
+               gir1.2-unity-5.0 (>= 6.91),
+               gir1.2-glib-2.0,
+               python-paramiko,
+Standards-Version: 3.9.4
+Homepage: https://launchpad.net/unity-scope-sshsearch
+# If you aren't a member of ~submarine but need to upload packaging changes,
+# just go ahead. ~submarine will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~submarine/unity-scope-sshsearch/trunk
+
+Package: unity-scope-sshsearch
+Architecture: all
+Depends: ${misc:Depends},
+         ${python:Depends},
+         python,
+         python-gi,
+         gir1.2-unity-5.0 (>= 6.91),
+         gir1.2-glib-2.0,
+         python-paramiko,
+Conflicts: unity-lens-sshsearch,
+Replaces: unity-lens-sshsearch,
+Provides: unity-lens-sshsearch,
+Description: ssh search scope for Unity
+ This package contains the "sshsearch" scope which allows Unity
+ to search for configured ssh connexions.
 
=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2013-03-18 17:57:23 +0000
@@ -0,0 +1,23 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: https://launchpad.net/unity-scope-sshsearch
+Upstream-Name: unity-scope-sshsearch
+Upstream-Contact: Mark Tully <[e-mail]>
+
+Files: *
+Copyright: 2012 Bernd Schlapsi
+           2013 Mark Tully
+License: GPL-3
+ This program 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, version 3 of the License.
+ .
+ This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in '/usr/share/common-licenses/GPL-3'.
 
=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2013-03-18 17:57:23 +0000
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+
+%:
+	dh $@ --with python2
+
+override_dh_auto_clean:
+	python setup.py clean -a
+
+override_dh_auto_build:
+	python setup.py build
+
+override_dh_auto_test:
+	nosetests
+
+override_dh_auto_install:
+	python setup.py install --root=$(CURDIR)/debian/unity-scope-sshsearch --install-layout=deb
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2013-03-18 17:57:23 +0000
@@ -0,0 +1,1 @@
+1.0
 
=== modified file 'po/unity-scope-sshsearch.pot'
--- po/unity-scope-sshsearch.pot	2013-01-29 07:41:51 +0000
+++ po/unity-scope-sshsearch.pot	2013-03-18 17:57:23 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-29 08:30+0100\n"
+"POT-Creation-Date: 2013-03-18 18:23+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../src/unity_sshsearch_daemon.py:34
-msgid "Categorytitle"
+msgid "Boxes"
 msgstr ""
 
 #: ../src/unity_sshsearch_daemon.py:36
@@ -30,7 +30,7 @@
 msgstr ""
 
 #: ../data/sshsearch.scope.in.h:1
-msgid "sshsearch;"
+msgid "sshsearch;ssh;connections;"
 msgstr ""
 
 #: ../data/sshsearch.scope.in.h:2
 
=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2013-03-18 17:57:23 +0000
@@ -0,0 +1,6 @@
+[build]
+i18n=True
+
+[build_i18n]
+domain=unity-scope-sshsearch
+desktop_files=[('share/unity/scopes/boxes', ('data/sshsearch.scope.in',))]
 
=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2013-03-18 17:57:23 +0000
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+from distutils.core import setup
+from DistUtilsExtra.command import *
+
+setup(name='unity-scope-sshsearch',
+      version='0.1',
+      author='Mark Tully',
+      author_email='[e-mail]',
+      url='http://launchpad.net/ubuntu-scopes',
+      license='GNU General Public License (GPL)',
+      data_files=[
+    ('share/dbus-1/services', ['data/unity-scope-sshsearch.service']),
+    ('share/unity-scopes/sshsearch', ['src/unity_sshsearch_daemon.py']),
+    ], cmdclass={'build':  build_extra.build_extra,
+                 'build_i18n': build_i18n.build_i18n,})
 
=== modified file 'src/unity_sshsearch_daemon.py'
--- src/unity_sshsearch_daemon.py	2013-01-28 01:50:41 +0000
+++ src/unity_sshsearch_daemon.py	2013-03-18 17:57:23 +0000
@@ -1,7 +1,8 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
 
-# Copyright(C) 2012 name <email>
+# Copyright(C) 2013 Mark Tully <[e-mail]>
+# Copyright(C) 2012 Bernd Schlapsi <[e-mail]>
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
 # by the Free Software Foundation.
@@ -26,12 +27,12 @@
 gettext.textdomain(APP_NAME)
 _ = gettext.gettext
 
-BUS_NAME = 'com.canonical.Unity.Scope.Connections.Sshsearch'
-BUS_PATH = '/com/canonical/unity/scope/connections/sshsearch'
+BUS_NAME = 'com.canonical.Unity.Scope.Boxes.Sshsearch'
+BUS_PATH = '/com/canonical/unity/scope/boxes/sshsearch'
 
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
-CAT_0_ICON = Gio.ThemedIcon.new(SVG_DIR + 'group-connections.svg')
-CAT_0_TITLE = _('Categorytitle')
+CAT_0_ICON = Gio.ThemedIcon.new(SVG_DIR + 'group-boxes.svg')
+CAT_0_TITLE = _('Boxes')
 
 NO_RESULTS_HINT = _('Sorry, there are no available SSH connections that match your search.')
 SEARCH_HINT = _('Search for available SSH connections')
@@ -48,14 +49,14 @@
 
 class Daemon:
     def __init__(self):
-        self.scope = Unity.Scope.new(BUS_PATH, 'sshsearch')
+        self.scope = Unity.DeprecatedScope.new(BUS_PATH, 'sshsearch')
         self.scope.props.search_hint = SEARCH_HINT
         self.scope.search_in_global = True
-        cats = []
-        cats.append(Unity.Category.new(CAT_0_TITLE.lower(),
-                                       CAT_0_TITLE,
-                                       CAT_0_ICON,
-                                       Unity.CategoryRenderer.VERTICAL_TILE))
+        cats = Unity.CategorySet.new()
+        cats.add(Unity.Category.new(CAT_0_TITLE.lower(),
+                                    CAT_0_TITLE,
+                                    CAT_0_ICON,
+                                    Unity.CategoryRenderer.VERTICAL_TILE))
         self.scope.props.categories = cats
         self.preferences = Unity.PreferencesManager.get_default()
         self.preferences.connect('notify::remote-content-search', self._on_preference_changed)
@@ -112,14 +113,14 @@
         model = search.props.results_model
         model.clear()
         if self.preferences.props.remote_content_search != Unity.PreferencesManagerRemoteContent.ALL:
-            search.finished()
+            search.emit('finished')
             return
         search_string = search.props.search_string.strip()
         print('Search changed to \'%s\'' % search_string)
         self.update_results_model(search_string, model)
         search.set_reply_hint('no-results-hint',
                               GLib.Variant.new_string(NO_RESULTS_HINT))
-        search.finished()
+        search.emit('finished')
 
     def update_results_model(self, search, results):