Merge lp:~andrea.corbellini/beeseek/cross-platform-setup into lp:beeseek/1.0

[Andrea Corbellini]

[Andrea Corbellini (andrea.corbellini)]

This branch drastically improves the support for the directory structure of Windows.
The changed parts are the BeeSeek code and the setup script. Now the default values for the paths are calculated depending on the operating system.

If possible, we should do proper tests on a Windows machine before the beta 3 milestone, so I'm putting this branch on the review queue.

[lp:~andrea.corbellini/beeseek/cross-platform-setup]

301. By Andrea Corbellini on 2009-08-22

Merge with trunk.

[Daniele Napolitano (dnax88)]

review: Needs Fixing

[Daniele Napolitano (dnax88)]

After ~2 sec beeseek-peer crash.

$ beeseek-peer start --user dnax --debug
PeerSession: Starting up...
PeerSession:DEBUG: Lock file created at /var/lock/beeseek-peer.pid
PeerSession: Session started with arguments
'/usr/local/bin/beeseek-peer start --user dnax --debug'
PeerSession: Bound address localhost:8080
PeerSession: Bound address localhost:4096
PeerSession: Running as user dnax
PeerSession: Bound address /var/lock/beeseek-peer.sock
PeerSession: Database connected
Traceback (most recent call last):
 File "/usr/local/bin/beeseek-peer", line 21, in <module>
   PeerSession()
 File "/usr/local/lib/python2.6/dist-packages/beeseek/app/session.py",
line 278, in __init__
   self.run(arguments)
 File "/usr/local/lib/python2.6/dist-packages/beeseek/app/session.py",
line 308, in run
   command_obj(self, *arguments)
 File "/usr/local/lib/python2.6/dist-packages/beeseek/app/session.py",
line 559, in start
   self.setup()
 File "/usr/local/lib/python2.6/dist-packages/beeseek/app/peer/main.py",
line 74, in setup
   server.greet()
 File "/usr/local/lib/python2.6/dist-packages/beeseek/web/protocols/bsnp.py",
line 90, in greet
   self._recv_greeting(2)
 File "/usr/local/lib/python2.6/dist-packages/beeseek/web/protocols/bsnp.py",
line 75, in _recv_greeting
   raise NotImplementedError
NotImplementedError
PeerSession:ERROR: Daemon not started

review: Needs Fixing

[Andrea Corbellini (andrea.corbellini)]

The error that you are experiencing is not related to the setup script. You are seeing it because the version of the server running on beeseek.org is different by your local instance.

However it seems that everything was installed fine, so I'm approving and merging this branch.

Thank you very much for the log, Daniele! :)

> After ~2 sec beeseek-peer crash.
>
> $ beeseek-peer start --user dnax --debug
> PeerSession: Starting up...
> PeerSession:DEBUG: Lock file created at /var/lock/beeseek-peer.pid
> PeerSession: Session started with arguments
> '/usr/local/bin/beeseek-peer start --user dnax --debug'
> PeerSession: Bound address localhost:8080
> PeerSession: Bound address localhost:4096
> PeerSession: Running as user dnax
> PeerSession: Bound address /var/lock/beeseek-peer.sock
> PeerSession: Database connected
> Traceback (most recent call last):
> File "/usr/local/bin/beeseek-peer", line 21, in <module>
> PeerSession()
> File "/usr/local/lib/python2.6/dist-packages/beeseek/app/session.py",
> line 278, in __init__
> self.run(arguments)
> File "/usr/local/lib/python2.6/dist-packages/beeseek/app/session.py",
> line 308, in run
> command_obj(self, *arguments)
> File "/usr/local/lib/python2.6/dist-packages/beeseek/app/session.py",
> line 559, in start
> self.setup()
> File "/usr/local/lib/python2.6/dist-packages/beeseek/app/peer/main.py",
> line 74, in setup
> server.greet()
> File "/usr/local/lib/python2.6/dist-packages/beeseek/web/protocols/bsnp.py",
> line 90, in greet
> self._recv_greeting(2)
> File "/usr/local/lib/python2.6/dist-packages/beeseek/web/protocols/bsnp.py",
> line 75, in _recv_greeting
> raise NotImplementedError
> NotImplementedError
> PeerSession:ERROR: Daemon not started

