Merge lp:~diegosarmentero/ubuntuone-client/darwin-os-helper into lp:ubuntuone-client

[Diego Sarmentero]

- Adding MAC OS implementation for platform/os_helper

To run the tests on MAC OS you need to install ubuntuone-storage-protocol, and execute the tests like this:

./run-mac-tests tests/platform/os_helper/

os_helper is the only thing that is working in mac right now, the other modules have dummy implementations to avoid failures with the imports.

[lp:~diegosarmentero/ubuntuone-client/darwin-os-helper]

1257. By Diego Sarmentero on 2012-05-16

reverting and modifying run-tests.bat file

[Mike McCracken (mikemc)]

Two things:

1. the docstring for common.py still says it's for linux

2. os_helper/darwin.py :
move_to_trash() currently always moves to ~/.Trash, which is OK if the file is on the root filesystem, but if it's mounted on a separate volume, it should go into that volume's .Trashes directory at /Volumes/volume_name_goes_here/.Trashes/my_uid_here/file.

This will be useful for folders outside home. I believe it's possible to have home on a separately mounted drive, but I doubt that too many people do that.

It also needs a check for non-existent paths, or else it'll catch the IOError in shutil.move() and try to os.remove() a non-existent path.

Might also want a test for non-existent name handling.

I wrote a version of move_to_trash with /Volumes/ handling a while ago that I never ran because of all the test errors. It had BUGS. I just fixed it, added throwing a useful exception on nonexistent paths, and posted it here: http://paste.ubuntu.com/991189/
it should plug right in, if you'd like to use it.

review: Needs Fixing

[Manuel de la Peña (mandel)]

Adding to the great comments from Mike. I think using the name common is a little misleading, what about unix.py or nix.py to state that is for the *nix flavors of the code.

There are a number of copyrights that are wrong, for example:

115 +# Copyright 2009-2012 Canonical Ltd.

But test_darwin was not there until 2012, or were you hiding it? :)

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-client/darwin-os-helper]

1258. By Diego Sarmentero on 2012-05-17

Improving move_to_trash, adding new tests

1259. By Diego Sarmentero on 2012-05-17

Fixing Files header.

1260. By Diego Sarmentero on 2012-05-17

Fixing move_to_trash not existing file test

[Diego Sarmentero (diegosarmentero)]

> Adding to the great comments from Mike. I think using the name common is a
> little misleading, what about unix.py or nix.py to state that is for the *nix
> flavors of the code.
>
> There are a number of copyrights that are wrong, for example:
>
> 115 +# Copyright 2009-2012 Canonical Ltd.
>
> But test_darwin was not there until 2012, or were you hiding it? :)

Fixed

[lp:~diegosarmentero/ubuntuone-client/darwin-os-helper]

1261. By Diego Sarmentero on 2012-05-17

Fixing os_helper tests

[Diego Sarmentero (diegosarmentero)]

> Two things:
>
> 1. the docstring for common.py still says it's for linux
>
> 2. os_helper/darwin.py :
> move_to_trash() currently always moves to ~/.Trash, which is OK if the file is
> on the root filesystem, but if it's mounted on a separate volume, it should go
> into that volume's .Trashes directory at
> /Volumes/volume_name_goes_here/.Trashes/my_uid_here/file.
>
> This will be useful for folders outside home. I believe it's possible to have
> home on a separately mounted drive, but I doubt that too many people do that.
>
> It also needs a check for non-existent paths, or else it'll catch the IOError
> in shutil.move() and try to os.remove() a non-existent path.
>
> Might also want a test for non-existent name handling.
>
> I wrote a version of move_to_trash with /Volumes/ handling a while ago that I
> never ran because of all the test errors. It had BUGS. I just fixed it, added
> throwing a useful exception on nonexistent paths, and posted it here:
> http://paste.ubuntu.com/991189/
> it should plug right in, if you'd like to use it.

Fixed

[Mike McCracken (mikemc)]

+1

review: Approve

[Manuel de la Peña (mandel)]

Looks good but I wonder if there is a nicer way to do the following:

529 +set_no_rights = unix.set_no_rights
530 +set_file_readonly = unix.set_file_readonly
531 +set_file_readwrite = unix.set_file_readwrite
532 +set_dir_readonly = unix.set_dir_readonly
533 +set_dir_readwrite = unix.set_dir_readwrite
534 +allow_writes = unix.allow_writes
535 +remove_file = unix.remove_file
536 +remove_tree = unix.remove_tree
537 +remove_dir = unix.remove_dir
538 +path_exists = unix.path_exists
539 +make_dir = unix.make_dir
540 +open_file = unix.open_file
541 +rename = unix.rename
542 +native_rename = unix.native_rename
543 +recursive_move = unix.recursive_move
544 +make_link = unix.make_link
545 +read_link = unix.read_link
546 +is_link = unix.is_link
547 +remove_link = unix.remove_link
548 +listdir = unix.listdir
549 +walk = unix.walk
550 +access = unix.access
551 +can_write = unix.can_write
552 +stat_path = unix.stat_path
553 +is_root = unix.is_root
554 +get_path_list = unix.get_path_list
555 +normpath = unix.normpath

I know that simply importing the functions will make them accessible via the darwin package, is there a reason why you are doing it this way? (pyflakes maybe?)

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

> Looks good but I wonder if there is a nicer way to do the following:
>
> 529 +set_no_rights = unix.set_no_rights
> 530 +set_file_readonly = unix.set_file_readonly
> 531 +set_file_readwrite = unix.set_file_readwrite
> 532 +set_dir_readonly = unix.set_dir_readonly
> 533 +set_dir_readwrite = unix.set_dir_readwrite
> 534 +allow_writes = unix.allow_writes
> 535 +remove_file = unix.remove_file
> 536 +remove_tree = unix.remove_tree
> 537 +remove_dir = unix.remove_dir
> 538 +path_exists = unix.path_exists
> 539 +make_dir = unix.make_dir
> 540 +open_file = unix.open_file
> 541 +rename = unix.rename
> 542 +native_rename = unix.native_rename
> 543 +recursive_move = unix.recursive_move
> 544 +make_link = unix.make_link
> 545 +read_link = unix.read_link
> 546 +is_link = unix.is_link
> 547 +remove_link = unix.remove_link
> 548 +listdir = unix.listdir
> 549 +walk = unix.walk
> 550 +access = unix.access
> 551 +can_write = unix.can_write
> 552 +stat_path = unix.stat_path
> 553 +is_root = unix.is_root
> 554 +get_path_list = unix.get_path_list
> 555 +normpath = unix.normpath
>
> I know that simply importing the functions will make them accessible via the
> darwin package, is there a reason why you are doing it this way? (pyflakes
> maybe?)

Yes, pyflakes will say something like:

./ubuntuone/platform/os_helper/linux.py:
    51: 'rename' imported but unused
    51: 'walk' imported but unused
    51: 'set_dir_readwrite' imported but unused
    51: 'allow_writes' imported but unused
    51: 'is_link' imported but unused
    51: 'set_file_readwrite' imported but unused
    51: 'path_exists' imported but unused
    51: 'open_file' imported but unused
    51: 'set_no_rights' imported but unused
    51: 'access' imported but unused
    51: 'read_link' imported but unused
    51: 'remove_dir' imported but unused
    51: 'set_file_readonly' imported but unused
    51: 'listdir' imported but unused
    51: 'can_write' imported but unused
    51: 'remove_tree' imported but unused
    51: 'make_link' imported but unused
    51: 'make_dir' imported but unused
    51: 'native_rename' imported but unused
    51: 'get_path_list' imported but unused
    51: 'recursive_move' imported but unused
    51: 'is_root' imported but unused
    51: 'remove_link' imported but unused
    51: 'normpath' imported but unused
    51: 'set_dir_readonly' imported but unused
    51: 'remove_file' imported but unused
    51: 'stat_path' imported but unused

make: *** [lint] Error 53

[Manuel de la Peña (mandel)]

