Merge lp:~xavinsky/openerp/2bugfix-and-doc into lp:openerp

[xavinsky]

  Bugs fix :
  - create the folder 'server/bin/addons/' if not exist
  - change repository client-web for version >= 6.0

  Messages fix :
  - old link inactive http://test.openobject.com
    changed by https://launchpad.net/openobject

  New :
  - add the repository doc : ~openerp-community/openobject-doc/<version>

  PEP8 :
  - compliance ok with py.test --pep8

  Unit test :
  - test install and upgrade for all version  Bugs fix :
  - create the folder 'server/bin/addons/' if not exist
  - change repository client-web for version >= 6.0

[xavinsky (xavinsky)]

 ./test_bzr_set.py
Test Install Version 4.2
new branch of lp:~openerp-commiter/openobject-addons/4.2-extra-addons into /MYFOLDER/openerp/TestBzrSet/4.2/addons-extra
new branch of lp:~openerp/openobject-client-web/4.2 into /MYFOLDER/openerp/TestBzrSet/4.2/web
new branch of lp:~openerp-community/openobject-addons/trunk-addons-community into /MYFOLDER/openerp/TestBzrSet/4.2/addons-community
new branch of lp:~openerp/openobject-server/4.2 into /MYFOLDER/openerp/TestBzrSet/4.2/server
new branch of lp:~openerp/openobject-client/4.2 into /MYFOLDER/openerp/TestBzrSet/4.2/client
new branch of lp:~openerp-community/openobject-doc/5.0 into /MYFOLDER/openerp/TestBzrSet/4.2/doc
new branch of lp:~openerp/openobject-addons/4.2 into /MYFOLDER/openerp/TestBzrSet/4.2/addons
(Re)Computing Symbolic links...
===============================================================================
Sources of OpenERP have been installed. If you develop new features,
you can get more information on how to contribute to the project here:
 https://launchpad.net/openobject
===============================================================================
Duration : 2 minutes 40.22 secondes
Test Install Version 5.0
new branch of lp:~openerp-commiter/openobject-addons/stable_5.0-extra-addons into /MYFOLDER/openerp/TestBzrSet/5.0/addons-extra
new branch of lp:~openerp/openobject-client-web/5.0 into /MYFOLDER/openerp/TestBzrSet/5.0/web
new branch of lp:~openerp-community/openobject-addons/trunk-addons-community into /MYFOLDER/openerp/TestBzrSet/5.0/addons-community
new branch of lp:~openerp/openobject-server/5.0 into /MYFOLDER/openerp/TestBzrSet/5.0/server
new branch of lp:~openerp/openobject-client/5.0 into /MYFOLDER/openerp/TestBzrSet/5.0/client
new branch of lp:~openerp-community/openobject-doc/5.0 into /MYFOLDER/openerp/TestBzrSet/5.0/doc
new branch of lp:~openerp/openobject-addons/5.0 into /MYFOLDER/openerp/TestBzrSet/5.0/addons
(Re)Computing Symbolic links...
===============================================================================
Sources of OpenERP have been installed. If you develop new features,
you can get more information on how to contribute to the project here:
 https://launchpad.net/openobject
===============================================================================
Duration : 7 minutes 40.60 secondes
Test Install Version 6.0
new branch of lp:~openerp-commiter/openobject-addons/extra-6.0 into /MYFOLDER/openerp/TestBzrSet/6.0/addons-extra
new branch of lp:~openerp/openobject-client-web/6.0 into /MYFOLDER/openerp/TestBzrSet/6.0/web
new branch of lp:~openerp-community/openobject-addons/trunk-addons-community into /MYFOLDER/openerp/TestBzrSet/6.0/addons-community
new branch of lp:~openerp/openobject-server/6.0 into /MYFOLDER/openerp/TestBzrSet/6.0/server
new branch of lp:~openerp/openobject-client/6.0 into /MYFOLDER/openerp/TestBzrSet/6.0/client
new branch of lp:~openerp-community/openobject-doc/6.0 into /MYFOLDER/openerp/TestBzrSet/6.0/doc
new branch of lp:~openerp/openobject-addons/6.0 into /MYFOLDER/openerp/TestBzrSet/6.0/addons
(Re)Computing Symbolic links...
===============================================================================
Sources of Open...