review: Approve

[lp:~andrea.corbellini/beeseek/cross-platform-setup]

302. By Andrea Corbellini on 2009-08-28

Merge with trunk.

=== modified file 'beeseek/app/directory.py'
--- beeseek/app/directory.py	2009-07-09 11:37:49 +0000
+++ beeseek/app/directory.py	2009-07-14 16:07:24 +0000
@@ -15,24 +15,37 @@
 
 import os
 import stat
+import sys
 import tempfile
 
 
-tempdirs = tempfile._candidate_tempdir_list()
+lockdirs = tempfile._candidate_tempdir_list()
+if os.name != 'nt':
+    lockdirs.insert(0, '/var/lock')
 
 class Directory(object):
 
     __slots__ = 'dirlist', '_mode', '_subdirs', '_directory', '_create'
 
-    def __init__(self, dirlist, **kwargs):
+    def __init__(self, dirlist, mode='rw', subdirs=(), create=False,
+                 adjust=False):
         if isinstance(dirlist, basestring):
             dirlist = (dirlist,)
+        if adjust and os.name == 'nt':
+            dirlist = self._adjust_for_win(dirlist)
         self.dirlist = tuple(os.path.normcase(os.path.abspath(
                              os.path.expanduser(directory)))
                              for directory in dirlist)
-        self._mode = kwargs.get('mode', 'rw')
-        self._subdirs = kwargs.get('subdirs', ())
-        self._create = kwargs.get('create', ())
+        self._mode = mode
+        self._subdirs = subdirs
+        self._create = create
+
+    def _adjust_for_win(self, dirlist):
+        basepath = os.path.dirname(sys.executable)
+        for directory in dirlist:
+            yield os.path.join(basepath,
+                               'BeeSeek',
+                               os.path.basename(directory))
 
     def _check_permissions(self, directory):
         strmode = self._mode
@@ -41,7 +54,6 @@
         stat_result = os.stat(directory)
         usermode = groupmode = othermode = 0
 
-        # _issuitable() should be called rarely so we can use hasattr() here
         if not hasattr(os, 'getuid') or stat_result.st_uid == os.getuid():
             if 'r' in strmode:
                 usermode = stat.S_IXUSR
 
=== modified file 'beeseek/app/options.py'
--- beeseek/app/options.py	2009-07-11 12:46:12 +0000
+++ beeseek/app/options.py	2009-07-14 16:10:16 +0000
@@ -15,7 +15,7 @@
 
 import os
 from beeseek.app import instance
-from beeseek.app.directory import Directory, tempdirs
+from beeseek.app.directory import Directory, lockdirs
 from beeseek.ui import BaseUserInterface, html
 from beeseek.interface import Interface, implements
 
