Merge lp:~mikemc/ubuntuone-client/refactor-launcher into lp:ubuntuone-client

[Mike McCracken]

- refactor platform/launcher code ( LP: 989121 )

- refactor platform/launcher code ( LP: 989121 )

* moves platform/the_platform/launcher to platform/launcher/the_platform
* similar change to test suite

Tested on linux.

[Brian Curtin (brian.curtin)]

Looks reasonable to me.
Tests pass on Windows.

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'tests/platform/__init__.py'
--- tests/platform/__init__.py	2012-05-02 13:17:12 +0000
+++ tests/platform/__init__.py	2012-05-02 21:53:18 +0000
@@ -29,9 +29,9 @@
 
 if sys.platform.startswith('linux'):
     from tests.platform.ipc import test_linux
-    ipc_source = test_linux
+    ipc_source = test_linux    
 else:
-    from tests.platform.ipc import test_windows
+    from tests.platform.ipc import test_windows 
     ipc_source = test_windows
 
 IPCTestCase = ipc_source.IPCTestCase

=== added directory 'tests/platform/launcher'
=== added file 'tests/platform/launcher/__init__.py'
--- tests/platform/launcher/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/platform/launcher/__init__.py	2012-05-02 21:53:18 +0000
@@ -0,0 +1,27 @@
+# Copyright 2012 Canonical Ltd.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Platform/launcher test code."""

=== renamed file 'tests/platform/linux/test_unity.py' => 'tests/platform/launcher/test_linux.py'
--- tests/platform/linux/test_unity.py	2012-04-09 20:07:05 +0000
+++ tests/platform/launcher/test_linux.py	2012-05-02 21:53:18 +0000
@@ -33,7 +33,7 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.linux import launcher
+from ubuntuone.platform import launcher
 
 
 class FakeLauncherEntryProps(object):
@@ -66,13 +66,16 @@
 class LauncherTestCase(TestCase):
     """Test the Launcher interface."""
 
-    skip = None if launcher.use_libunity else "libunity not installed."
+    from ubuntuone.platform.launcher.linux import use_libunity
+    skip = None if use_libunity else "libunity not installed."
 
     @defer.inlineCallbacks
     def setUp(self):
         """Initialize this test instance."""
         yield super(LauncherTestCase, self).setUp()
-        self.patch(launcher.Unity, "LauncherEntry", FakeLauncherEntry)
+        import ubuntuone.platform.launcher.linux
+        self.patch(ubuntuone.platform.launcher.linux.Unity,
+                   "LauncherEntry", FakeLauncherEntry)
         self.launcher = launcher.UbuntuOneLauncher()
 
     def test_progress_starts_hidden(self):

=== modified file 'ubuntuone/platform/ipc/linux.py'
--- ubuntuone/platform/ipc/linux.py	2012-04-30 14:24:55 +0000
+++ ubuntuone/platform/ipc/linux.py	2012-05-02 21:53:18 +0000
@@ -37,7 +37,7 @@
 from twisted.internet import defer
 from xml.etree import ElementTree
 
-from ubuntuone.platform.linux.launcher import UbuntuOneLauncher
+from ubuntuone.platform.launcher import UbuntuOneLauncher
 
 # Disable the "Invalid Name" check here, as we have lots of DBus style names
 # pylint: disable-msg=C0103

=== added directory 'ubuntuone/platform/launcher'
=== renamed file 'ubuntuone/platform/launcher.py' => 'ubuntuone/platform/launcher/__init__.py'
--- ubuntuone/platform/launcher.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/launcher/__init__.py	2012-05-02 21:53:18 +0000
@@ -26,17 +26,18 @@
 # do not wish to do so, delete this exception statement from your
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
-"""Use libunity to show a progressbar and emblems on the launcher icon."""
+"""Use appropriate API to show a progressbar and emblems on the
+launcher icon."""
 
 import sys
 
 
 if sys.platform == "win32":
-    from ubuntuone.platform.windows import launcher
-    source = launcher
+    from ubuntuone.platform.launcher import windows
+    source = windows
 else:
-    from ubuntuone.platform.linux import launcher
-    source = launcher
+    from ubuntuone.platform.launcher import linux
+    source = linux
 
 U1_DOTDESKTOP = source.U1_DOTDESKTOP
 

=== renamed file 'ubuntuone/platform/linux/launcher.py' => 'ubuntuone/platform/launcher/linux.py'
--- ubuntuone/platform/linux/launcher.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/launcher/linux.py	2012-05-02 21:53:18 +0000
@@ -1,4 +1,4 @@
-# ubuntuone.platform.linux.unity
+# ubuntuone.platform.launcher.linux
 #
 # Author: Alejandro J. Cura <[e-mail]>
 #

=== renamed file 'ubuntuone/platform/windows/launcher.py' => 'ubuntuone/platform/launcher/windows.py'
--- ubuntuone/platform/windows/launcher.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/launcher/windows.py	2012-05-02 21:53:18 +0000
@@ -1,4 +1,4 @@
-# ubuntuone.platform.linux.unity
+# ubuntuone.platform.launcher.windows
 #
 # Author: Alejandro J. Cura <[e-mail]>
 #

=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2012-04-30 18:56:56 +0000
+++ ubuntuone/platform/windows/__init__.py	2012-05-02 21:53:18 +0000
@@ -38,7 +38,6 @@
 
 import constants
 import event_logging
-import launcher
 import logger
 
 from ubuntuone.platform.os_helper import (