From 0ea465e8a34876a0fed25a120f49ada9c692aaa3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Feb 2014 11:25:13 +0100
Subject: [PATCH] [IMP] simplify howto wording, add modules directory (output)
 to scaffold

---
 doc/howto/howto_website.rst | 17 ++++++++---------
 openerpcommand/scaffold.py  | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/doc/howto/howto_website.rst b/doc/howto/howto_website.rst
index 7eccd24935f..452d83d1aca 100644
--- a/doc/howto/howto_website.rst
+++ b/doc/howto/howto_website.rst
@@ -22,9 +22,11 @@ In OpenERP, doing things takes the form of creating modules, and these modules
 customize the behavior of the OpenERP installation. The first step is thus to
 create a module:
 
-.. code:: shell-session
+.. todo:: output directory probably shouldn't be ``.``
 
-    > oe scaffold Academy
+.. code-block:: console
+
+    $ oe scaffold Academy .
 
 .. patch::
     :hidden:
@@ -44,10 +46,8 @@ Now start your OpenERP server and install your module in it, open a web
 browser and navigate to http://localhost:8069. A page should appear with just
 the words "Hello, world!" on it.
 
-The default response type is HTML (although we only sent some text, browsers
-are pretty good at finding ways to turn stuff into things they can
-display). Let's prettify things a bit: instead of returning just a bit of
-text, we can return a page, and use a tool/library like bootstrap_ to get a
+Let's prettify things a bit: instead of returning just a bit of text,
+we can return a page, and use a tool like bootstrap_ to get a
 nicer rendering than the default.
 
 Go to :file:`academy/controllers/my_controller.py` and change the string
@@ -66,10 +66,9 @@ Data input: URL and query
 =========================
 
 Being able to build a static page in code is nice, but makes for limited
-usefulness (you could do that with static files in the first place, after
-all).
+usefulness (you could do that with static files in the first place).
 
-But you can also create controllers which use data provided in the access URL,
+You can also create controllers which use data provided in the access URL,
 for instance so you have a single controller generating multiple pages. Any
 query parameter (``?name=value``) is passed as a parameter to the controller
 function, and is a string.
diff --git a/openerpcommand/scaffold.py b/openerpcommand/scaffold.py
index 845122dcb75..4bbc7cdc503 100644
--- a/openerpcommand/scaffold.py
+++ b/openerpcommand/scaffold.py
@@ -15,10 +15,10 @@ def run(args):
     env = jinja2.Environment(loader=jinja2.PackageLoader(
         'openerpcommand', 'templates'))
     env.filters['snake'] = snake
-    assert args.module
     args.dependency = 'web' if args.controller else 'base'
 
-    module = functools.partial(os.path.join, snake(args.module))
+    module = functools.partial(
+        os.path.join, args.modules_dir, snake(args.module))
 
     if os.path.exists(module()):
         message = "The path `%s` already exists." % module()
@@ -48,6 +48,8 @@ def add_parser(subparsers):
         description='Generate an OpenERP module skeleton.')
     parser.add_argument('module', metavar='MODULE',
         help='the name of the generated module')
+    parser.add_argument('modules_dir', metavar='DIRECTORY', type=directory,
+        help="Modules directory in which the new module should be generated")
 
     controller = parser.add_mutually_exclusive_group()
     controller.add_argument('--controller', type=identifier,
@@ -107,6 +109,14 @@ def identifier(s):
         die("%s is not a valid Python identifier" % s)
     return s
 
+def directory(p):
+    expanded = os.path.abspath(
+        os.path.expanduser(
+            os.path.expandvars(p)))
+    if not os.path.isdir(expanded):
+        die("Directory %s does not seem to exist" % p)
+    return expanded
+
 def die(message, code=1):
     print >>sys.stderr, message
     sys.exit(code)