@@ -212,7 +212,7 @@
     lockdir = Option(Directory, 'LockDirectory',
         ('-L', '--lock-dir'), None,
         'The directory for lock files.',
-        default=['/var/lock'] + tempdirs,
+        default=lockdirs,
         convert_default=True)
 
     user = Option(str, 'User',
@@ -235,7 +235,8 @@
         convert_kwargs={
             'subdirs': ('keywords', 'pages', 'configuration',
                         'statistics', 'keys', 'needed-results'),
-            'create': True})
+            'create': True,
+            'adjust': True})
 
     daemon = Option(bool, 'Daemon',
         ('-b', '--daemon'), ('-f', '--foreground'),
@@ -254,7 +255,9 @@
         testing_default='webdata',
         convert_default=True,
         convert_kwargs={
-            'mode': 'r', 'subdirs': ('css', 'html', 'images', 'javascript')})
+            'mode': 'r',
+            'subdirs': ('css', 'html', 'images', 'javascript'),
+            'adjust': True})
 
     server_hostname = Option(str, 'ServerHostname',
         ('-s', '--server'), None,
 
=== modified file 'beeseek/app/session.py'
--- beeseek/app/session.py	2009-07-12 16:46:07 +0000
+++ beeseek/app/session.py	2009-07-14 16:10:16 +0000
@@ -200,7 +200,10 @@
     scriptname = os.path.basename(sys.argv[0])
 
     # Configuration
-    configdir = Directory(('/etc/beeseek', '~/.beeseek', 'config'), mode='r')
+    # XXX This should be set elsewhere
+    configdir = Directory(('/etc/beeseek', 'config'),
+                          mode='r',
+                          adjust=True)
     logfile = open(os.devnull, 'w')
 
     # Server specific objects and methods
 
=== modified file 'setup.py'
--- setup.py	2009-07-05 19:05:50 +0000
+++ setup.py	2009-07-14 16:10:39 +0000
@@ -23,19 +23,34 @@
 import os
 from distutils.core import setup
 from distutils.command.install_data import install_data
-import pwd
+try:
+    import pwd
+except ImportError:
+    pwd = None
 import beeseek
 
 
 class configure_and_install_data(install_data):
 
+    def initialize_options(self):
+        install_data.initialize_options(self)
+        if os.name != 'nt':
+            self.install_dir = '/'
+
     def run(self):
         data_files = self.data_files = []
-        dirs_map = {
-           'etc/beeseek': 'config',
-           'var/lib/beeseek/database': 'database',
-           'usr/share/beeseek/webdata': 'webdata'
-        }
+        if os.name == 'nt':
+            dirs_map = {
+                'BeeSeek/config': 'config',
+                'BeeSeek/database': 'database',
+                'BeeSeek/webdata': 'webdata'
+            }
+        else:
+            dirs_map = {
+               'etc/beeseek': 'config',
+               'var/lib/beeseek/database': 'database',
+               'usr/share/beeseek/webdata': 'webdata'
+            }
 
         for destination, source in dirs_map.iteritems():
             sourcelen = len(source) + 1
@@ -46,20 +61,23 @@
                 data_files.append((path, subfiles))
 
         install_data.run(self)
-        self.mkpath(os.path.join(self.install_dir, 'etc/init.d'))
-        self.copy_file('beeseek-peer.init',
-                       os.path.join(self.install_dir,
-                                    'etc/init.d/beeseek-peer'))
-        self.mkpath(os.path.join(self.install_dir, 'var/log/beeseek'))
-
-        items = pwd.getpwnam('www-data')
-        uid, gid = items[2], items[3]
-        for path in ('var/log/beeseek', 'var/lib/beeseek'):
-            path = os.path.join(self.install_dir, path)
-            for directory, subdirs, subfiles in os.walk(path):
-                os.chown(directory, uid, gid)
-                for filename in subfiles:
-                    os.chown(os.path.join(directory, filename), uid, gid)
+
+        if os.name != 'nt':
+            self.mkpath(os.path.join(self.install_dir, 'etc/init.d'))
+            self.copy_file('beeseek-peer.init',
+                           os.path.join(self.install_dir,
+                                        'etc/init.d/beeseek-peer'))
+            self.mkpath(os.path.join(self.install_dir, 'var/log/beeseek'))
+
+        if not self.dry_run and pwd:
+            items = pwd.getpwnam('www-data')
+            uid, gid = items[2], items[3]
+            for path in ('var/log/beeseek', 'var/lib/beeseek'):
+                path = os.path.join(self.install_dir, path)
+                for directory, subdirs, subfiles in os.walk(path):
+                    os.chown(directory, uid, gid)
+                    for filename in subfiles:
+                        os.chown(os.path.join(directory, filename), uid, gid)
 
 
 def add_packages(metadata):