issue 3546 - Add port and hostname options to CMS testing server

cms/bin/test_server.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus 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.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY 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 Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 import mimetypes
 import os
 import sys
+import argparse
 
 import jinja2
 
 from cms.utils import process_page
 from cms.sources import FileSource
 from cms.converters import converters
 
 source = None
 
 UNICODE_ENCODING = "utf-8"
@@ skipping 61 matching lines @@
 
 def show_error(start_response, status, **kwargs):
   env = jinja2.Environment(autoescape=True)
   template = env.from_string(ERROR_TEMPLATE)
   mime = "text/html; encoding=%s" % UNICODE_ENCODING
   start_response(status, [("Content-Type", mime)])
   for fragment in template.stream(status=status, **kwargs):
     yield fragment.encode(UNICODE_ENCODING)
 
 def handler(environ, start_response):
+  
   path = environ.get("PATH_INFO")
 
   data = get_data(path)
   if data is None:
     return show_error(start_response, "404 Not Found", uri=path)
 
   mime = mimetypes.guess_type(path)[0] or "text/html"
 
   if isinstance(data, unicode):
     data = data.encode(UNICODE_ENCODING)
     mime = "%s; charset=%s" % (mime, UNICODE_ENCODING)
 
   start_response("200 OK", [("Content-Type", mime)])
   return [data]
 
 if __name__ == "__main__":
-  if len(sys.argv) < 2:
-    source = FileSource(os.curdir)
-  elif os.path.isdir(sys.argv[1]):
+  
+  parser = argparse.ArgumentParser(description='CMS testing server.')
+  parser.add_argument('-b', '--basepath', type=str, help='Base directory (EG: /path/to/web.eyeo.com)')

[Sebastian Noack, 2016/01/20 14:35:59]

Please keep the path a positional argument rather than a named option, for
convenience and compatibility. And make it default to os.curdir.

[juliandoucette, 2016/01/21 13:46:23]

Done.

+  parser.add_argument('-n', '--hostname', type=str, help='Server hostname (EG: localhost, eyeo.com, 0.0.0.0)')

[Sebastian Noack, 2016/01/20 14:35:59]

Specify "localhost" as default.

[juliandoucette, 2016/01/21 13:46:23]

Done.

+  parser.add_argument('-p', '--port', type=str, help='Port number (EG: 8080, 5000)')

[Sebastian Noack, 2016/01/20 14:35:59]

Specify 5000 as default.

[juliandoucette, 2016/01/21 13:46:23]

Done.

+  args = parser.parse_args()
+  
+  # for backwards compatibility

[Sebastian Noack, 2016/01/20 14:35:59]

With the above comments addressed you don't need to switch the logic here.

[juliandoucette, 2016/01/21 13:46:23]

Agreed. Thank you for bringing that up.

+  if len(sys.argv) > 1 and os.path.isdir(sys.argv[1]):
     source = FileSource(sys.argv[1])
+    hostname = 'localhost'
+    port = 5000
   else:
-    sys.exit("Usage: %s [source_dir]" % sys.argv[0])
+    source = FileSource(args.basepath or os.curdir)
+    hostname = args.hostname or 'localhost'
+    port = int(args.port or '5000')
 
   try:
     from werkzeug.serving import ThreadedWSGIServer, run_simple
 
     # see https://github.com/mitsuhiko/werkzeug/pull/770
     ThreadedWSGIServer.daemon_threads = True
 
     def run(*args, **kwargs):
       # The werkzeug logger must be configured before the
       # root logger. Also we must prevent it from propagating
@@ skipping 17 matching lines @@
         try:
           return app(environ, start_response)
         except Exception, e:
           return show_error(start_response, "500 Internal Server Error",
               uri=environ.get("PATH_INFO"), error=e)
 
       server = make_server(host, port, wrapper, ThreadedWSGIServer)
       print " * Running on http://%s:%i/" % server.server_address
       server.serve_forever()
 
-  run("localhost", 5000, handler, use_reloader=True, use_debugger=True)
+  run(hostname, port, handler, use_reloader=True, use_debugger=True)