review: Approve (unit test ok (56 minutes))

Unmerged revisions

42. By xavinsky on 2011-10-07

Fix Message :
old link inactive http://test.openobject.com
changed by https://launchpad.net/openobject

41. By xavinsky on 2011-10-07

UnitTest : add test install and upgrade all version with bzr_set
Note : this test is a very long test : near 40 minutes with good connexion.

40. By xavinsky on 2011-10-07

fix : use dest_dir for create addons folders.

39. By xavinsky on 2011-10-07

add pep8 complaince
bug fix create folder before bzr

38. By xavinsky on 2011-10-03

Bugs fix :
- create the folder 'server/bin/addons/' if not exist
- change repository client-web for version >= 6.0

New :
- add the repository doc : ~openerp-community/openobject-doc/<version>

=== modified file 'bzr_set.py'
--- bzr_set.py	2011-03-07 10:59:15 +0000
+++ bzr_set.py	2011-10-07 13:03:45 +0000
@@ -2,23 +2,16 @@
 
 __all__ = ['update_openerp']
 
+
 import os
-import shutil
-import glob
 import bzrlib.builtins
+from shutil import rmtree
+from glob import glob
 from bzrlib.plugins import launchpad
 from bzrlib.branch import Branch
 from bzrlib.errors import NotBranchError
 from bzrlib.revisionspec import RevisionSpec
 
-def run_cmd(cmdname, *args, **kwargs):
-    f = getattr(bzrlib.builtins, 'cmd_' + cmdname)()
-    if hasattr(f, '_setup_outf'):
-        # old versions of bzr does not have this function   
-        # this function must be called to avoid a exception in bzr code
-        f._setup_outf()
-    return f.run(*args, **kwargs)
-
 _VERSIONS = ('4.2', '5.0', '6.0', 'trunk')
 _DEFAULT_VERSION = '6.0'
 _EXTRA_ADDONS_MAP = {
@@ -28,10 +21,21 @@
     'trunk': 'trunk-extra-addons',
 }
 
