[ADD] odoo deploy

diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py
deleted file mode 100755 (executable)
index 2412382..0000000
--- a/addons/base_import_module/bin/oe_module_deploy.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env python
-import argparse
-import os
-import sys
-import tempfile
-import zipfile
-
-
-try:
-    import requests
-except ImportError:
-    # no multipart encoding in stdlib and this script is temporary
-    sys.exit("This script requires the 'requests' module. ( pip install requests )")
-
-session = requests.session()
-
-def deploy_module(module_path, url, login, password, db=''):
-    url = url.rstrip('/')
-    authenticate(url, login, password, db)
-    module_file = zip_module(module_path)
-    try:
-        return upload_module(url, module_file)
-    finally:
-        os.remove(module_file)
-
-def upload_module(server, module_file):
-    print("Uploading module file...")
-    url = server + '/base_import_module/upload'
-    files = dict(mod_file=open(module_file, 'rb'))
-    res = session.post(url, files=files)
-    if res.status_code != 200:
-        raise Exception("Could not authenticate on server '%s'" % server)
-    return res.text
-
-def authenticate(server, login, password, db=''):
-    print("Authenticating on server '%s' ..." % server)
-
-    # Fixate session with a given db if any
-    session.get(server + '/web/login', params=dict(db=db))
-
-    args = dict(login=login, password=password, db=db)
-    res = session.post(server + '/base_import_module/login', args)
-    if res.status_code == 404:
-        raise Exception("The server '%s' does not have the 'base_import_module' installed." % server)
-    elif res.status_code != 200:
-        raise Exception(res.text)
-
-def zip_module(path):
-    path = os.path.abspath(path)
-    if not os.path.isdir(path):
-        raise Exception("Could not find module directory '%s'" % path)
-    container, module_name = os.path.split(path)
-    temp = tempfile.mktemp(suffix='.zip')
-    try:
-        print("Zipping module directory...")
-        with zipfile.ZipFile(temp, 'w') as zfile:
-            for root, dirs, files in os.walk(path):
-                for file in files:
-                    file_path = os.path.join(root, file)
-                    zfile.write(file_path, file_path.split(container).pop())
-            return temp
-    except Exception:
-        os.remove(temp)
-        raise
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.')
-    parser.add_argument('path', help="Path of the module to deploy")
-    parser.add_argument('--url', dest='url', help='Url of the server (default=http://localhost:8069)', default="http://localhost:8069")
-    parser.add_argument('--db', dest='db', help='Database to use if server does not use db-filter.')
-    parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)')
-    parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)')
-    parser.add_argument('--no-ssl-check', dest='no_ssl_check', action='store_true', help='Do not check ssl cert')
-    if len(sys.argv) == 1:
-        sys.exit(parser.print_help())
-
-    args = parser.parse_args()
-
-    if args.no_ssl_check:
-        session.verify = False
-
-    try:
-        result = deploy_module(args.path, args.url, args.login, args.password, args.db)
-        print(result)
-    except Exception, e:
-        sys.exit("ERROR: %s" % e)

diff --git a/openerp/cli/__init__.py b/openerp/cli/__init__.py
index 574898b..71e2ae8 100644 (file)
--- a/openerp/cli/__init__.py
+++ b/openerp/cli/__init__.py
@@ -31,6 +31,7 @@ class Help(Command):
             print "    %s" % k
 
 import server
+import deploy
 
 def main():
     args = sys.argv[1:]

diff --git a/openerp/cli/deploy.py b/openerp/cli/deploy.py
new file mode 100644 (file)
index 0000000..079099a
--- /dev/null
+++ b/openerp/cli/deploy.py
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import argparse
+import os
+import requests
+import sys
+import tempfile
+import zipfile
+
+from . import Command
+
+class Deploy(Command):
+    """Deploy a module on an Odoo instance"""
+    def __init__(self):
+        super(Deploy, self).__init__()
+        self.session = requests.session()
+
+    def deploy_module(self, module_path, url, login, password, db=''):
+        url = url.rstrip('/')
+        self.authenticate(url, login, password, db)
+        module_file = self.zip_module(module_path)
+        try:
+            return self.upload_module(url, module_file)
+        finally:
+            os.remove(module_file)
+
+    def upload_module(self, server, module_file):
+        print("Uploading module file...")
+        url = server + '/base_import_module/upload'
+        files = dict(mod_file=open(module_file, 'rb'))
+        res = self.session.post(url, files=files)
+        if res.status_code != 200:
+            raise Exception("Could not authenticate on server '%s'" % server)
+        return res.text
+
+    def authenticate(self, server, login, password, db=''):
+        print("Authenticating on server '%s' ..." % server)
+
+        # Fixate session with a given db if any
+        self.session.get(server + '/web/login', params=dict(db=db))
+
+        args = dict(login=login, password=password, db=db)
+        res = self.session.post(server + '/base_import_module/login', args)
+        if res.status_code == 404:
+            raise Exception("The server '%s' does not have the 'base_import_module' installed." % server)
+        elif res.status_code != 200:
+            raise Exception(res.text)
+
+    def zip_module(self, path):
+        path = os.path.abspath(path)
+        if not os.path.isdir(path):
+            raise Exception("Could not find module directory '%s'" % path)
+        container, module_name = os.path.split(path)
+        temp = tempfile.mktemp(suffix='.zip')
+        try:
+            print("Zipping module directory...")
+            with zipfile.ZipFile(temp, 'w') as zfile:
+                for root, dirs, files in os.walk(path):
+                    for file in files:
+                        file_path = os.path.join(root, file)
+                        zfile.write(file_path, file_path.split(container).pop())
+                return temp
+        except Exception:
+            os.remove(temp)
+            raise
+
+    def run(self, args):
+        parser = argparse.ArgumentParser(
+            prog="%s deploy" % sys.argv[0].split(os.path.sep)[-1],
+            description='Deploy a module on an Odoo server.'
+        )
+        parser.add_argument('path', help="Path of the module to deploy")
+        parser.add_argument('url', nargs='?', help='Url of the server (default=http://localhost:8069)', default="http://localhost:8069")
+        parser.add_argument('--db', dest='db', help='Database to use if server does not use db-filter.')
+        parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)')
+        parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)')
+        parser.add_argument('--no-ssl-check', dest='no_ssl_check', action='store_true', help='Do not check ssl cert')
+        if not args:
+            sys.exit(parser.print_help())
+
+        args = parser.parse_args(args=args)
+
+        if args.no_ssl_check:
+            self.session.verify = False
+
+        try:
+            if not args.url.startswith('http://'):
+                args.url = 'https://%s' % args.url
+            result = self.deploy_module(args.path, args.url, args.login, args.password, args.db)
+            print(result)
+        except Exception, e:
+            sys.exit("ERROR: %s" % e)