Ok, then +1

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-05-02 21:53:57 +0000
+++ Makefile.am	2012-05-17 12:59:18 +0000
@@ -54,14 +54,14 @@
 test: logging.conf $(clientdefs_DATA) Makefile
 	echo "$(PYTHONPATH)"
 	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i test_windows.py tests || exit 1; \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i test_windows.py tests/proxy || exit 1; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i "test_windows.py,test_darwin.py" tests || exit 1; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests/proxy || exit 1; \
 	fi
 	rm -rf _trial_temp
 
 test-coverage: logging.conf $(clientdefs_DATA) Makefile
 	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -c -p tests/platform/windows -i test_windows.py tests; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -c -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests; \
 	fi
 	rm -rf _trial_temp
 

=== added file 'run-mac-tests'
--- run-mac-tests	1970-01-01 00:00:00 +0000
+++ run-mac-tests	2012-05-17 12:59:18 +0000
@@ -0,0 +1,47 @@
+#! /bin/bash
+#
+# 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.
+
+PYTHONPATH=../ubuntu-sso-client/:$PYTHONPATH
+
+set -e
+if [ $# -ne 0 ]; then
+    # run specific module given by the caller
+    MODULE="$@"
+else
+    # run all tests, useful for tarmac and reviews
+    MODULE="tests"
+fi
+
+echo "Executing the tests..."
+cp windows/clientdefs.py ubuntuone/clientdefs.py
+cp windows/logging.conf data/logging.conf
+# execute the tests with a number of ignored linux only modules
+python $u1trial --reactor=twisted -i "test_linux.py,test_windows.py" "$MODULE"
+rm -rf _trial_temp
+rm -rf build

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-27 19:38:24 +0000
+++ run-tests.bat	2012-05-17 12:59:18 +0000
@@ -73,8 +73,8 @@
 ECHO Python found, executing the tests...
 COPY windows\clientdefs.py ubuntuone\clientdefs.py
 COPY windows\logging.conf data\logging.conf
-:: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=twisted -c -p tests\platform\linux -i test_linux.py %PARAMS% tests
+:: execute the tests with a number of ignored linux and mac os only modules
+"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=twisted -c -p tests\platform\linux -i "test_linux.py,test_darwin.py" %PARAMS% tests
 
 IF %SKIPLINT% == 1 (
     ECHO Skipping style checks

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

=== added file 'tests/platform/ipc/test_darwin.py'
--- tests/platform/ipc/test_darwin.py	1970-01-01 00:00:00 +0000
+++ tests/platform/ipc/test_darwin.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+#
+# 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.
+"""Tests for the IPC interface."""
+
+
+class IPCTestCase(object):
+    """Empty Implementation"""
+
+
+class StatusTestCase(object):
+    """Empty Implementation"""
+
+
+class EventsTestCase(object):
+    """Empty Implementation"""
+
+
+class SyncDaemonTestCase(object):
+    """Empty Implementation"""
+
+
+class FileSystemTestCase(object):
+    """Empty Implementation"""
+
+
+class SharesTestCase(object):
+    """Empty Implementation"""
+
+
+class ConfigTestCase(object):
+    """Empty Implementation"""
+
+
+class FoldersTestCase(object):
+    """Empty Implementation"""
+
+
+class PublicFilesTestCase(object):
+    """Empty Implementation"""

=== added file 'tests/platform/os_helper/test_darwin.py'
--- tests/platform/os_helper/test_darwin.py	1970-01-01 00:00:00 +0000
+++ tests/platform/os_helper/test_darwin.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,104 @@
+# tests.platform.os_helper - darwin platform tests
+#
+# 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.
+"""Darwin specific tests for the platform module."""
+
+import logging
+import os
+
+from twisted.internet import defer
+from ubuntuone.devtools.handlers import MementoHandler
+
+from tests.platform.os_helper import test_os_helper
+from ubuntuone.platform.os_helper import darwin
+from ubuntuone.platform import (
+    move_to_trash,
+    open_file,
+    set_application_name,
+    stat_path,
+)
+
+
+class OSWrapperTests(test_os_helper.OSWrapperTests):
+    """Tests for os wrapper functions."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set up."""
+        yield super(OSWrapperTests, self).setUp()
+        self.handler = MementoHandler()
+        self.handler.setLevel(logging.DEBUG)
+        self._logger = logging.getLogger('ubuntuone.SyncDaemon')
+        self._logger.addHandler(self.handler)
+        self.addCleanup(self._logger.removeHandler, self.handler)
+        self.patch(darwin.shutil, "move", self._fake_move)
+
+    def _fake_move(*args):
+        """Fake shutil move."""
+        raise Exception("Fail fake move")
+
+    def test_stat_symlink(self):
+        """Test that it doesn't follow symlinks.
+
+        We compare the inode only (enough to see if it's returning info
+        from the link or the linked), as we can not compare the full stat
+        because the st_mode will be different.
+        """
+        link = os.path.join(self.basedir, 'foo')
+        os.symlink(self.testfile, link)
+        self.assertNotEqual(os.stat(link).st_ino, stat_path(link).st_ino)
+        self.assertEqual(os.lstat(link).st_ino, stat_path(link).st_ino)
+
+    def test_set_application_name(self):
+        """Check that the implementation of set_application_name fails."""
+        self.assertRaises(Exception, set_application_name, "test")
+
+    def test_movetotrash_file_bad(self):
+        """Something bad happen when moving to trash, removed anyway."""
+        path = os.path.join(self.basedir, 'foo')
+        open_file(path, 'w').close()
+        move_to_trash(path)
+        self.assertFalse(os.path.exists(path))
+        self.assertTrue(self.handler.check_warning("Problems moving to trash!",
+                                                   "Removing anyway", "foo"))
+
+    def test_movetotrash_file_not_exists(self):
+        """Something bad happen when moving to trash, removed anyway."""
+        path = os.path.join(self.basedir, 'foo2')
+        self.assertFalse(os.path.exists(path))
+        self.assertRaises(OSError, move_to_trash, path)
+
+    def test_movetotrash_dir_bad(self):
+        """Something bad happen when moving to trash, removed anyway."""
+        path = os.path.join(self.basedir, 'foo')
+        os.mkdir(path)
+        open_file(os.path.join(path, 'file inside directory'), 'w').close()
+        move_to_trash(path)
+        self.assertFalse(os.path.exists(path))
+        self.assertTrue(self.handler.check_warning("Problems moving to trash!",
+                                                   "Removing anyway", "foo"))

=== modified file 'ubuntuone/platform/filesystem_notifications/__init__.py'
--- ubuntuone/platform/filesystem_notifications/__init__.py	2012-05-14 21:24:24 +0000
+++ ubuntuone/platform/filesystem_notifications/__init__.py	2012-05-17 12:59:18 +0000
@@ -35,6 +35,10 @@
     from ubuntuone.platform.filesystem_notifications import windows
     FilesystemMonitor = windows.FilesystemMonitor
     _GeneralINotifyProcessor = windows.NotifyProcessor
+elif sys.platform == "darwin":
+    from ubuntuone.platform.filesystem_notifications import darwin
+    FilesystemMonitor = darwin.FilesystemMonitor
+    _GeneralINotifyProcessor = darwin.NotifyProcessor
 else:
     from ubuntuone.platform.filesystem_notifications import linux
     FilesystemMonitor = linux.FilesystemMonitor

=== added file 'ubuntuone/platform/filesystem_notifications/darwin.py'
--- ubuntuone/platform/filesystem_notifications/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/filesystem_notifications/darwin.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 *-*
+#
+# 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.
+"""Filesystem Notifications module for MAC OS."""
+
+
+class FilesystemMonitor(object):
+    """Empty implementation of FilesystemMonitor"""
+
+
+class NotifyProcessor(object):
+    """Empty implementation of NotifyProcessor"""

=== modified file 'ubuntuone/platform/ipc/__init__.py'
--- ubuntuone/platform/ipc/__init__.py	2012-05-01 11:39:00 +0000
+++ ubuntuone/platform/ipc/__init__.py	2012-05-17 12:59:18 +0000
@@ -34,6 +34,9 @@
 if sys.platform == "win32":
     from ubuntuone.platform.ipc import windows as source
     ExternalInterface = source.IPCInterface
+elif sys.platform == "darwin":
+    from ubuntuone.platform.ipc import darwin as source
+    ExternalInterface = source.IPCInterface
 else:
     from ubuntuone.platform.ipc import linux as source
     ExternalInterface = source.DBusInterface

=== added file 'ubuntuone/platform/ipc/darwin.py'
--- ubuntuone/platform/ipc/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/ipc/darwin.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+#
+# 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.
+"""IPC implementation for MAC OS."""
+
+import logging
+
+# Disable the "Invalid Name" check here, as we have lots of DBus style names
+# pylint: disable-msg=C0103
+
+logger = logging.getLogger("ubuntuone.SyncDaemon.DBus")
+
+
+def is_already_running(bus=None):
+    """Return if the sd is running by trying to get the port."""
+
+
+class IPCInterface(object):
+    """Holder of all exposed objects."""

=== modified file 'ubuntuone/platform/logger/__init__.py'
--- ubuntuone/platform/logger/__init__.py	2012-05-14 19:04:43 +0000
+++ ubuntuone/platform/logger/__init__.py	2012-05-17 12:59:18 +0000
@@ -34,6 +34,9 @@
 if sys.platform == "win32":
     from ubuntuone.platform.logger import windows
     source = windows
+elif sys.platform == "darwin":
+    from ubuntuone.platform.logger import darwin
+    source = darwin
 else:
     from ubuntuone.platform.logger import linux
     source = linux

=== added file 'ubuntuone/platform/logger/darwin.py'
--- ubuntuone/platform/logger/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/logger/darwin.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 *-*
+#
+# 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.
+
+
+def get_filesystem_logger():
+    """Return the logger used in the filesystem."""
+
+
+def setup_filesystem_logging(logging_class, root_handler):
+    """Set the syncdameon extra loggin for MAC OS."""
+    # there is nothing yet to be done here.

=== modified file 'ubuntuone/platform/os_helper/__init__.py'
--- ubuntuone/platform/os_helper/__init__.py	2012-04-27 20:38:13 +0000
+++ ubuntuone/platform/os_helper/__init__.py	2012-05-17 12:59:18 +0000
@@ -34,6 +34,9 @@
 if sys.platform == "win32":
     from ubuntuone.platform.os_helper import windows
     source = windows
+elif sys.platform == "darwin":
+    from ubuntuone.platform.os_helper import darwin
+    source = darwin
 else:
     from ubuntuone.platform.os_helper import linux
     source = linux

=== added file 'ubuntuone/platform/os_helper/darwin.py'
--- ubuntuone/platform/os_helper/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/os_helper/darwin.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,110 @@
+# ubuntuone.platform.os_helper - darwin platform imports
+#
+# 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.
+"""
+Darwin import for ubuntuone-client
+
+This module has to have all darwin specific modules and provide the api required
+to support the darwin platform.
+"""
+
+import errno
+import logging
+import os
+import shutil
+
+from ubuntuone.platform.os_helper import unix
+
+platform = "darwin"
+
+logger = logging.getLogger('ubuntuone.SyncDaemon')
+
+
+set_no_rights = unix.set_no_rights
+set_file_readonly = unix.set_file_readonly
+set_file_readwrite = unix.set_file_readwrite
+set_dir_readonly = unix.set_dir_readonly
+set_dir_readwrite = unix.set_dir_readwrite
+allow_writes = unix.allow_writes
+remove_file = unix.remove_file
+remove_tree = unix.remove_tree
+remove_dir = unix.remove_dir
+path_exists = unix.path_exists
+make_dir = unix.make_dir
+open_file = unix.open_file
+rename = unix.rename
+native_rename = unix.native_rename
+recursive_move = unix.recursive_move
+make_link = unix.make_link
+read_link = unix.read_link
+is_link = unix.is_link
+remove_link = unix.remove_link
+listdir = unix.listdir
+walk = unix.walk
+access = unix.access
+can_write = unix.can_write
+stat_path = unix.stat_path
+is_root = unix.is_root
+get_path_list = unix.get_path_list
+normpath = unix.normpath
+
+
+def move_to_trash(path):
+    """Move the file or dir to trash.
+
+    If had any error, or the system can't do it, just remove it.
+
+    Handles the case where path lies on a removable volume.
+    """
+    full_path = os.path.abspath(path)
+
+    if not path_exists(full_path):
+        raise OSError(errno.ENOENT, 'File could %r not be found.' % full_path)
+    if full_path.startswith("/Volumes/"):
+        components = full_path.split(os.path.sep)
+        vol_components = components[:3]
+        file_components = [".Trashes", str(os.geteuid()),
+                           os.path.basename(full_path)]
+        trashpath = os.path.sep.join(vol_components + file_components)
+    else:
+        trashpath = os.path.expanduser("~/.Trash")
+
+    try:
+        shutil.move(path, trashpath)
+    except Exception, reason:
+        logger.warning("Problems moving to trash! (%r) Removing anyway: %r",
+                       reason, path)
+        if os.path.isdir(path):
+            shutil.rmtree(path)
+        else:
+            os.remove(path)
+
+
+def set_application_name(app_name):
+    """Set the name of the application."""
+    raise Exception("This is not the way to do it on OS X")

=== modified file 'ubuntuone/platform/os_helper/linux.py'
--- ubuntuone/platform/os_helper/linux.py	2012-04-27 20:38:13 +0000
+++ ubuntuone/platform/os_helper/linux.py	2012-05-17 12:59:18 +0000
@@ -39,7 +39,6 @@
 import logging
 import os
 import shutil
-import stat
 import sys
 
 if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
@@ -49,140 +48,13 @@
     from gi.repository import Gio, GLib
     has_gi = True
 
-from contextlib import contextmanager
+from ubuntuone.platform.os_helper import unix
 
 platform = "linux2"
 
 logger = logging.getLogger('ubuntuone.SyncDaemon')
 
 
-def set_no_rights(path):
-    """Remove all rights from the file."""
-    os.chmod(path, 0o000)
-
-
-def set_file_readonly(path):
-    """Change path permissions to readonly in a file."""
-    os.chmod(path, 0444)
-
-
-def set_file_readwrite(path):
-    """Change path permissions to readwrite in a file."""
-    os.chmod(path, 0664)
-
-
-def set_dir_readonly(path):
-    """Change path permissions to readonly in a dir."""
-    os.chmod(path, 0555)
-
-
-def set_dir_readwrite(path):
-    """Change path permissions to readwrite in a dir."""
-    os.chmod(path, 0775)
-
-
-@contextmanager
-def allow_writes(path):
-    """A very simple context manager to allow writting in RO dirs."""
-    prev_mod = stat.S_IMODE(os.stat(path).st_mode)
-    os.chmod(path, 0755)
-    yield
-    os.chmod(path, prev_mod)
-
-
-def remove_file(path):
-    """Remove a file."""
-    os.remove(path)
-
-
-def remove_tree(path):
-    """Remove a dir and all its children."""
-    shutil.rmtree(path)
-
-
-def remove_dir(path):
-    """Remove a dir."""
-    os.rmdir(path)
-
-
-def path_exists(path):
-    """Return if the path exists."""
-    return os.path.exists(path)
-
-
-def make_dir(path, recursive=False):
-    """Make a dir, optionally creating all the middle ones."""
-    if recursive:
-        os.makedirs(path)
-    else:
-        os.mkdir(path)
-
-
-def open_file(path, mode='r'):
-    """Open a file."""
-    return open(path, mode)
-
-
-def rename(path_from, path_to):
-    """Rename a file or directory."""
-    os.rename(path_from, path_to)
-
-
-def native_rename(path_from, path_to):
-    """Rename a file or directory."""
-    os.rename(path_from, path_to)
-
-
-def recursive_move(path_from, path_to):
-    """Perform a recursive move."""
-    shutil.move(path_from, path_to)
-
-
-def make_link(target, destination):
-    """Create a link from the destination to the target."""
-    os.symlink(target, destination)
-
-
-def read_link(path):
-    """Read the destination of a link."""
-    return os.readlink(path)
-
-
-def is_link(path):
-    """Returns if a path is a link or not."""
-    return os.path.islink(path)
-
-
-def remove_link(path):
-    """Removes a link."""
-    if is_link(path):
-        os.unlink(path)
-
-
-def listdir(directory):
-    """List a directory."""
-    return os.listdir(directory)
-
-
-def walk(path, topdown=True):
-    return os.walk(path, topdown)
-
-
-def access(path):
-    """Return if the path is at least readable."""
-    return os.access(path, os.R_OK)
-
-
-def can_write(path):
-    """Return if the path can be written to."""
-    return os.access(path, os.W_OK)
-
-
-def stat_path(path):
-    """Return stat info about a path."""
-    return os.lstat(path)
-
-
 def move_to_trash(path):
     """Move the file or dir to trash.
 
@@ -224,16 +96,30 @@
         gobject.set_application_name(app_name)
 
 
-def is_root():
-    """Return if the user is running as root."""
-    return not os.geteuid()
-
-
-def get_path_list(path):
-    """Return a list with the diff components of the path."""
-    return os.path.abspath(path).split(os.path.sep)
-
-
-def normpath(path):
-    """Normalize path, eliminating double slashes, etc."""
-    return os.path.normpath(path)
+set_no_rights = unix.set_no_rights
+set_file_readonly = unix.set_file_readonly
+set_file_readwrite = unix.set_file_readwrite
+set_dir_readonly = unix.set_dir_readonly
+set_dir_readwrite = unix.set_dir_readwrite
+allow_writes = unix.allow_writes
+remove_file = unix.remove_file
+remove_tree = unix.remove_tree
+remove_dir = unix.remove_dir
+path_exists = unix.path_exists
+make_dir = unix.make_dir
+open_file = unix.open_file
+rename = unix.rename
+native_rename = unix.native_rename
+recursive_move = unix.recursive_move
+make_link = unix.make_link
+read_link = unix.read_link
+is_link = unix.is_link
+remove_link = unix.remove_link
+listdir = unix.listdir
+walk = unix.walk
+access = unix.access
+can_write = unix.can_write
+stat_path = unix.stat_path
+is_root = unix.is_root
+get_path_list = unix.get_path_list
+normpath = unix.normpath

=== added file 'ubuntuone/platform/os_helper/unix.py'
--- ubuntuone/platform/os_helper/unix.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/os_helper/unix.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,186 @@
+# -*- encoding: utf-8 -*-
+#
+# 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.
+"""
+Unix import for ubuntuone-client
+
+This module has to have all unix specific modules and provide the api required
+to support unix-like platform.
+"""
+
+import logging
+import os
+import shutil
+import stat
+
+from contextlib import contextmanager
+
+
+logger = logging.getLogger('ubuntuone.SyncDaemon')
+
+
+def set_no_rights(path):
+    """Remove all rights from the file."""
+    os.chmod(path, 0o000)
+
+
+def set_file_readonly(path):
+    """Change path permissions to readonly in a file."""
+    os.chmod(path, 0444)
+
+
+def set_file_readwrite(path):
+    """Change path permissions to readwrite in a file."""
+    os.chmod(path, 0664)
+
+
+def set_dir_readonly(path):
+    """Change path permissions to readonly in a dir."""
+    os.chmod(path, 0555)
+
+
+def set_dir_readwrite(path):
+    """Change path permissions to readwrite in a dir."""
+    os.chmod(path, 0775)
+
+
+@contextmanager
+def allow_writes(path):
+    """A very simple context manager to allow writting in RO dirs."""
+    prev_mod = stat.S_IMODE(os.stat(path).st_mode)
+    os.chmod(path, 0755)
+    yield
+    os.chmod(path, prev_mod)
+
+
+def remove_file(path):
+    """Remove a file."""
+    os.remove(path)
+
+
+def remove_tree(path):
+    """Remove a dir and all its children."""
+    shutil.rmtree(path)
+
+
+def remove_dir(path):
+    """Remove a dir."""
+    os.rmdir(path)
+
+
+def path_exists(path):
+    """Return if the path exists."""
+    return os.path.exists(path)
+
+
+def make_dir(path, recursive=False):
+    """Make a dir, optionally creating all the middle ones."""
+    if recursive:
+        os.makedirs(path)
+    else:
+        os.mkdir(path)
+
+
+def open_file(path, mode='r'):
+    """Open a file."""
+    return open(path, mode)
+
+
+def rename(path_from, path_to):
+    """Rename a file or directory."""
+    os.rename(path_from, path_to)
+
+
+def native_rename(path_from, path_to):
+    """Rename a file or directory."""
+    os.rename(path_from, path_to)
+
+
+def recursive_move(path_from, path_to):
+    """Perform a recursive move."""
+    shutil.move(path_from, path_to)
+
+
+def make_link(target, destination):
+    """Create a link from the destination to the target."""
+    os.symlink(target, destination)
+
+
+def read_link(path):
+    """Read the destination of a link."""
+    return os.readlink(path)
+
+
+def is_link(path):
+    """Returns if a path is a link or not."""
+    return os.path.islink(path)
+
+
+def remove_link(path):
+    """Removes a link."""
+    if is_link(path):
+        os.unlink(path)
+
+
+def listdir(directory):
+    """List a directory."""
+    return os.listdir(directory)
+
+
+def walk(path, topdown=True):
+    return os.walk(path, topdown)
+
+
+def access(path):
+    """Return if the path is at least readable."""
+    return os.access(path, os.R_OK)
+
+
+def can_write(path):
+    """Return if the path can be written to."""
+    return os.access(path, os.W_OK)
+
+
+def stat_path(path):
+    """Return stat info about a path."""
+    return os.lstat(path)
+
+
+def is_root():
+    """Return if the user is running as root."""
+    return not os.geteuid()
+
+
+def get_path_list(path):
+    """Return a list with the diff components of the path."""
+    return os.path.abspath(path).split(os.path.sep)
+
+
+def normpath(path):
+    """Normalize path, eliminating double slashes, etc."""
+    return os.path.normpath(path)

=== modified file 'ubuntuone/platform/session/__init__.py'
--- ubuntuone/platform/session/__init__.py	2012-04-27 19:30:11 +0000
+++ ubuntuone/platform/session/__init__.py	2012-05-17 12:59:18 +0000
@@ -41,6 +41,9 @@
 if sys.platform == "win32":
     from ubuntuone.platform.session import windows
     source = windows
+elif sys.platform == "darwin":
+    from ubuntuone.platform.session import darwin
+    source = darwin
 else:
     from ubuntuone.platform.session import linux
     source = linux

=== added file 'ubuntuone/platform/session/darwin.py'
--- ubuntuone/platform/session/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/session/darwin.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 *-*
+#
+# 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.
+"""Inhibit session logout when busy."""
+
+from twisted.internet import defer
+
+
+class Inhibitor(object):
+    """An object representing an inhibition, that can be cancelled."""
+
+    def inhibit(self, flags, reason):
+        """Inhibit some events with a given reason."""
+        return defer.succeed(None)
+
+    def cancel(self):
+        """Cancel the inhibition for the current cookie."""
+        return defer.succeed(None)

=== modified file 'ubuntuone/platform/tools/__init__.py'
--- ubuntuone/platform/tools/__init__.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/tools/__init__.py	2012-05-17 12:59:18 +0000
@@ -39,6 +39,9 @@
 if sys.platform == 'win32':
     from ubuntuone.platform.tools import windows
     source = windows
+elif sys.platform == 'darwin':
+    from ubuntuone.platform.tools import darwin
+    source = darwin
 else:
     from ubuntuone.platform.tools import linux
     source = linux

=== added file 'ubuntuone/platform/tools/darwin.py'
--- ubuntuone/platform/tools/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/tools/darwin.py	2012-05-17 12:59:18 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+#
+# 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.
+"""SyncDaemon Tools."""
+
+
+def is_already_running(*arg):
+    """Empty implementation for MAC OS"""
+
+
+class IPCError(object):
+    """Empty implementation for MAC OS"""
+
+    def __init__(self, *args):
+        """Empty implementation for MAC OS"""
+
+
+class SyncDaemonToolProxy(object):
+    """Empty implementation for MAC OS"""
+
+    def __init__(self, *args):
+        """Empty implementation for MAC OS"""