-def update_openerp(dest_dir, version=_DEFAULT_VERSION, lplogin=None, export=False, revision=None, verbose=False):
+
+def run_cmd(cmdname, *args, **kwargs):
+    f = getattr(bzrlib.builtins, 'cmd_' + cmdname)()
+    if hasattr(f, '_setup_outf'):
+        # old versions of bzr does not have this function
+        # this function must be called to avoid a exception in bzr code
+        f._setup_outf()
+    return f.run(*args, **kwargs)
+
+
+def update_openerp(dest_dir, version=_DEFAULT_VERSION, lplogin=None,
+                   export=False, revision=None, verbose=False):
     """
         if lplogin == None -> make a branch instead of a checkout
-        if export == True -> bzr export 
+        if export == True -> bzr export
         if revision is provided, get the branches at this revision
             more information with:
                 $> bzr help revisionspec
@@ -59,10 +63,30 @@
         'server': (BASEURL + '~openerp/openobject-server/' + version, True),
         'client': (BASEURL + '~openerp/openobject-client/' + version, True),
         'addons': (BASEURL + '~openerp/openobject-addons/' + version, True),
-        'addons-extra': (BASEURL + '~openerp-commiter/openobject-addons/' + extraversion, False),
-        'addons-community': (BASEURL + '~openerp-community/openobject-addons/' + communityversion + '-addons-community', False),
-        'web': (BASEURL + '~openerp/openobject-client-web/' + webversion, True),
+        'addons-extra': (BASEURL + '~openerp-commiter/openobject-addons/' +
+                         extraversion, False),
+        'addons-community': (BASEURL +
+                             '~openerp-community/openobject-addons/' +
+                             communityversion + '-addons-community', False),
     }
+    if version in ('4.2', '5.0', '6.0'):
+        bzr_repository['web'] = (BASEURL + '~openerp/openobject-client-web/' +
+                               version, True)
+    else:
+        bzr_repository['web'] = (BASEURL + '~openerp/openerp-web/' + version,
+                               True)
+
+    if version in ('4.2', '5.0'):
+        bzr_repository['doc'] = (BASEURL +
+                               '~openerp-community/openobject-doc/5.0', True)
+    elif version in ('6.0', ):
+        bzr_repository['doc'] = (BASEURL +
+                               '~openerp-community/openobject-doc/6.0', True)
+    elif version in ('trunk',):
+        bzr_repository['doc'] = (BASEURL +
+                               '~openerp-community/openobject-doc/6.1', True)
+
+    bzr_folders_links = ['server/bin/addons/', ]
 
     bzr_links = {
         'addons/*': 'server/bin/addons/',
@@ -70,11 +94,14 @@
 
     if branch:
         cmd = {'new': lambda u, l, r: run_cmd('branch', u, l, revision=r),
-               'update': lambda u, l, r: run_cmd('pull', u, directory=l, overwrite=True, revision=r),
+               'update': lambda u, l, r: run_cmd('pull', u, directory=l,
+                                                 overwrite=True, revision=r),
         }
     else:
-        cmd = {'new': lambda u, l, r: run_cmd('checkout', u, l, lightweight=True, revision=r),
-               'update': lambda u, l, r: run_cmd('update', l), # no revision option :(
+        cmd = {'new': lambda u, l, r: run_cmd('checkout', u, l,
+                                              lightweight=True, revision=r),
+               # no revision option for update :(
+               'update': lambda u, l, r: run_cmd('update', l),
         }
     cmd['export'] = lambda u, l, r: run_cmd('export', l, u, revision=r)
 
@@ -88,17 +115,18 @@
         typ = ['checkout', 'branch'][branch]
         if export:
             if os.path.exists(local):
-                shutil.rmtree(local)
+                rmtree(local)
             status = 'export'
             typ = 'sources'
         else:
             try:
                 b = Branch.open(local)
-                # FIXME check that the current workingDirectory is a branch or a checkout
+                # FIXME check that the current workingDirectory is a branch or
+                # a checkout
                 status = 'update'
             except NotBranchError:
                 status = 'new'
-        
+
         frm = bzrdir
         rev = None
         if revision and (not revision.startswith('tag:') or has_tags):
@@ -106,24 +134,30 @@
             rev = RevisionSpec.from_string(revision)
 
         log(msg % {'status': status, 'type': typ, 'to': local, 'from': frm})
-                
+
         cmd[status](bzrdir, local, rev and [rev] or None)
 
+    for folder_links in bzr_folders_links:
+        if not os.path.exists(os.path.join(dest_dir, folder_links)):
+            os.makedirs(os.path.join(dest_dir, folder_links))
+
     # Doing symlinks
     log('(Re)Computing Symbolic links...')
-    for src2,dest2 in bzr_links.items():
+    for src2, dest2 in bzr_links.items():
         src2 = os.path.join(dest_dir, src2)
         dest2 = os.path.join(dest_dir, dest2)
-        for src in glob.glob(src2):
+        for src in glob(src2):
             dest = os.path.join(dest2, os.path.basename(src))
             if not os.path.isdir(dest):
                 os.symlink(os.path.realpath(src), dest)
 
-    log('='*79)
-    log('Sources of OpenERP have been installed. If you develop new features,')
-    log('you can get more information on how to contribute to the project here:')
-    log('\thttp://test.openobject.com')
-    log('='*79)
+    log('=' * 79)
+    log('Sources of OpenERP have been installed. ' +
+        'If you develop new features,')
+    log('you can get more information on how to ' +
+        'contribute to the project here:')
+    log('\thttps://launchpad.net/openobject')
+    log('=' * 79)
 
 #
 # Testing bzr send
@@ -131,18 +165,29 @@
 
 if __name__ == '__main__':
     import optparse
-    description = """Tool that allows you to get the last sources of openerp on launchpad.
-It downloads all branches, and create symlinks for addons in the server. By
-default, it loads the latest stable version.
+    description = """Tool that allows you to get the last sources of openerp on
+launchpad. It downloads all branches, and create symlinks for addons in the
+server. By default, it loads the latest stable version.
 """
