Merge lp:~mandel/ubuntu-sso-client/darwin-ac-cmdline into lp:ubuntu-sso-client

[Manuel de la Peña]

- Moved the code out to a function so that it can be called from other projects (LP: #1002307).

- Moved the code out to a function so that it can be called from other projects (LP: #1002307).

[lp:~mandel/ubuntu-sso-client/darwin-ac-cmdline]

959. By Manuel de la Peña on 2012-05-21

Allow the function to be accessed at package modue. Use name not self.name

[Roberto Alsina (ralsina)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[lp:~mandel/ubuntu-sso-client/darwin-ac-cmdline]

960. By Manuel de la Peña on 2012-05-21

Fix typo in comment.

=== modified file 'ubuntu_sso/main/__init__.py'
--- ubuntu_sso/main/__init__.py	2012-05-18 14:25:49 +0000
+++ ubuntu_sso/main/__init__.py	2012-05-21 14:41:25 +0000
@@ -94,9 +94,12 @@
 else:
     from ubuntu_sso.main import linux as source
 
+    source.get_activation_cmdline = lambda *args: None
+
 UbuntuSSOClient = source.UbuntuSSOClient
 UbuntuSSOProxy = source.UbuntuSSOProxy
 get_sso_client = source.get_sso_client
+get_activation_cmdline = source.get_activation_cmdline
 
 
 def except_to_errdict(e):

=== modified file 'ubuntu_sso/main/darwin.py'
--- ubuntu_sso/main/darwin.py	2012-04-30 17:59:19 +0000
+++ ubuntu_sso/main/darwin.py	2012-05-21 14:41:25 +0000
@@ -55,6 +55,21 @@
     return path
 
 
+def get_activation_cmdline(name):
+    """Find the path to the executable callback."""
+    # TODO: We have to either use launchd to launch the different services
+    # on demand or us LaunchServices to handle running the app via an URL.
+    ubuntu_sso_pkg_dir = os.path.dirname(os.path.dirname(ubuntu_sso.__file__))
+    ubuntu_sso_bin_dir = os.path.join(ubuntu_sso_pkg_dir, 'bin')
+    ubuntu_sso_bin = os.path.join(ubuntu_sso_bin_dir, 'ubuntu-sso-login')
+    ubuntuone_client_bin_dir = os.path.join(ubuntu_sso_pkg_dir,
+                                            '../ubuntuone-client/bin')
+    ubuntuone_client_bin = os.path.join(ubuntuone_client_bin_dir, name)
+    if os.path.exists(ubuntuone_client_bin):
+        return ubuntuone_client_bin
+    return ubuntu_sso_bin
+
+
 class DescriptionFactory(object):
     """Factory that provides the server and client descriptions."""
 
@@ -81,20 +96,7 @@
     @property
     def cmdline(self):
         """Get the command line to activate an executable."""
-        # MAYBE: use special URI schemes to have LaunchServices handle
-        # running the app, instead of paths to scripts
-        # e.g. 'x-ubuntuone-syncdaemon', 'x-ubuntu-sso-login'
-        ubuntu_sso_pkg_dir = os.path.dirname(
-            os.path.dirname(ubuntu_sso.__file__))
-        ubuntu_sso_bin_dir = os.path.join(ubuntu_sso_pkg_dir, 'bin')
-        ubuntu_sso_bin = os.path.join(ubuntu_sso_bin_dir, 'ubuntu-sso-login')
-        ubuntuone_client_bin_dir = os.path.join(ubuntu_sso_pkg_dir,
-                                                '../ubuntuone-client/bin')
-        ubuntuone_client_bin = os.path.join(ubuntuone_client_bin_dir,
-                                            self.name)
-        if os.path.exists(ubuntuone_client_bin):
-            return ubuntuone_client_bin
-        return ubuntu_sso_bin
+        return get_activation_cmdline(self.name)
 
 
 class UbuntuSSOClient(BaseClient):