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,
@@ skipping 101 matching lines @@
   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__":
   
   parser = argparse.ArgumentParser(description='CMS testing server.')
-  parser.add_argument('-b', '--basepath', type=str, help='Base directory (EG: /path/to/web.eyeo.com)')
-  parser.add_argument('-n', '--hostname', type=str, help='Server hostname (EG: localhost, eyeo.com, 0.0.0.0)')
-  parser.add_argument('-p', '--port', type=str, help='Port number (EG: 8080, 5000)')
+  parser.add_argument('basepath', nargs='?', default=os.curdir)

[Sebastian Noack, 2016/01/20 17:46:25]

Nit: I would simply call it "path".

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

Done.

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

[Sebastian Noack, 2016/01/20 17:46:25]

Nit: "Address of the interface the server will listen on" would be a more
accurate help text. Also the examples aren't probably necessary.

[Sebastian Noack, 2016/01/20 17:46:25]

type=str is the default. How about omitting it, if it's just for consistence
with the line above?

[Sebastian Noack, 2016/01/20 18:00:55]

--address would be a better name for the option, as this isn't a hostname but
the address of the interface. While this can be the same, it's not necessarily
true, e.g. 0.0.0.0 is never a hostname but an address that refers to all
interfaces.

Alternatively, you could add an option --listen [address]:port instead --address
and --port. This would be a little quicker to type. And it would be somewhat
consistent with django's runserver command. But I wouldn't insist.

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

Done.

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

Acknowledged.

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

Done.

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

[Sebastian Noack, 2016/01/20 17:46:25]

How about type=int? Then you don't need to convert the value below.

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

Done.

   args = parser.parse_args()
   
-  # for backwards compatibility
-  if len(sys.argv) > 1 and os.path.isdir(sys.argv[1]):
-    source = FileSource(sys.argv[1])
-    hostname = 'localhost'
-    port = 5000
-  else:
-    source = FileSource(args.basepath or os.curdir)
-    hostname = args.hostname or 'localhost'
-    port = int(args.port or '5000')
+  source = FileSource(args.basepath)
+  hostname = args.hostname
+  port = int(args.port)
 
   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 18 matching lines @@
           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(hostname, port, handler, use_reloader=True, use_debugger=True)