-    parser = optparse.OptionParser(description=description, 
+    parser = optparse.OptionParser(description=description,
                                    usage="%prog [options] [directory]")
-    parser.add_option('--checkout', dest='lplogin', help="Specify the launchpad login to make a checkout instead of a branch")
-    parser.add_option('--export', dest='export', help='Make an export of the sources, instead of branches', action='store_true', default=False)
-    parser.add_option('-v', dest="version", default=_DEFAULT_VERSION, type="choice", choices=_VERSIONS, help="Specify the version to take (trunk, 4.2, 5.0, 6.0)")
-    parser.add_option('-r', dest="revision", default=None, help="Specify the revision to take. (useful to take a specific TAG or to specify a DATE)")
-    parser.add_option('-q', '--quiet', dest='quiet', help='Suppress the output', action='store_true', default=False)
+    parser.add_option('--checkout', dest='lplogin',
+                      help="Specify the launchpad login to make a checkout " +
+                      "instead of a branch")
+    parser.add_option('--export', dest='export',
+                      help='Make an export of the sources, instead of ' +
+                      'branches', action='store_true', default=False)
+    parser.add_option('-v', dest="version", default=_DEFAULT_VERSION,
+                      type="choice", choices=_VERSIONS,
+                      help="Specify the version to take " +
+                      "(trunk, 4.2, 5.0, 6.0)")
+    parser.add_option('-r', dest="revision", default=None,
+                      help="Specify the revision to take. (useful to take a " +
+                      "specific TAG or to specify a DATE)")
+    parser.add_option('-q', '--quiet', dest='quiet',
+                      help='Suppress the output', action='store_true',
+                      default=False)
     opt, args = parser.parse_args()
     dest_dir = args and args[0] or '.'
-    update_openerp(dest_dir, opt.version, opt.lplogin, opt.export, opt.revision, not opt.quiet)
-
+    update_openerp(dest_dir, opt.version, opt.lplogin, opt.export,
+                   opt.revision, not opt.quiet)

=== added file 'test_bzr_set.py'
--- test_bzr_set.py	1970-01-01 00:00:00 +0000
+++ test_bzr_set.py	2011-10-07 13:03:45 +0000
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+import unittest
+
+from os import getcwd
+from os.path import exists
+from shutil import rmtree
+from time import time
+
+from bzr_set import _VERSIONS, update_openerp
+
+
+class TestBzrSet(unittest.TestCase):
+
+    def setUp(self):
+        self.path = getcwd() + "/TestBzrSet/"
+
+    def test_install_and_update(self):
+        """ Test install and update all version with verbose
+        """
+
+        if exists(self.path):
+            rmtree(self.path)
+
+        # test install
+        for version in _VERSIONS:
+            print "Test Install Version %s " % version
+            dest_dir = self.path + version
+            time_start = time()
+            update_openerp(dest_dir, version, verbose=True)
+            time_duration = time() - time_start
+            print "Duration : %s minutes %2.2f secondes " % \
+                  (int(float(time_duration) / 60), (float(time_duration) % 60))
+        # test update
+        for version in _VERSIONS:
+            print "Test Update Version %s " % version
+            dest_dir = self.path + version
+            time_start = time()
+            update_openerp(dest_dir, version, verbose=True)
+            time_duration = time() - time_start
+            print "Duration : %2.2f secondes " % (float(time_duration) % 60)
+
+        rmtree(self.path)
+
+
+if __name__ == '__main__':
+    unittest.main()